Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Issue 1761793003: Revert of move annotations to canvas virtual (Closed)

Created:
4 years, 9 months ago by reed1
Modified:
4 years, 9 months ago
Reviewers:
hal.canary, f(malita)
CC:
reviews_skia.org
Base URL:
https://skia.googlesource.com/skia.git@master
Target Ref:
refs/heads/master
Project:
skia
Visibility:
Public.

Description

Revert of move annotations to canvas virtual (patchset #8 id:140001 of https://codereview.chromium.org/1744103002/ ) Reason for revert: need to update unittest in blink: FAILED: /b/build/goma/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/third_party/WebKit/Source/core/page/webkit_unit_tests.PrintContextTest.o.d -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE=0 -DCHROMIUM_BUILD -DCR_CLANG_REVISION=261368-1 -DCOMPONENT_BUILD -DUSE_LIBJPEG_TURBO=1 -DENABLE_WEBRTC=1 -DENABLE_MEDIA_ROUTER=1 -DENABLE_PEPPER_CDMS -DENABLE_CONFIGURATION_POLICY -DENABLE_NOTIFICATIONS -DENABLE_TOPCHROME_MD=1 -DDCHECK_ALWAYS_ON=1 -DFIELDTRIAL_TESTING_ENABLED -DENABLE_TASK_MANAGER=1 -DENABLE_EXTENSIONS=1 -DENABLE_PDF=1 -DENABLE_PLUGIN_INSTALLATION=1 -DENABLE_PLUGINS=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_THEMES=1 -DENABLE_AUTOFILL_DIALOG=1 -DENABLE_PRINTING=1 -DENABLE_BASIC_PRINTING=1 -DENABLE_PRINT_PREVIEW=1 -DENABLE_SPELLCHECK=1 -DUSE_BROWSER_SPELLCHECKER=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1 -DENABLE_SUPERVISED_USERS=1 -DENABLE_SERVICE_DISCOVERY=1 -DV8_USE_EXTERNAL_STARTUP_DATA -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DBLINK_IMPLEMENTATION=1 -DINSIDE_BLINK -DMOJO_USE_SYSTEM_IMPL -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 -DSKIA_DLL -DGR_GL_IGNORE_ES3_MSAA=0 -DSK_SUPPORT_GPU=1 -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DENABLE_LAYOUT_UNIT_IN_INLINE_BOXES=0 -DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1 -DENABLE_INPUT_MULTIPLE_FIELDS_UI=1 -DWTF_USE_ICCJPEG=1 -DWTF_USE_QCMSLIB=1 -DENABLE_OILPAN=1 -DUNIT_TEST -DGTEST_HAS_RTTI=0 -DV8_SHARED -DUSING_V8_SHARED -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -Igen -I../../third_party/WebKit/public/web -I../../third_party/WebKit/Source/web -I../../third_party/WebKit/Source/web/src -I../../third_party/WebKit/public/web/mac -I../.. -I../../skia/config -I../../third_party/WebKit/Source -I../../third_party/khronos -I../../gpu -Igen/angle -I../../third_party/WebKit -I../../skia/ext -I../../third_party/skia/include/core -I../../third_party/skia/include/effects -I../../third_party/skia/include/pdf -I../../third_party/skia/include/gpu -I../../third_party/skia/include/lazy -I../../third_party/skia/include/pathops -I../../third_party/skia/include/pipe -I../../third_party/skia/include/ports -I../../third_party/skia/include/utils -I../../third_party/skia/include/utils/mac -I../../third_party/icu/source/common -I../../third_party/npapi -I../../third_party/npapi/bindings -I../../third_party/libpng -I../../third_party/ots/include -I../../third_party/qcms/src -I../../third_party/iccjpeg -I../../third_party/libjpeg_turbo -I../../third_party/WebKit -I../../third_party/icu/source/i18n -I../../testing/gmock/include -I../../testing/gtest/include -I../../third_party/libwebp -I../../third_party/zlib -I../../v8/include -Igen/blink -isysroot /Applications/Xcode5.1.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk -O0 -fvisibility=hidden -Werror -mmacosx-version-min=10.6 -arch x86_64 -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-selector-type-mismatch -Wpartial-availability -Wheader-hygiene -Wno-char-subscripts -Wno-unneeded-internal-declaration -Wno-covered-switch-default -Wstring-conversion -Wno-c++11-narrowing -Wno-deprecated-register -Wno-inconsistent-missing-override -Wno-shift-negative-value -Wexit-time-destructors -std=c++11 -stdlib=libc++ -fno-rtti -fno-exceptions -fvisibility-inlines-hidden -fno-threadsafe-statics -Xclang -load -Xclang /b/build/slave/mac/build/src/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib -Xclang -add-plugin -Xclang find-bad-constructs -Xclang -plugin-arg-find-bad-constructs -Xclang check-templates -Xclang -plugin-arg-find-bad-constructs -Xclang follow-macro-expansion -fcolor-diagnostics -fno-strict-aliasing -Xclang -load -Xclang /b/build/slave/mac/build/src/third_party/llvm-build/Release+Asserts/lib/libBlinkGCPlugin.dylib -Xclang -add-plugin -Xclang blink-gc-plugin -Xclang -plugin-arg-blink-gc-plugin -Xclang enable-oilpan -Xclang -plugin-arg-blink-gc-plugin -Xclang warn-raw-ptr -fstack-protector-all -c ../../third_party/WebKit/Source/core/page/PrintContextTest.cpp -o obj/third_party/WebKit/Source/core/page/webkit_unit_tests.PrintContextTest.o ../../third_party/WebKit/Source/core/page/PrintContextTest.cpp:54:20: error: no member named 'getAnnotation' in 'SkPaint' if (!paint.getAnnotation()) ~~~~~ ^ Original issue's description: > move annotations to canvas virtual > > In an effort to do it all at once, this change assumes that its ok to ignore annotations that were previously stored on paints in old SKP files (since this feature is only interesting to PDF printing). > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1744103002 > > Committed: https://skia.googlesource.com/skia/+/0eda2587cc9233066cb3f3fec08f35c061780f8e TBR=halcanary@google.com,fmalita@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Committed: https://skia.googlesource.com/skia/+/1610835624a9658cc60940b80038b84f297e836f

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+259 lines, -335 lines) Patch
M include/core/SkAnnotation.h View 4 chunks +73 lines, -3 lines 0 comments Download
M include/core/SkCanvas.h View 3 chunks +0 lines, -14 lines 0 comments Download
M include/core/SkDevice.h View 1 chunk +0 lines, -2 lines 0 comments Download
M include/core/SkPaint.h View 3 chunks +5 lines, -0 lines 0 comments Download
M include/core/SkPicture.h View 2 chunks +2 lines, -3 lines 0 comments Download
M include/core/SkWriter32.h View 1 chunk +0 lines, -12 lines 0 comments Download
M include/private/SkRecords.h View 4 chunks +2 lines, -8 lines 0 comments Download
M include/utils/SkDumpCanvas.h View 2 chunks +0 lines, -2 lines 0 comments Download
M include/utils/SkNWayCanvas.h View 1 chunk +0 lines, -1 line 0 comments Download
M samplecode/SampleFilterFuzz.cpp View 2 chunks +4 lines, -0 lines 0 comments Download
M src/core/SkAnnotation.cpp View 2 chunks +47 lines, -8 lines 0 comments Download
D src/core/SkAnnotationKeys.h View 1 chunk +0 lines, -33 lines 0 comments Download
M src/core/SkBitmapDevice.cpp View 4 chunks +10 lines, -0 lines 0 comments Download
M src/core/SkCanvas.cpp View 2 chunks +0 lines, -17 lines 0 comments Download
M src/core/SkPaint.cpp View 14 chunks +30 lines, -9 lines 0 comments Download
M src/core/SkPictureFlat.h View 1 chunk +1 line, -3 lines 0 comments Download
M src/core/SkPicturePlayback.cpp View 1 chunk +0 lines, -6 lines 0 comments Download
M src/core/SkPictureRecord.h View 1 chunk +0 lines, -1 line 0 comments Download
M src/core/SkPictureRecord.cpp View 1 chunk +0 lines, -12 lines 0 comments Download
M src/core/SkReadBuffer.h View 1 chunk +0 lines, -1 line 0 comments Download
M src/core/SkReader32.h View 3 chunks +1 line, -9 lines 0 comments Download
M src/core/SkRecordDraw.cpp View 2 chunks +0 lines, -5 lines 0 comments Download
M src/core/SkRecorder.h View 1 chunk +0 lines, -1 line 0 comments Download
M src/core/SkRecorder.cpp View 1 chunk +0 lines, -4 lines 0 comments Download
M src/core/SkRemote.h View 1 chunk +2 lines, -1 line 0 comments Download
M src/core/SkRemote.cpp View 10 chunks +10 lines, -0 lines 0 comments Download
M src/core/SkRemote_protocol.h View 1 chunk +1 line, -0 lines 0 comments Download
M src/gpu/SkGpuDevice.cpp View 8 chunks +12 lines, -0 lines 0 comments Download
M src/pdf/SkPDFDevice.h View 2 chunks +4 lines, -4 lines 0 comments Download
M src/pdf/SkPDFDevice.cpp View 7 chunks +55 lines, -37 lines 0 comments Download
M src/utils/SkDumpCanvas.cpp View 2 chunks +0 lines, -8 lines 0 comments Download
M src/utils/SkNWayCanvas.cpp View 1 chunk +0 lines, -7 lines 0 comments Download
M tests/SerializationTest.cpp View 2 chunks +0 lines, -83 lines 0 comments Download
M tests/Writer32Test.cpp View 1 chunk +0 lines, -41 lines 0 comments Download

Messages

Total messages: 4 (1 generated)
reed1
Created Revert of move annotations to canvas virtual
4 years, 9 months ago (2016-03-03 17:14:21 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1761793003/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1761793003/1
4 years, 9 months ago (2016-03-03 17:14:28 UTC) #2
commit-bot: I haz the power
4 years, 9 months ago (2016-03-03 17:14:40 UTC) #4
Message was sent while issue was closed.
Committed patchset #1 (id:1) as
https://skia.googlesource.com/skia/+/1610835624a9658cc60940b80038b84f297e836f

Powered by Google App Engine
This is Rietveld 408576698