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

Issue 111353003: deprecate SkScalarRound (and its ilk), use SkScalarRound[ToInt,ToScalar]. #define SK_SUPPORT_DEPREC… (Closed)

Created:
7 years ago by reed1
Modified:
7 years ago
Reviewers:
robertphillips
CC:
skia-review_googlegroups.com
Visibility:
Public.

Description

deprecate SkScalarRound (and its ilk), use SkScalarRound[ToInt,ToScalar]. #define SK_SUPPORT_DEPRECATED_SCALARROUND for legacy clients BUG= R=robertphillips@google.com Committed: https://code.google.com/p/skia/source/detail?r=12719

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+119 lines, -106 lines) Patch
M bench/BlurBench.cpp View 1 chunk +1 line, -1 line 0 comments Download
M bench/MorphologyBench.cpp View 1 chunk +1 line, -1 line 0 comments Download
M debugger/QT/SkGLWidget.cpp View 1 chunk +2 lines, -2 lines 0 comments Download
M experimental/SkiaExamples/SkExample.cpp View 1 chunk +2 lines, -2 lines 0 comments Download
M include/core/SkScalar.h View 3 chunks +10 lines, -6 lines 0 comments Download
M include/core/SkSize.h View 1 chunk +3 lines, -3 lines 0 comments Download
M samplecode/SampleAll.cpp View 1 chunk +1 line, -1 line 0 comments Download
M samplecode/SampleApp.cpp View 3 chunks +6 lines, -6 lines 0 comments Download
M samplecode/SampleCull.cpp View 1 chunk +4 lines, -2 lines 0 comments Download
M samplecode/SampleDegenerateTwoPtRadials.cpp View 1 chunk +1 line, -1 line 0 comments Download
M samplecode/SampleFilter2.cpp View 1 chunk +2 lines, -2 lines 0 comments Download
M samplecode/SampleLayerMask.cpp View 1 chunk +2 lines, -2 lines 0 comments Download
M samplecode/SampleLines.cpp View 1 chunk +1 line, -1 line 0 comments Download
M samplecode/SampleRegion.cpp View 1 chunk +2 lines, -1 line 0 comments Download
M samplecode/SampleSkLayer.cpp View 1 chunk +1 line, -1 line 0 comments Download
M samplecode/SampleText.cpp View 1 chunk +1 line, -1 line 0 comments Download
M src/animator/SkAnimateBase.cpp View 1 chunk +4 lines, -2 lines 0 comments Download
M src/animator/SkDisplayMath.cpp View 3 chunks +3 lines, -3 lines 0 comments Download
M src/animator/SkDrawColor.cpp View 2 chunks +3 lines, -3 lines 0 comments Download
M src/animator/SkOperandIterpolator.cpp View 1 chunk +1 line, -1 line 0 comments Download
M src/animator/SkScript.cpp View 4 chunks +4 lines, -4 lines 0 comments Download
M src/animator/SkScriptRuntime.cpp View 1 chunk +1 line, -1 line 0 comments Download
M src/animator/SkScriptTokenizer.cpp View 2 chunks +2 lines, -2 lines 0 comments Download
M src/animator/SkSnapshot.cpp View 1 chunk +1 line, -1 line 0 comments Download
M src/core/SkClipStack.cpp View 1 chunk +4 lines, -4 lines 0 comments Download
M src/core/SkDraw.cpp View 5 chunks +12 lines, -12 lines 0 comments Download
M src/core/SkRTree.cpp View 1 chunk +2 lines, -2 lines 0 comments Download
M src/core/SkRegion_path.cpp View 1 chunk +2 lines, -2 lines 0 comments Download
M src/core/SkScan_Hairline.cpp View 1 chunk +2 lines, -2 lines 0 comments Download
M src/effects/SkBlurMask.cpp View 3 chunks +4 lines, -4 lines 0 comments Download
M src/effects/SkDashPathEffect.cpp View 1 chunk +1 line, -1 line 0 comments Download
M src/effects/SkDiscretePathEffect.cpp View 2 chunks +2 lines, -2 lines 0 comments Download
M src/effects/SkEmbossMaskFilter.cpp View 1 chunk +1 line, -1 line 0 comments Download
M src/gpu/GrPathUtils.cpp View 2 chunks +2 lines, -2 lines 0 comments Download
M src/pdf/SkPDFShader.cpp View 1 chunk +2 lines, -2 lines 0 comments Download
M src/pdf/SkPDFTypes.cpp View 1 chunk +1 line, -1 line 0 comments Download
M src/ports/SkFontHost_win.cpp View 1 chunk +1 line, -1 line 0 comments Download
M src/utils/SkParseColor.cpp View 1 chunk +2 lines, -2 lines 0 comments Download
M src/views/SkParsePaint.cpp View 1 chunk +1 line, -1 line 0 comments Download
M src/views/SkStackViewLayout.cpp View 1 chunk +2 lines, -2 lines 0 comments Download
M src/views/SkWindow.cpp View 2 chunks +4 lines, -4 lines 0 comments Download
M src/views/unix/SkOSWindow_Unix.cpp View 1 chunk +2 lines, -1 line 0 comments Download
M src/views/win/SkOSWindow_win.cpp View 2 chunks +6 lines, -3 lines 0 comments Download
M tests/PathCoverageTest.cpp View 2 chunks +3 lines, -3 lines 0 comments Download
M tests/PathOpsExtendedTest.cpp View 1 chunk +2 lines, -2 lines 0 comments Download
M tools/skhello.cpp View 1 chunk +2 lines, -2 lines 0 comments Download

Messages

Total messages: 4 (0 generated)
reed1
7 years ago (2013-12-17 18:50:54 UTC) #1
robertphillips
lgtm
7 years ago (2013-12-17 19:20:51 UTC) #2
reed1
Committed patchset #1 manually as r12719 (presubmit successful).
7 years ago (2013-12-17 19:22:30 UTC) #3
robertphillips
7 years ago (2013-12-18 13:25:45 UTC) #4
Message was sent while issue was closed.
The SK_SUPPORT_DEPRECATED_SCALARROUND flag was required in Chromium
(https://codereview.chromium.org/117613003/#ps1):

__Mac__
FAILED: clang++ -MMD -MF obj/skia/ext/skia_chrome.opacity_draw_filter.o.d
-DV8_DEPRECATION_WARNINGS -DCHROMIUM_BUILD -DUSE_LIBJPEG_TURBO=1
-DENABLE_ONE_CLICK_SIGNIN -DENABLE_REMOTING=1 -DENABLE_WEBRTC=1
-DENABLE_PEPPER_CDMS -DENABLE_CONFIGURATION_POLICY -DENABLE_INPUT_SPEECH
-DENABLE_NOTIFICATIONS -DENABLE_HIDPI=1
-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY
-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE
-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC -DENABLE_EGLIMAGE=1
-DENABLE_TASK_MANAGER=1 -DENABLE_EXTENSIONS=1 -DENABLE_PLUGIN_INSTALLATION=1
-DENABLE_PLUGINS=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_THEMES=1
-DENABLE_AUTOFILL_DIALOG=1 -DENABLE_BACKGROUND=1 -DENABLE_AUTOMATION=1
-DENABLE_GOOGLE_NOW=1 -DCLD_VERSION=2 -DENABLE_FULL_PRINTING=1
-DENABLE_PRINTING=1 -DENABLE_SPELLCHECK=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1
-DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1 -DENABLE_MANAGED_USERS=1
-DSK_ENABLE_INST_COUNT=0 -DSK_SUPPORT_GPU=1
'-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"'
-DSK_ENABLE_LEGACY_API_ALIASING=1 -DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1
-DSK_SUPPORT_LEGACY_COLORTYPE=1 -DGR_GL_IGNORE_ES3_MSAA=0
-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1 -DSK_USE_POSIX_THREADS
-DSK_DEFERRED_CANVAS_USES_FACTORIES=1 -DNDEBUG -DNVALGRIND
-DDYNAMIC_ANNOTATIONS_ENABLED=0 -I../.. -I../../skia/config
-I../../third_party/skia/src/core -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 -isysroot
/Developer/SDKs/MacOSX10.6.sdk -O3 -gdwarf-2 -fvisibility=hidden -Werror
-Wnewline-eof -mmacosx-version-min=10.6 -arch i386 -Wendif-labels
-Wno-unused-parameter -Wno-missing-field-initializers -Wheader-hygiene
-Wno-c++11-narrowing -Wno-char-subscripts -Wno-unneeded-internal-declaration
-Wno-covered-switch-default -Wno-deprecated-register -std=gnu++11 -fno-rtti
-fno-exceptions -fvisibility-inlines-hidden -fno-threadsafe-statics -Xclang
-load -Xclang
/Volumes/data/b/build/slave/mac_layout/build/src/tools/clang/scripts/../../../third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib
-Xclang -add-plugin -Xclang find-bad-constructs -fcolor-diagnostics
-fno-strict-aliasing  -c ../../skia/ext/opacity_draw_filter.cc -o
obj/skia/ext/skia_chrome.opacity_draw_filter.o
../../skia/ext/opacity_draw_filter.cc:12:14: error: use of undeclared identifier
'SkScalarRound'
    : alpha_(SkScalarRound(opacity * 255)),
             ^
1 error generated.
FAILED: clang++ -MMD -MF obj/skia/ext/skia_chrome.skia_utils_mac.o.d
-DV8_DEPRECATION_WARNINGS -DCHROMIUM_BUILD -DUSE_LIBJPEG_TURBO=1
-DENABLE_ONE_CLICK_SIGNIN -DENABLE_REMOTING=1 -DENABLE_WEBRTC=1
-DENABLE_PEPPER_CDMS -DENABLE_CONFIGURATION_POLICY -DENABLE_INPUT_SPEECH
-DENABLE_NOTIFICATIONS -DENABLE_HIDPI=1
-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY
-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE
-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC -DENABLE_EGLIMAGE=1
-DENABLE_TASK_MANAGER=1 -DENABLE_EXTENSIONS=1 -DENABLE_PLUGIN_INSTALLATION=1
-DENABLE_PLUGINS=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_THEMES=1
-DENABLE_AUTOFILL_DIALOG=1 -DENABLE_BACKGROUND=1 -DENABLE_AUTOMATION=1
-DENABLE_GOOGLE_NOW=1 -DCLD_VERSION=2 -DENABLE_FULL_PRINTING=1
-DENABLE_PRINTING=1 -DENABLE_SPELLCHECK=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1
-DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1 -DENABLE_MANAGED_USERS=1
-DSK_ENABLE_INST_COUNT=0 -DSK_SUPPORT_GPU=1
'-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"'
-DSK_ENABLE_LEGACY_API_ALIASING=1 -DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1
-DSK_SUPPORT_LEGACY_COLORTYPE=1 -DGR_GL_IGNORE_ES3_MSAA=0
-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1 -DSK_USE_POSIX_THREADS
-DSK_DEFERRED_CANVAS_USES_FACTORIES=1 -DNDEBUG -DNVALGRIND
-DDYNAMIC_ANNOTATIONS_ENABLED=0 -I../.. -I../../skia/config
-I../../third_party/skia/src/core -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 -isysroot
/Developer/SDKs/MacOSX10.6.sdk -O3 -gdwarf-2 -fvisibility=hidden -Werror
-Wnewline-eof -mmacosx-version-min=10.6 -arch i386 -Wendif-labels
-Wno-unused-parameter -Wno-missing-field-initializers -Wheader-hygiene
-Wno-c++11-narrowing -Wno-char-subscripts -Wno-unneeded-internal-declaration
-Wno-covered-switch-default -Wno-deprecated-register -std=gnu++11 -fno-rtti
-fno-exceptions -fvisibility-inlines-hidden -fno-threadsafe-statics -Xclang
-load -Xclang
/Volumes/data/b/build/slave/mac_layout/build/src/tools/clang/scripts/../../../third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib
-Xclang -add-plugin -Xclang find-bad-constructs -fcolor-diagnostics
-fno-strict-aliasing -Wobjc-missing-property-synthesis -fobjc-call-cxx-cdtors 
-c ../../skia/ext/skia_utils_mac.mm -o obj/skia/ext/skia_chrome.skia_utils_mac.o
../../skia/ext/skia_utils_mac.mm:137:25: error: use of undeclared identifier
'SkScalarRound'
  return SkColorSetARGB(SkScalarRound(255.0 * components[3]), // alpha

__Win__
FAILED: ninja -t msvc -e environment.x86 -- E:\b\build\goma\gomacc.exe
"c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\cl.exe" /nologo
/showIncludes /FC @obj\skia\ext\skia_chrome.opacity_draw_filter.obj.rsp /c
..\..\skia\ext\opacity_draw_filter.cc
/Foobj\skia\ext\skia_chrome.opacity_draw_filter.obj
/Fdobj\skia\skia_chrome.cc.pdb 
e:\b\build\slave\win_layout\build\src\skia\ext\opacity_draw_filter.cc(12) :
error C3861: 'SkScalarRound': identifier not found
FAILED: ninja -t msvc -e environment.x86 -- E:\b\build\goma\gomacc.exe
"c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\cl.exe" /nologo
/showIncludes /FC @obj\skia\ext\skia_chrome.skia_utils_win.obj.rsp /c
..\..\skia\ext\skia_utils_win.cc /Foobj\skia\ext\skia_chrome.skia_utils_win.obj
/Fdobj\skia\skia_chrome.cc.pdb 
e:\b\build\slave\win_layout\build\src\skia\ext\skia_utils_win.cc(37) : error
C3861: 'SkScalarRound': identifier not found
e:\b\build\slave\win_layout\build\src\skia\ext\skia_utils_win.cc(37) : error
C3861: 'SkScalarRound': identifier not found
FAILED: ninja -t msvc -e environment.x86 -- E:\b\build\goma\gomacc.exe
"c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\cl.exe" /nologo
/showIncludes /FC
@obj\skia\ext\skia_chrome.vector_platform_device_emf_win.obj.rsp /c
..\..\skia\ext\vector_platform_device_emf_win.cc
/Foobj\skia\ext\skia_chrome.vector_platform_device_emf_win.obj
/Fdobj\skia\skia_chrome.cc.pdb 
e:\b\build\slave\win_layout\build\src\skia\ext\vector_platform_device_emf_win.cc(204)
: error C3861: 'SkScalarRound': identifier not found

Powered by Google App Engine
This is Rietveld 408576698