diff options
| author | Ben Murdoch <benm@google.com> | 2014-04-24 10:50:13 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-04-24 10:50:13 +0100 |
| commit | 0529e5d033099cbfc42635f6f6183833b09dff6e (patch) | |
| tree | badea60062e611382d8a37e3b0bfda8d69760c2b /skia | |
| parent | 8346740f6fb555ccbb9b4148ab63402ae8f6e4ca (diff) | |
| download | chromium_org-0529e5d033099cbfc42635f6f6183833b09dff6e.tar.gz | |
Merge from Chromium at DEPS revision 265802
This commit was generated by merge_to_master.py.
Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
Diffstat (limited to 'skia')
46 files changed, 430 insertions, 183 deletions
diff --git a/skia/BUILD.gn b/skia/BUILD.gn index 904e8b85d1..f65b2cc239 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -74,11 +74,19 @@ config("skia_config") { } } -config("skia_dependent_config") { -} - # Internal-facing config for Skia library code. config("skia_library_config") { + # These include directories are only included for Skia code and are not + # exported to dependents. It's not clear if this is on purpose, but this + # matches the GYP build. + include_dirs = [] + if (is_mac || is_ios) { + include_dirs += [ "//third_party/skia/include/utils/mac" ] + } + if (is_mac) { + include_dirs += [ "//third_party/skia/include/utils/ios" ] + } + defines = [ #skia_export_defines ???) TODO @@ -250,8 +258,6 @@ component("skia") { "//third_party/skia/src/ports/SkOSFile_posix.cpp", "//third_party/skia/src/ports/SkTime_Unix.cpp", "//third_party/skia/src/ports/SkTLS_pthread.cpp", - "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp", - "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp", ] } else { sources -= [ @@ -277,6 +283,8 @@ component("skia") { } if (!is_linux) { sources -= [ + "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp", + "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp", "//third_party/skia/src/ports/SkFontHost_FreeType.cpp", "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp", "//third_party/skia/src/ports/SkFontHost_fontconfig.cpp", @@ -302,6 +310,13 @@ component("skia") { ] } + if (is_clang) { + # Skia won't compile with some of the more strict clang warnings. + # e.g. it does: + # SkASSERT(!"sk_out_of_memory"); + configs -= [ "//build/config/clang:extra_warnings" ] + } + configs -= [ "//build/config/compiler:chromium_code" ] configs += [ ":skia_library_config", @@ -356,6 +371,10 @@ source_set("skia_opts") { # Chrome-specific. "ext/convolver_SSE2.cc", + + # These are header files used by this target from the skia one above. + "ext/convolver.h", + "//third_party/skia/include/core/SkTypes.h", ] if (is_linux || is_mac) { @@ -371,6 +390,9 @@ source_set("skia_opts") { "//build/config/compiler:no_chromium_code" ] - # TODO(brettw) uncomment when visibility is supported. - #visibility = ":skia" + deps = [ + "//base", + ] + + visibility = ":skia" } diff --git a/skia/ext/analysis_canvas.cc b/skia/ext/analysis_canvas.cc index 524fd18235..15ec6d880f 100644 --- a/skia/ext/analysis_canvas.cc +++ b/skia/ext/analysis_canvas.cc @@ -214,40 +214,40 @@ void AnalysisCanvas::drawSprite(const SkBitmap& bitmap, is_transparent_ = false; } -void AnalysisCanvas::drawText(const void* text, - size_t len, - SkScalar x, - SkScalar y, - const SkPaint& paint) { +void AnalysisCanvas::onDrawText(const void* text, + size_t len, + SkScalar x, + SkScalar y, + const SkPaint& paint) { is_solid_color_ = false; is_transparent_ = false; has_text_ = true; } -void AnalysisCanvas::drawPosText(const void* text, - size_t byteLength, - const SkPoint pos[], - const SkPaint& paint) { +void AnalysisCanvas::onDrawPosText(const void* text, + size_t byteLength, + const SkPoint pos[], + const SkPaint& paint) { is_solid_color_ = false; is_transparent_ = false; has_text_ = true; } -void AnalysisCanvas::drawPosTextH(const void* text, - size_t byteLength, - const SkScalar xpos[], - SkScalar constY, - const SkPaint& paint) { +void AnalysisCanvas::onDrawPosTextH(const void* text, + size_t byteLength, + const SkScalar xpos[], + SkScalar constY, + const SkPaint& paint) { is_solid_color_ = false; is_transparent_ = false; has_text_ = true; } -void AnalysisCanvas::drawTextOnPath(const void* text, - size_t len, - const SkPath& path, - const SkMatrix* matrix, - const SkPaint& paint) { +void AnalysisCanvas::onDrawTextOnPath(const void* text, + size_t len, + const SkPath& path, + const SkMatrix* matrix, + const SkPaint& paint) { is_solid_color_ = false; is_transparent_ = false; has_text_ = true; diff --git a/skia/ext/analysis_canvas.h b/skia/ext/analysis_canvas.h index 922a3ee5c6..efe93149ef 100644 --- a/skia/ext/analysis_canvas.h +++ b/skia/ext/analysis_canvas.h @@ -59,25 +59,6 @@ class SK_API AnalysisCanvas : public SkCanvas, public SkDrawPictureCallback { const SkPaint* paint = NULL) OVERRIDE; virtual void drawSprite(const SkBitmap&, int left, int top, const SkPaint* paint = NULL) OVERRIDE; - virtual void drawText(const void* text, - size_t byteLength, - SkScalar x, - SkScalar y, - const SkPaint&) OVERRIDE; - virtual void drawPosText(const void* text, - size_t byteLength, - const SkPoint pos[], - const SkPaint&) OVERRIDE; - virtual void drawPosTextH(const void* text, - size_t byteLength, - const SkScalar xpos[], - SkScalar constY, - const SkPaint&) OVERRIDE; - virtual void drawTextOnPath(const void* text, - size_t byteLength, - const SkPath& path, - const SkMatrix* matrix, - const SkPaint&) OVERRIDE; virtual void drawVertices(VertexMode, int vertexCount, const SkPoint vertices[], @@ -105,7 +86,27 @@ class SK_API AnalysisCanvas : public SkCanvas, public SkDrawPictureCallback { SkRegion::Op op, ClipEdgeStyle edge_style) OVERRIDE; - private: + virtual void onDrawText(const void* text, + size_t byteLength, + SkScalar x, + SkScalar y, + const SkPaint&) OVERRIDE; + virtual void onDrawPosText(const void* text, + size_t byteLength, + const SkPoint pos[], + const SkPaint&) OVERRIDE; + virtual void onDrawPosTextH(const void* text, + size_t byteLength, + const SkScalar xpos[], + SkScalar constY, + const SkPaint&) OVERRIDE; + virtual void onDrawTextOnPath(const void* text, + size_t byteLength, + const SkPath& path, + const SkMatrix* matrix, + const SkPaint&) OVERRIDE; + +private: typedef SkCanvas INHERITED; int saved_stack_size_; diff --git a/skia/ext/benchmarking_canvas.cc b/skia/ext/benchmarking_canvas.cc index ec2ff3cadd..f765cd1755 100644 --- a/skia/ext/benchmarking_canvas.cc +++ b/skia/ext/benchmarking_canvas.cc @@ -114,33 +114,6 @@ public: SkProxyCanvas::drawSprite(bitmap, left, top, paint); } - virtual void drawText(const void* text, size_t byteLength, SkScalar x, - SkScalar y, const SkPaint& paint) OVERRIDE { - AutoStamper stamper(this); - SkProxyCanvas::drawText(text, byteLength, x, y, paint); - } - - virtual void drawPosText(const void* text, size_t byteLength, - const SkPoint pos[], - const SkPaint& paint) OVERRIDE { - AutoStamper stamper(this); - SkProxyCanvas::drawPosText(text, byteLength, pos, paint); - } - - virtual void drawPosTextH(const void* text, size_t byteLength, - const SkScalar xpos[], SkScalar constY, - const SkPaint& paint) OVERRIDE { - AutoStamper stamper(this); - SkProxyCanvas::drawPosTextH(text, byteLength, xpos, constY, paint); - } - - virtual void drawTextOnPath(const void* text, size_t byteLength, - const SkPath& path, const SkMatrix* matrix, - const SkPaint& paint) OVERRIDE { - AutoStamper stamper(this); - SkProxyCanvas::drawTextOnPath(text, byteLength, path, matrix, paint); - } - virtual void drawPicture(SkPicture& picture) OVERRIDE { AutoStamper stamper(this); SkProxyCanvas::drawPicture(picture); @@ -162,6 +135,33 @@ public: } protected: + virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, + SkScalar y, const SkPaint& paint) OVERRIDE { + AutoStamper stamper(this); + SkProxyCanvas::onDrawText(text, byteLength, x, y, paint); + } + + virtual void onDrawPosText(const void* text, size_t byteLength, + const SkPoint pos[], + const SkPaint& paint) OVERRIDE { + AutoStamper stamper(this); + SkProxyCanvas::onDrawPosText(text, byteLength, pos, paint); + } + + virtual void onDrawPosTextH(const void* text, size_t byteLength, + const SkScalar xpos[], SkScalar constY, + const SkPaint& paint) OVERRIDE { + AutoStamper stamper(this); + SkProxyCanvas::onDrawPosTextH(text, byteLength, xpos, constY, paint); + } + + virtual void onDrawTextOnPath(const void* text, size_t byteLength, + const SkPath& path, const SkMatrix* matrix, + const SkPaint& paint) OVERRIDE { + AutoStamper stamper(this); + SkProxyCanvas::onDrawTextOnPath(text, byteLength, path, matrix, paint); + } + virtual void onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyle edge_style) OVERRIDE { AutoStamper stamper(this); diff --git a/skia/ext/pixel_ref_utils_unittest.cc b/skia/ext/pixel_ref_utils_unittest.cc index 2bfbbbe3f1..8ff327249b 100644 --- a/skia/ext/pixel_ref_utils_unittest.cc +++ b/skia/ext/pixel_ref_utils_unittest.cc @@ -51,7 +51,16 @@ class TestDiscardableShader : public SkShader { } // Pure virtual implementaiton. - virtual void shadeSpan(int x, int y, SkPMColor[], int count) OVERRIDE {} + virtual SkShader::Context* createContext(const SkBitmap& device, + const SkPaint& paint, + const SkMatrix& matrix, + void* storage) const OVERRIDE { + return NULL; + }; + virtual size_t contextSize() const OVERRIDE { + return sizeof(SkShader::Context); + } + SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(TestDiscardableShader); private: @@ -69,12 +78,11 @@ void CreateBitmap(gfx::Size size, const char* uri, SkBitmap* bitmap) { bitmap->pixelRef()->setURI(uri); } -SkCanvas* StartRecording(SkPicture* picture, gfx::Rect layer_rect) { - SkCanvas* canvas = picture->beginRecording( +SkCanvas* StartRecording(SkPictureRecorder* recorder, gfx::Rect layer_rect) { + SkCanvas* canvas = recorder->beginRecording( layer_rect.width(), layer_rect.height(), - SkPicture::kUsePathBoundsForClip_RecordingFlag | - SkPicture::kOptimizeForClippedPlayback_RecordingFlag); + SkPicture::kUsePathBoundsForClip_RecordingFlag); canvas->save(); canvas->translate(-layer_rect.x(), -layer_rect.y()); @@ -84,9 +92,9 @@ SkCanvas* StartRecording(SkPicture* picture, gfx::Rect layer_rect) { return canvas; } -void StopRecording(SkPicture* picture, SkCanvas* canvas) { +SkPicture* StopRecording(SkPictureRecorder* recorder, SkCanvas* canvas) { canvas->restore(); - picture->endRecording(); + return recorder->endRecording(); } } // namespace @@ -94,8 +102,8 @@ void StopRecording(SkPicture* picture, SkCanvas* canvas) { TEST(PixelRefUtilsTest, DrawPaint) { gfx::Rect layer_rect(0, 0, 256, 256); - skia::RefPtr<SkPicture> picture = skia::AdoptRef(new SkPicture); - SkCanvas* canvas = StartRecording(picture.get(), layer_rect); + SkPictureRecorder recorder; + SkCanvas* canvas = StartRecording(&recorder, layer_rect); TestDiscardableShader first_shader; SkPaint first_paint; @@ -116,7 +124,7 @@ TEST(PixelRefUtilsTest, DrawPaint) { canvas->clipRect(SkRect::MakeWH(100, 100)); canvas->drawPaint(third_paint); - StopRecording(picture.get(), canvas); + skia::RefPtr<SkPicture> picture = skia::AdoptRef(StopRecording(&recorder, canvas)); std::vector<skia::PixelRefUtils::PositionPixelRef> pixel_refs; skia::PixelRefUtils::GatherDiscardablePixelRefs(picture.get(), &pixel_refs); @@ -133,8 +141,8 @@ TEST(PixelRefUtilsTest, DrawPaint) { TEST(PixelRefUtilsTest, DrawPoints) { gfx::Rect layer_rect(0, 0, 256, 256); - skia::RefPtr<SkPicture> picture = skia::AdoptRef(new SkPicture); - SkCanvas* canvas = StartRecording(picture.get(), layer_rect); + SkPictureRecorder recorder; + SkCanvas* canvas = StartRecording(&recorder, layer_rect); TestDiscardableShader first_shader; SkPaint first_paint; @@ -169,7 +177,7 @@ TEST(PixelRefUtilsTest, DrawPoints) { // (50, 55, 150, 145). canvas->drawPoints(SkCanvas::kPolygon_PointMode, 3, points, third_paint); - StopRecording(picture.get(), canvas); + skia::RefPtr<SkPicture> picture = skia::AdoptRef(StopRecording(&recorder, canvas)); std::vector<skia::PixelRefUtils::PositionPixelRef> pixel_refs; skia::PixelRefUtils::GatherDiscardablePixelRefs(picture.get(), &pixel_refs); @@ -186,8 +194,8 @@ TEST(PixelRefUtilsTest, DrawPoints) { TEST(PixelRefUtilsTest, DrawRect) { gfx::Rect layer_rect(0, 0, 256, 256); - skia::RefPtr<SkPicture> picture = skia::AdoptRef(new SkPicture); - SkCanvas* canvas = StartRecording(picture.get(), layer_rect); + SkPictureRecorder recorder; + SkCanvas* canvas = StartRecording(&recorder, layer_rect); TestDiscardableShader first_shader; SkPaint first_paint; @@ -217,6 +225,8 @@ TEST(PixelRefUtilsTest, DrawRect) { // (50, 50, 50, 50) canvas->drawRect(SkRect::MakeXYWH(0, 0, 100, 100), third_paint); + skia::RefPtr<SkPicture> picture = skia::AdoptRef(StopRecording(&recorder, canvas)); + std::vector<skia::PixelRefUtils::PositionPixelRef> pixel_refs; skia::PixelRefUtils::GatherDiscardablePixelRefs(picture.get(), &pixel_refs); @@ -232,8 +242,8 @@ TEST(PixelRefUtilsTest, DrawRect) { TEST(PixelRefUtilsTest, DrawRRect) { gfx::Rect layer_rect(0, 0, 256, 256); - skia::RefPtr<SkPicture> picture = skia::AdoptRef(new SkPicture); - SkCanvas* canvas = StartRecording(picture.get(), layer_rect); + SkPictureRecorder recorder; + SkCanvas* canvas = StartRecording(&recorder, layer_rect); TestDiscardableShader first_shader; SkPaint first_paint; @@ -268,6 +278,8 @@ TEST(PixelRefUtilsTest, DrawRRect) { // (50, 50, 50, 50) canvas->drawRRect(rrect, third_paint); + skia::RefPtr<SkPicture> picture = skia::AdoptRef(StopRecording(&recorder, canvas)); + std::vector<skia::PixelRefUtils::PositionPixelRef> pixel_refs; skia::PixelRefUtils::GatherDiscardablePixelRefs(picture.get(), &pixel_refs); @@ -283,8 +295,8 @@ TEST(PixelRefUtilsTest, DrawRRect) { TEST(PixelRefUtilsTest, DrawOval) { gfx::Rect layer_rect(0, 0, 256, 256); - skia::RefPtr<SkPicture> picture = skia::AdoptRef(new SkPicture); - SkCanvas* canvas = StartRecording(picture.get(), layer_rect); + SkPictureRecorder recorder; + SkCanvas* canvas = StartRecording(&recorder, layer_rect); TestDiscardableShader first_shader; SkPaint first_paint; @@ -318,6 +330,8 @@ TEST(PixelRefUtilsTest, DrawOval) { // (50, 50, 50, 50) canvas->drawRect(SkRect::MakeXYWH(0, 0, 100, 100), third_paint); + skia::RefPtr<SkPicture> picture = skia::AdoptRef(StopRecording(&recorder, canvas)); + std::vector<skia::PixelRefUtils::PositionPixelRef> pixel_refs; skia::PixelRefUtils::GatherDiscardablePixelRefs(picture.get(), &pixel_refs); @@ -333,8 +347,8 @@ TEST(PixelRefUtilsTest, DrawOval) { TEST(PixelRefUtilsTest, DrawPath) { gfx::Rect layer_rect(0, 0, 256, 256); - skia::RefPtr<SkPicture> picture = skia::AdoptRef(new SkPicture); - SkCanvas* canvas = StartRecording(picture.get(), layer_rect); + SkPictureRecorder recorder; + SkCanvas* canvas = StartRecording(&recorder, layer_rect); TestDiscardableShader first_shader; SkPaint first_paint; @@ -360,7 +374,7 @@ TEST(PixelRefUtilsTest, DrawPath) { canvas->restore(); - StopRecording(picture.get(), canvas); + skia::RefPtr<SkPicture> picture = skia::AdoptRef(StopRecording(&recorder, canvas)); std::vector<skia::PixelRefUtils::PositionPixelRef> pixel_refs; skia::PixelRefUtils::GatherDiscardablePixelRefs(picture.get(), &pixel_refs); @@ -375,8 +389,8 @@ TEST(PixelRefUtilsTest, DrawPath) { TEST(PixelRefUtilsTest, DrawBitmap) { gfx::Rect layer_rect(0, 0, 256, 256); - skia::RefPtr<SkPicture> picture = skia::AdoptRef(new SkPicture); - SkCanvas* canvas = StartRecording(picture.get(), layer_rect); + SkPictureRecorder recorder; + SkCanvas* canvas = StartRecording(&recorder, layer_rect); SkBitmap first; CreateBitmap(gfx::Size(50, 50), "discardable", &first); @@ -414,7 +428,7 @@ TEST(PixelRefUtilsTest, DrawBitmap) { // At (0, 0), scaled by 5 and 6 canvas->drawBitmap(fifth, 0, 0); - StopRecording(picture.get(), canvas); + skia::RefPtr<SkPicture> picture = skia::AdoptRef(StopRecording(&recorder, canvas)); std::vector<skia::PixelRefUtils::PositionPixelRef> pixel_refs; skia::PixelRefUtils::GatherDiscardablePixelRefs(picture.get(), &pixel_refs); @@ -436,8 +450,8 @@ TEST(PixelRefUtilsTest, DrawBitmap) { TEST(PixelRefUtilsTest, DrawBitmapRect) { gfx::Rect layer_rect(0, 0, 256, 256); - skia::RefPtr<SkPicture> picture = skia::AdoptRef(new SkPicture); - SkCanvas* canvas = StartRecording(picture.get(), layer_rect); + SkPictureRecorder recorder; + SkCanvas* canvas = StartRecording(&recorder, layer_rect); SkBitmap first; CreateBitmap(gfx::Size(50, 50), "discardable", &first); @@ -468,7 +482,7 @@ TEST(PixelRefUtilsTest, DrawBitmapRect) { canvas->restore(); - StopRecording(picture.get(), canvas); + skia::RefPtr<SkPicture> picture = skia::AdoptRef(StopRecording(&recorder, canvas)); std::vector<skia::PixelRefUtils::PositionPixelRef> pixel_refs; skia::PixelRefUtils::GatherDiscardablePixelRefs(picture.get(), &pixel_refs); @@ -487,8 +501,8 @@ TEST(PixelRefUtilsTest, DrawBitmapRect) { TEST(PixelRefUtilsTest, DrawSprite) { gfx::Rect layer_rect(0, 0, 256, 256); - skia::RefPtr<SkPicture> picture = skia::AdoptRef(new SkPicture); - SkCanvas* canvas = StartRecording(picture.get(), layer_rect); + SkPictureRecorder recorder; + SkCanvas* canvas = StartRecording(&recorder, layer_rect); SkBitmap first; CreateBitmap(gfx::Size(50, 50), "discardable", &first); @@ -531,7 +545,7 @@ TEST(PixelRefUtilsTest, DrawSprite) { // (100, 100, 50, 50). canvas->drawSprite(fifth, 100, 100, &first_paint); - StopRecording(picture.get(), canvas); + skia::RefPtr<SkPicture> picture = skia::AdoptRef(StopRecording(&recorder, canvas)); std::vector<skia::PixelRefUtils::PositionPixelRef> pixel_refs; skia::PixelRefUtils::GatherDiscardablePixelRefs(picture.get(), &pixel_refs); @@ -554,8 +568,8 @@ TEST(PixelRefUtilsTest, DrawSprite) { TEST(PixelRefUtilsTest, DrawText) { gfx::Rect layer_rect(0, 0, 256, 256); - skia::RefPtr<SkPicture> picture = skia::AdoptRef(new SkPicture); - SkCanvas* canvas = StartRecording(picture.get(), layer_rect); + SkPictureRecorder recorder; + SkCanvas* canvas = StartRecording(&recorder, layer_rect); TestDiscardableShader first_shader; SkPaint first_paint; @@ -578,6 +592,8 @@ TEST(PixelRefUtilsTest, DrawText) { canvas->drawPosText("text", 4, points, first_paint); canvas->drawTextOnPath("text", 4, path, NULL, first_paint); + skia::RefPtr<SkPicture> picture = skia::AdoptRef(StopRecording(&recorder, canvas)); + std::vector<skia::PixelRefUtils::PositionPixelRef> pixel_refs; skia::PixelRefUtils::GatherDiscardablePixelRefs(picture.get(), &pixel_refs); @@ -587,8 +603,8 @@ TEST(PixelRefUtilsTest, DrawText) { TEST(PixelRefUtilsTest, DrawVertices) { gfx::Rect layer_rect(0, 0, 256, 256); - skia::RefPtr<SkPicture> picture = skia::AdoptRef(new SkPicture); - SkCanvas* canvas = StartRecording(picture.get(), layer_rect); + SkPictureRecorder recorder; + SkCanvas* canvas = StartRecording(&recorder, layer_rect); TestDiscardableShader first_shader; SkPaint first_paint; @@ -649,7 +665,7 @@ TEST(PixelRefUtilsTest, DrawVertices) { 3, third_paint); - StopRecording(picture.get(), canvas); + skia::RefPtr<SkPicture> picture = skia::AdoptRef(StopRecording(&recorder, canvas)); std::vector<skia::PixelRefUtils::PositionPixelRef> pixel_refs; skia::PixelRefUtils::GatherDiscardablePixelRefs(picture.get(), &pixel_refs); diff --git a/skia/skia_chrome.target.darwin-arm.mk b/skia/skia_chrome.target.darwin-arm.mk index 54c1a57abc..e6185210a6 100644 --- a/skia/skia_chrome.target.darwin-arm.mk +++ b/skia/skia_chrome.target.darwin-arm.mk @@ -114,7 +114,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -133,7 +137,6 @@ MY_DEFS_Debug := \ '-DSK_USE_POSIX_THREADS' \ '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -244,7 +247,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -263,7 +270,6 @@ MY_DEFS_Release := \ '-DSK_USE_POSIX_THREADS' \ '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -328,7 +334,6 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_chrome.target.darwin-mips.mk b/skia/skia_chrome.target.darwin-mips.mk index 095b8a1061..9f52d0eaca 100644 --- a/skia/skia_chrome.target.darwin-mips.mk +++ b/skia/skia_chrome.target.darwin-mips.mk @@ -114,7 +114,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -132,7 +136,6 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -243,7 +246,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -261,7 +268,6 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -324,7 +330,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_chrome.target.darwin-x86.mk b/skia/skia_chrome.target.darwin-x86.mk index 6db08a3516..be58c7523f 100644 --- a/skia/skia_chrome.target.darwin-x86.mk +++ b/skia/skia_chrome.target.darwin-x86.mk @@ -115,7 +115,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -133,7 +137,6 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -244,7 +247,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -262,7 +269,6 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -324,7 +330,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_chrome.target.darwin-x86_64.mk b/skia/skia_chrome.target.darwin-x86_64.mk index 9af99ab430..5655890c2f 100644 --- a/skia/skia_chrome.target.darwin-x86_64.mk +++ b/skia/skia_chrome.target.darwin-x86_64.mk @@ -115,7 +115,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -133,7 +137,6 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -244,7 +247,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -262,7 +269,6 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -324,7 +330,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_chrome.target.linux-arm.mk b/skia/skia_chrome.target.linux-arm.mk index 54c1a57abc..e6185210a6 100644 --- a/skia/skia_chrome.target.linux-arm.mk +++ b/skia/skia_chrome.target.linux-arm.mk @@ -114,7 +114,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -133,7 +137,6 @@ MY_DEFS_Debug := \ '-DSK_USE_POSIX_THREADS' \ '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -244,7 +247,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -263,7 +270,6 @@ MY_DEFS_Release := \ '-DSK_USE_POSIX_THREADS' \ '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -328,7 +334,6 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_chrome.target.linux-mips.mk b/skia/skia_chrome.target.linux-mips.mk index 095b8a1061..9f52d0eaca 100644 --- a/skia/skia_chrome.target.linux-mips.mk +++ b/skia/skia_chrome.target.linux-mips.mk @@ -114,7 +114,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -132,7 +136,6 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -243,7 +246,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -261,7 +268,6 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -324,7 +330,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_chrome.target.linux-x86.mk b/skia/skia_chrome.target.linux-x86.mk index 6db08a3516..be58c7523f 100644 --- a/skia/skia_chrome.target.linux-x86.mk +++ b/skia/skia_chrome.target.linux-x86.mk @@ -115,7 +115,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -133,7 +137,6 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -244,7 +247,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -262,7 +269,6 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -324,7 +330,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_chrome.target.linux-x86_64.mk b/skia/skia_chrome.target.linux-x86_64.mk index 9af99ab430..5655890c2f 100644 --- a/skia/skia_chrome.target.linux-x86_64.mk +++ b/skia/skia_chrome.target.linux-x86_64.mk @@ -115,7 +115,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -133,7 +137,6 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -244,7 +247,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -262,7 +269,6 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -324,7 +330,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_chrome_opts.target.darwin-arm.mk b/skia/skia_chrome_opts.target.darwin-arm.mk index d2482e1727..869326ae53 100644 --- a/skia/skia_chrome_opts.target.darwin-arm.mk +++ b/skia/skia_chrome_opts.target.darwin-arm.mk @@ -33,7 +33,6 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_chrome_opts.target.darwin-mips.mk b/skia/skia_chrome_opts.target.darwin-mips.mk index 4c7996e1dc..7fa30bbeda 100644 --- a/skia/skia_chrome_opts.target.darwin-mips.mk +++ b/skia/skia_chrome_opts.target.darwin-mips.mk @@ -224,7 +224,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_chrome_opts.target.darwin-x86.mk b/skia/skia_chrome_opts.target.darwin-x86.mk index 8a8b6d52ef..52fc943fc2 100644 --- a/skia/skia_chrome_opts.target.darwin-x86.mk +++ b/skia/skia_chrome_opts.target.darwin-x86.mk @@ -222,7 +222,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_chrome_opts.target.darwin-x86_64.mk b/skia/skia_chrome_opts.target.darwin-x86_64.mk index 140b85a15c..61446d0e5e 100644 --- a/skia/skia_chrome_opts.target.darwin-x86_64.mk +++ b/skia/skia_chrome_opts.target.darwin-x86_64.mk @@ -222,7 +222,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_chrome_opts.target.linux-arm.mk b/skia/skia_chrome_opts.target.linux-arm.mk index d2482e1727..869326ae53 100644 --- a/skia/skia_chrome_opts.target.linux-arm.mk +++ b/skia/skia_chrome_opts.target.linux-arm.mk @@ -33,7 +33,6 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_chrome_opts.target.linux-mips.mk b/skia/skia_chrome_opts.target.linux-mips.mk index 4c7996e1dc..7fa30bbeda 100644 --- a/skia/skia_chrome_opts.target.linux-mips.mk +++ b/skia/skia_chrome_opts.target.linux-mips.mk @@ -224,7 +224,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_chrome_opts.target.linux-x86.mk b/skia/skia_chrome_opts.target.linux-x86.mk index 8a8b6d52ef..52fc943fc2 100644 --- a/skia/skia_chrome_opts.target.linux-x86.mk +++ b/skia/skia_chrome_opts.target.linux-x86.mk @@ -222,7 +222,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_chrome_opts.target.linux-x86_64.mk b/skia/skia_chrome_opts.target.linux-x86_64.mk index 140b85a15c..61446d0e5e 100644 --- a/skia/skia_chrome_opts.target.linux-x86_64.mk +++ b/skia/skia_chrome_opts.target.linux-x86_64.mk @@ -222,7 +222,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_gn_files.gypi b/skia/skia_gn_files.gypi index 61b49eb844..a2be7256e1 100644 --- a/skia/skia_gn_files.gypi +++ b/skia/skia_gn_files.gypi @@ -19,6 +19,7 @@ 'SK_SUPPORT_LEGACY_GETTOTALCLIP', 'SK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1', 'SK_SUPPORT_LEGACY_N32_NAME', + 'SK_SUPPORT_LEGACY_PROCXFERMODE', 'SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1', 'SK_USE_DISCARDABLE_SCALEDIMAGECACHE', 'SK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT', @@ -279,8 +280,6 @@ '<(skia_src_path)/core/SkBitmapProcState_sample.h', '<(skia_src_path)/core/SkBitmapScaler.h', '<(skia_src_path)/core/SkBitmapScaler.cpp', - '<(skia_src_path)/core/SkBitmapShader16BilerpTemplate.h', - '<(skia_src_path)/core/SkBitmapShaderTemplate.h', '<(skia_src_path)/core/SkBitmap_scroll.cpp', '<(skia_src_path)/core/SkBlitBWMaskTemplate.h', '<(skia_src_path)/core/SkBlitMask_D32.cpp', @@ -362,7 +361,6 @@ '<(skia_src_path)/core/SkMessageBus.h', '<(skia_src_path)/core/SkMetaData.cpp', '<(skia_src_path)/core/SkMipMap.cpp', - '<(skia_src_path)/core/SkOffsetTable.h', '<(skia_src_path)/core/SkPackBits.cpp', '<(skia_src_path)/core/SkPaint.cpp', '<(skia_src_path)/core/SkPaintOptionsAndroid.cpp', @@ -801,7 +799,6 @@ '<(skia_src_path)/utils/debugger/SkDrawCommand.h', '<(skia_src_path)/utils/debugger/SkObjectParser.cpp', '<(skia_src_path)/utils/debugger/SkObjectParser.h', - '<(skia_src_path)/utils/mac/SkCreateCGImageRef.cpp', '<(skia_src_path)/utils/SkBase64.cpp', '<(skia_src_path)/utils/SkBase64.h', '<(skia_src_path)/utils/SkBitmapHasher.cpp', @@ -824,6 +821,8 @@ '<(skia_src_path)/utils/SkGatherPixelRefsAndRects.h', '<(skia_src_path)/utils/SkInterpolator.cpp', '<(skia_src_path)/utils/SkLayer.cpp', + '<(skia_src_path)/utils/SkMatrix22.cpp', + '<(skia_src_path)/utils/SkMatrix22.h', '<(skia_src_path)/utils/SkMatrix44.cpp', '<(skia_src_path)/utils/SkMD5.cpp', '<(skia_src_path)/utils/SkMD5.h', @@ -856,6 +855,7 @@ #mac '<(skia_include_path)/utils/mac/SkCGUtils.h', '<(skia_src_path)/utils/mac/SkCreateCGImageRef.cpp', + '<(skia_src_path)/utils/mac/SkStream_mac.cpp', #windows '<(skia_include_path)/utils/win/SkAutoCoInitialize.h', diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi index 3b15ec6645..66ed8f2c0a 100644 --- a/skia/skia_library.gypi +++ b/skia/skia_library.gypi @@ -84,6 +84,8 @@ '../third_party/skia/src/utils/SkCanvasStateUtils.cpp', '../third_party/skia/src/utils/SkEventTracer.cpp', '../third_party/skia/src/utils/SkDeferredCanvas.cpp', + '../third_party/skia/src/utils/SkMatrix22.cpp', + '../third_party/skia/src/utils/SkMatrix22.h', '../third_party/skia/src/utils/SkMatrix44.cpp', '../third_party/skia/src/utils/SkNullCanvas.cpp', '../third_party/skia/include/utils/SkNWayCanvas.h', diff --git a/skia/skia_library.target.darwin-arm.mk b/skia/skia_library.target.darwin-arm.mk index 2de61f7282..6041cef234 100644 --- a/skia/skia_library.target.darwin-arm.mk +++ b/skia/skia_library.target.darwin-arm.mk @@ -52,6 +52,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/utils/SkCanvasStateUtils.cpp \ third_party/skia/src/utils/SkEventTracer.cpp \ third_party/skia/src/utils/SkDeferredCanvas.cpp \ + third_party/skia/src/utils/SkMatrix22.cpp \ third_party/skia/src/utils/SkMatrix44.cpp \ third_party/skia/src/utils/SkNullCanvas.cpp \ third_party/skia/src/utils/SkNWayCanvas.cpp \ @@ -62,6 +63,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkAnnotation.cpp \ third_party/skia/src/core/SkAdvancedTypefaceMetrics.cpp \ third_party/skia/src/core/SkAlphaRuns.cpp \ + third_party/skia/src/core/SkBBHFactory.cpp \ third_party/skia/src/core/SkBBoxRecord.cpp \ third_party/skia/src/core/SkBBoxHierarchyRecord.cpp \ third_party/skia/src/core/SkBitmap.cpp \ @@ -147,6 +149,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkPictureFlat.cpp \ third_party/skia/src/core/SkPicturePlayback.cpp \ third_party/skia/src/core/SkPictureRecord.cpp \ + third_party/skia/src/core/SkPictureRecorder.cpp \ third_party/skia/src/core/SkPictureShader.cpp \ third_party/skia/src/core/SkPictureStateTree.cpp \ third_party/skia/src/core/SkPixelRef.cpp \ @@ -165,6 +168,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkRegion_path.cpp \ third_party/skia/src/core/SkRRect.cpp \ third_party/skia/src/core/SkRTree.cpp \ + third_party/skia/src/core/SkRTreePicture.cpp \ third_party/skia/src/core/SkScaledImageCache.cpp \ third_party/skia/src/core/SkScalar.cpp \ third_party/skia/src/core/SkScalerContext.cpp \ @@ -467,7 +471,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -486,7 +494,6 @@ MY_DEFS_Debug := \ '-DSK_USE_POSIX_THREADS' \ '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -608,7 +615,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -627,7 +638,6 @@ MY_DEFS_Release := \ '-DSK_USE_POSIX_THREADS' \ '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -703,7 +713,6 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_library.target.darwin-mips.mk b/skia/skia_library.target.darwin-mips.mk index 979011f297..01d7e2d492 100644 --- a/skia/skia_library.target.darwin-mips.mk +++ b/skia/skia_library.target.darwin-mips.mk @@ -52,6 +52,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/utils/SkCanvasStateUtils.cpp \ third_party/skia/src/utils/SkEventTracer.cpp \ third_party/skia/src/utils/SkDeferredCanvas.cpp \ + third_party/skia/src/utils/SkMatrix22.cpp \ third_party/skia/src/utils/SkMatrix44.cpp \ third_party/skia/src/utils/SkNullCanvas.cpp \ third_party/skia/src/utils/SkNWayCanvas.cpp \ @@ -62,6 +63,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkAnnotation.cpp \ third_party/skia/src/core/SkAdvancedTypefaceMetrics.cpp \ third_party/skia/src/core/SkAlphaRuns.cpp \ + third_party/skia/src/core/SkBBHFactory.cpp \ third_party/skia/src/core/SkBBoxRecord.cpp \ third_party/skia/src/core/SkBBoxHierarchyRecord.cpp \ third_party/skia/src/core/SkBitmap.cpp \ @@ -147,6 +149,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkPictureFlat.cpp \ third_party/skia/src/core/SkPicturePlayback.cpp \ third_party/skia/src/core/SkPictureRecord.cpp \ + third_party/skia/src/core/SkPictureRecorder.cpp \ third_party/skia/src/core/SkPictureShader.cpp \ third_party/skia/src/core/SkPictureStateTree.cpp \ third_party/skia/src/core/SkPixelRef.cpp \ @@ -165,6 +168,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkRegion_path.cpp \ third_party/skia/src/core/SkRRect.cpp \ third_party/skia/src/core/SkRTree.cpp \ + third_party/skia/src/core/SkRTreePicture.cpp \ third_party/skia/src/core/SkScaledImageCache.cpp \ third_party/skia/src/core/SkScalar.cpp \ third_party/skia/src/core/SkScalerContext.cpp \ @@ -466,7 +470,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -484,7 +492,6 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -606,7 +613,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -624,7 +635,6 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -698,7 +708,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_library.target.darwin-x86.mk b/skia/skia_library.target.darwin-x86.mk index 7297250bef..2e19a633de 100644 --- a/skia/skia_library.target.darwin-x86.mk +++ b/skia/skia_library.target.darwin-x86.mk @@ -53,6 +53,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/utils/SkCanvasStateUtils.cpp \ third_party/skia/src/utils/SkEventTracer.cpp \ third_party/skia/src/utils/SkDeferredCanvas.cpp \ + third_party/skia/src/utils/SkMatrix22.cpp \ third_party/skia/src/utils/SkMatrix44.cpp \ third_party/skia/src/utils/SkNullCanvas.cpp \ third_party/skia/src/utils/SkNWayCanvas.cpp \ @@ -63,6 +64,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkAnnotation.cpp \ third_party/skia/src/core/SkAdvancedTypefaceMetrics.cpp \ third_party/skia/src/core/SkAlphaRuns.cpp \ + third_party/skia/src/core/SkBBHFactory.cpp \ third_party/skia/src/core/SkBBoxRecord.cpp \ third_party/skia/src/core/SkBBoxHierarchyRecord.cpp \ third_party/skia/src/core/SkBitmap.cpp \ @@ -148,6 +150,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkPictureFlat.cpp \ third_party/skia/src/core/SkPicturePlayback.cpp \ third_party/skia/src/core/SkPictureRecord.cpp \ + third_party/skia/src/core/SkPictureRecorder.cpp \ third_party/skia/src/core/SkPictureShader.cpp \ third_party/skia/src/core/SkPictureStateTree.cpp \ third_party/skia/src/core/SkPixelRef.cpp \ @@ -166,6 +169,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkRegion_path.cpp \ third_party/skia/src/core/SkRRect.cpp \ third_party/skia/src/core/SkRTree.cpp \ + third_party/skia/src/core/SkRTreePicture.cpp \ third_party/skia/src/core/SkScaledImageCache.cpp \ third_party/skia/src/core/SkScalar.cpp \ third_party/skia/src/core/SkScalerContext.cpp \ @@ -468,7 +472,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -486,7 +494,6 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -608,7 +615,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -626,7 +637,6 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -699,7 +709,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_library.target.darwin-x86_64.mk b/skia/skia_library.target.darwin-x86_64.mk index 38e4ff9e14..122773814a 100644 --- a/skia/skia_library.target.darwin-x86_64.mk +++ b/skia/skia_library.target.darwin-x86_64.mk @@ -53,6 +53,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/utils/SkCanvasStateUtils.cpp \ third_party/skia/src/utils/SkEventTracer.cpp \ third_party/skia/src/utils/SkDeferredCanvas.cpp \ + third_party/skia/src/utils/SkMatrix22.cpp \ third_party/skia/src/utils/SkMatrix44.cpp \ third_party/skia/src/utils/SkNullCanvas.cpp \ third_party/skia/src/utils/SkNWayCanvas.cpp \ @@ -63,6 +64,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkAnnotation.cpp \ third_party/skia/src/core/SkAdvancedTypefaceMetrics.cpp \ third_party/skia/src/core/SkAlphaRuns.cpp \ + third_party/skia/src/core/SkBBHFactory.cpp \ third_party/skia/src/core/SkBBoxRecord.cpp \ third_party/skia/src/core/SkBBoxHierarchyRecord.cpp \ third_party/skia/src/core/SkBitmap.cpp \ @@ -148,6 +150,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkPictureFlat.cpp \ third_party/skia/src/core/SkPicturePlayback.cpp \ third_party/skia/src/core/SkPictureRecord.cpp \ + third_party/skia/src/core/SkPictureRecorder.cpp \ third_party/skia/src/core/SkPictureShader.cpp \ third_party/skia/src/core/SkPictureStateTree.cpp \ third_party/skia/src/core/SkPixelRef.cpp \ @@ -166,6 +169,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkRegion_path.cpp \ third_party/skia/src/core/SkRRect.cpp \ third_party/skia/src/core/SkRTree.cpp \ + third_party/skia/src/core/SkRTreePicture.cpp \ third_party/skia/src/core/SkScaledImageCache.cpp \ third_party/skia/src/core/SkScalar.cpp \ third_party/skia/src/core/SkScalerContext.cpp \ @@ -468,7 +472,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -486,7 +494,6 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -608,7 +615,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -626,7 +637,6 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -699,7 +709,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_library.target.linux-arm.mk b/skia/skia_library.target.linux-arm.mk index 2de61f7282..6041cef234 100644 --- a/skia/skia_library.target.linux-arm.mk +++ b/skia/skia_library.target.linux-arm.mk @@ -52,6 +52,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/utils/SkCanvasStateUtils.cpp \ third_party/skia/src/utils/SkEventTracer.cpp \ third_party/skia/src/utils/SkDeferredCanvas.cpp \ + third_party/skia/src/utils/SkMatrix22.cpp \ third_party/skia/src/utils/SkMatrix44.cpp \ third_party/skia/src/utils/SkNullCanvas.cpp \ third_party/skia/src/utils/SkNWayCanvas.cpp \ @@ -62,6 +63,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkAnnotation.cpp \ third_party/skia/src/core/SkAdvancedTypefaceMetrics.cpp \ third_party/skia/src/core/SkAlphaRuns.cpp \ + third_party/skia/src/core/SkBBHFactory.cpp \ third_party/skia/src/core/SkBBoxRecord.cpp \ third_party/skia/src/core/SkBBoxHierarchyRecord.cpp \ third_party/skia/src/core/SkBitmap.cpp \ @@ -147,6 +149,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkPictureFlat.cpp \ third_party/skia/src/core/SkPicturePlayback.cpp \ third_party/skia/src/core/SkPictureRecord.cpp \ + third_party/skia/src/core/SkPictureRecorder.cpp \ third_party/skia/src/core/SkPictureShader.cpp \ third_party/skia/src/core/SkPictureStateTree.cpp \ third_party/skia/src/core/SkPixelRef.cpp \ @@ -165,6 +168,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkRegion_path.cpp \ third_party/skia/src/core/SkRRect.cpp \ third_party/skia/src/core/SkRTree.cpp \ + third_party/skia/src/core/SkRTreePicture.cpp \ third_party/skia/src/core/SkScaledImageCache.cpp \ third_party/skia/src/core/SkScalar.cpp \ third_party/skia/src/core/SkScalerContext.cpp \ @@ -467,7 +471,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -486,7 +494,6 @@ MY_DEFS_Debug := \ '-DSK_USE_POSIX_THREADS' \ '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -608,7 +615,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -627,7 +638,6 @@ MY_DEFS_Release := \ '-DSK_USE_POSIX_THREADS' \ '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -703,7 +713,6 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_library.target.linux-mips.mk b/skia/skia_library.target.linux-mips.mk index 979011f297..01d7e2d492 100644 --- a/skia/skia_library.target.linux-mips.mk +++ b/skia/skia_library.target.linux-mips.mk @@ -52,6 +52,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/utils/SkCanvasStateUtils.cpp \ third_party/skia/src/utils/SkEventTracer.cpp \ third_party/skia/src/utils/SkDeferredCanvas.cpp \ + third_party/skia/src/utils/SkMatrix22.cpp \ third_party/skia/src/utils/SkMatrix44.cpp \ third_party/skia/src/utils/SkNullCanvas.cpp \ third_party/skia/src/utils/SkNWayCanvas.cpp \ @@ -62,6 +63,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkAnnotation.cpp \ third_party/skia/src/core/SkAdvancedTypefaceMetrics.cpp \ third_party/skia/src/core/SkAlphaRuns.cpp \ + third_party/skia/src/core/SkBBHFactory.cpp \ third_party/skia/src/core/SkBBoxRecord.cpp \ third_party/skia/src/core/SkBBoxHierarchyRecord.cpp \ third_party/skia/src/core/SkBitmap.cpp \ @@ -147,6 +149,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkPictureFlat.cpp \ third_party/skia/src/core/SkPicturePlayback.cpp \ third_party/skia/src/core/SkPictureRecord.cpp \ + third_party/skia/src/core/SkPictureRecorder.cpp \ third_party/skia/src/core/SkPictureShader.cpp \ third_party/skia/src/core/SkPictureStateTree.cpp \ third_party/skia/src/core/SkPixelRef.cpp \ @@ -165,6 +168,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkRegion_path.cpp \ third_party/skia/src/core/SkRRect.cpp \ third_party/skia/src/core/SkRTree.cpp \ + third_party/skia/src/core/SkRTreePicture.cpp \ third_party/skia/src/core/SkScaledImageCache.cpp \ third_party/skia/src/core/SkScalar.cpp \ third_party/skia/src/core/SkScalerContext.cpp \ @@ -466,7 +470,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -484,7 +492,6 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -606,7 +613,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -624,7 +635,6 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -698,7 +708,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_library.target.linux-x86.mk b/skia/skia_library.target.linux-x86.mk index 7297250bef..2e19a633de 100644 --- a/skia/skia_library.target.linux-x86.mk +++ b/skia/skia_library.target.linux-x86.mk @@ -53,6 +53,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/utils/SkCanvasStateUtils.cpp \ third_party/skia/src/utils/SkEventTracer.cpp \ third_party/skia/src/utils/SkDeferredCanvas.cpp \ + third_party/skia/src/utils/SkMatrix22.cpp \ third_party/skia/src/utils/SkMatrix44.cpp \ third_party/skia/src/utils/SkNullCanvas.cpp \ third_party/skia/src/utils/SkNWayCanvas.cpp \ @@ -63,6 +64,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkAnnotation.cpp \ third_party/skia/src/core/SkAdvancedTypefaceMetrics.cpp \ third_party/skia/src/core/SkAlphaRuns.cpp \ + third_party/skia/src/core/SkBBHFactory.cpp \ third_party/skia/src/core/SkBBoxRecord.cpp \ third_party/skia/src/core/SkBBoxHierarchyRecord.cpp \ third_party/skia/src/core/SkBitmap.cpp \ @@ -148,6 +150,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkPictureFlat.cpp \ third_party/skia/src/core/SkPicturePlayback.cpp \ third_party/skia/src/core/SkPictureRecord.cpp \ + third_party/skia/src/core/SkPictureRecorder.cpp \ third_party/skia/src/core/SkPictureShader.cpp \ third_party/skia/src/core/SkPictureStateTree.cpp \ third_party/skia/src/core/SkPixelRef.cpp \ @@ -166,6 +169,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkRegion_path.cpp \ third_party/skia/src/core/SkRRect.cpp \ third_party/skia/src/core/SkRTree.cpp \ + third_party/skia/src/core/SkRTreePicture.cpp \ third_party/skia/src/core/SkScaledImageCache.cpp \ third_party/skia/src/core/SkScalar.cpp \ third_party/skia/src/core/SkScalerContext.cpp \ @@ -468,7 +472,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -486,7 +494,6 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -608,7 +615,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -626,7 +637,6 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -699,7 +709,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_library.target.linux-x86_64.mk b/skia/skia_library.target.linux-x86_64.mk index 38e4ff9e14..122773814a 100644 --- a/skia/skia_library.target.linux-x86_64.mk +++ b/skia/skia_library.target.linux-x86_64.mk @@ -53,6 +53,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/utils/SkCanvasStateUtils.cpp \ third_party/skia/src/utils/SkEventTracer.cpp \ third_party/skia/src/utils/SkDeferredCanvas.cpp \ + third_party/skia/src/utils/SkMatrix22.cpp \ third_party/skia/src/utils/SkMatrix44.cpp \ third_party/skia/src/utils/SkNullCanvas.cpp \ third_party/skia/src/utils/SkNWayCanvas.cpp \ @@ -63,6 +64,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkAnnotation.cpp \ third_party/skia/src/core/SkAdvancedTypefaceMetrics.cpp \ third_party/skia/src/core/SkAlphaRuns.cpp \ + third_party/skia/src/core/SkBBHFactory.cpp \ third_party/skia/src/core/SkBBoxRecord.cpp \ third_party/skia/src/core/SkBBoxHierarchyRecord.cpp \ third_party/skia/src/core/SkBitmap.cpp \ @@ -148,6 +150,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkPictureFlat.cpp \ third_party/skia/src/core/SkPicturePlayback.cpp \ third_party/skia/src/core/SkPictureRecord.cpp \ + third_party/skia/src/core/SkPictureRecorder.cpp \ third_party/skia/src/core/SkPictureShader.cpp \ third_party/skia/src/core/SkPictureStateTree.cpp \ third_party/skia/src/core/SkPixelRef.cpp \ @@ -166,6 +169,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/core/SkRegion_path.cpp \ third_party/skia/src/core/SkRRect.cpp \ third_party/skia/src/core/SkRTree.cpp \ + third_party/skia/src/core/SkRTreePicture.cpp \ third_party/skia/src/core/SkScaledImageCache.cpp \ third_party/skia/src/core/SkScalar.cpp \ third_party/skia/src/core/SkScalerContext.cpp \ @@ -468,7 +472,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -486,7 +494,6 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -608,7 +615,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -626,7 +637,6 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -699,7 +709,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_opts.target.darwin-arm.mk b/skia/skia_opts.target.darwin-arm.mk index 5550cd983c..a0e3f043ea 100644 --- a/skia/skia_opts.target.darwin-arm.mk +++ b/skia/skia_opts.target.darwin-arm.mk @@ -100,7 +100,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -222,7 +226,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -296,7 +304,6 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_opts.target.darwin-mips.mk b/skia/skia_opts.target.darwin-mips.mk index 1b02de0dec..b4ffe7968f 100644 --- a/skia/skia_opts.target.darwin-mips.mk +++ b/skia/skia_opts.target.darwin-mips.mk @@ -98,7 +98,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -218,7 +222,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -289,7 +297,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_opts.target.darwin-x86.mk b/skia/skia_opts.target.darwin-x86.mk index ed48300468..7d5decf85c 100644 --- a/skia/skia_opts.target.darwin-x86.mk +++ b/skia/skia_opts.target.darwin-x86.mk @@ -99,7 +99,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -218,7 +222,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -288,7 +296,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_opts.target.darwin-x86_64.mk b/skia/skia_opts.target.darwin-x86_64.mk index a894ef8249..7d95840073 100644 --- a/skia/skia_opts.target.darwin-x86_64.mk +++ b/skia/skia_opts.target.darwin-x86_64.mk @@ -99,7 +99,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -218,7 +222,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -288,7 +296,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_opts.target.linux-arm.mk b/skia/skia_opts.target.linux-arm.mk index 5550cd983c..a0e3f043ea 100644 --- a/skia/skia_opts.target.linux-arm.mk +++ b/skia/skia_opts.target.linux-arm.mk @@ -100,7 +100,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -222,7 +226,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -296,7 +304,6 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_opts.target.linux-mips.mk b/skia/skia_opts.target.linux-mips.mk index 1b02de0dec..b4ffe7968f 100644 --- a/skia/skia_opts.target.linux-mips.mk +++ b/skia/skia_opts.target.linux-mips.mk @@ -98,7 +98,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -218,7 +222,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -289,7 +297,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_opts.target.linux-x86.mk b/skia/skia_opts.target.linux-x86.mk index ed48300468..7d5decf85c 100644 --- a/skia/skia_opts.target.linux-x86.mk +++ b/skia/skia_opts.target.linux-x86.mk @@ -99,7 +99,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -218,7 +222,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -288,7 +296,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_opts.target.linux-x86_64.mk b/skia/skia_opts.target.linux-x86_64.mk index a894ef8249..7d95840073 100644 --- a/skia/skia_opts.target.linux-x86_64.mk +++ b/skia/skia_opts.target.linux-x86_64.mk @@ -99,7 +99,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -218,7 +222,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -288,7 +296,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_opts_neon.target.darwin-arm.mk b/skia/skia_opts_neon.target.darwin-arm.mk index 7d72ff5e1a..8cc636532f 100644 --- a/skia/skia_opts_neon.target.darwin-arm.mk +++ b/skia/skia_opts_neon.target.darwin-arm.mk @@ -101,7 +101,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -223,7 +227,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -299,7 +307,6 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_opts_neon.target.linux-arm.mk b/skia/skia_opts_neon.target.linux-arm.mk index 7d72ff5e1a..8cc636532f 100644 --- a/skia/skia_opts_neon.target.linux-arm.mk +++ b/skia/skia_opts_neon.target.linux-arm.mk @@ -101,7 +101,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -223,7 +227,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -299,7 +307,6 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_opts_ssse3.target.darwin-x86.mk b/skia/skia_opts_ssse3.target.darwin-x86.mk index 064a67979d..49200be5b9 100644 --- a/skia/skia_opts_ssse3.target.darwin-x86.mk +++ b/skia/skia_opts_ssse3.target.darwin-x86.mk @@ -93,7 +93,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -212,7 +216,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -281,7 +289,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_opts_ssse3.target.darwin-x86_64.mk b/skia/skia_opts_ssse3.target.darwin-x86_64.mk index e8966d102d..27d8c064ac 100644 --- a/skia/skia_opts_ssse3.target.darwin-x86_64.mk +++ b/skia/skia_opts_ssse3.target.darwin-x86_64.mk @@ -93,7 +93,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -212,7 +216,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -281,7 +289,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_opts_ssse3.target.linux-x86.mk b/skia/skia_opts_ssse3.target.linux-x86.mk index 064a67979d..49200be5b9 100644 --- a/skia/skia_opts_ssse3.target.linux-x86.mk +++ b/skia/skia_opts_ssse3.target.linux-x86.mk @@ -93,7 +93,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -212,7 +216,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -281,7 +289,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_opts_ssse3.target.linux-x86_64.mk b/skia/skia_opts_ssse3.target.linux-x86_64.mk index e8966d102d..27d8c064ac 100644 --- a/skia/skia_opts_ssse3.target.linux-x86_64.mk +++ b/skia/skia_opts_ssse3.target.linux-x86_64.mk @@ -93,7 +93,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -212,7 +216,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ @@ -281,7 +289,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/skia/skia_test_expectations.txt b/skia/skia_test_expectations.txt index edb6b9d830..1c56effeb9 100644 --- a/skia/skia_test_expectations.txt +++ b/skia/skia_test_expectations.txt @@ -55,4 +55,8 @@ crbug.com/344497 [ Win ] virtual/deferred/fast/images/webp-color-profile-lossy.h crbug.com/356644 fast/canvas/image-pattern-rotate.html [ ImageOnlyFailure ] crbug.com/356644 virtual/gpu/fast/canvas/image-object-in-canvas.html [ ImageOnlyFailure ] +# Roll to 14271+ cases negligible changes to SkTwoPtConicalGradient. +crbug.com/365698 fast/gradients/radial-centered.html [ ImageOnlyFailure ] +crbug.com/365698 svg/custom/radialGradient-focal-radius.svg [ ImageOnlyFailure ] + # END OVERRIDES HERE (this line ensures that the file is newline-terminated) |