109380 2013-02-10 09:51:51 -0800 [Chromium] FilterTypeSaturatingBrightness enum 2013-02-11 13:37:17 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 fmalita fmalita abarth dglazkov fishd jamesr senorblanco tkent+wkapi webkit.review.bot oldest_to_newest 829306 0 fmalita 2013-02-10 09:51:51 -0800 Add WebFilterOperation FilterTypeSaturatingBrightness enum to support internal clients relying on the current saturating behavior. 829310 1 187485 fmalita 2013-02-10 10:04:45 -0800 Created attachment 187485 Patch This requires https://codereview.chromium.org/12209071/ in order to not break the build. 829311 2 webkit.review.bot 2013-02-10 10:07:39 -0800 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 829312 3 webkit.review.bot 2013-02-10 10:07:54 -0800 Attachment 187485 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/Platform/ChangeLog', u'Source/Platform/chromium/public/WebFilterOperation.h']" exit_code: 1 Source/Platform/chromium/public/WebFilterOperation.h:69: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/Platform/chromium/public/WebFilterOperation.h:70: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/Platform/chromium/public/WebFilterOperation.h:126: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/Platform/chromium/public/WebFilterOperation.h:127: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 4 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 829313 4 fmalita 2013-02-10 10:18:50 -0800 This is a pre-requisite for https://codereview.chromium.org/12033075/. 829389 5 187485 jamesr 2013-02-10 17:59:14 -0800 Comment on attachment 187485 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=187485&action=review > Source/Platform/chromium/public/WebFilterOperation.h:52 > + FilterTypeSaturatingBrightness, // Legacy brightness implementation used by internal clients I'm not sure this comment adds any value in isolation. Perhaps specify that it's not one in CSS/SVG if that's the distinguishing factor? 829813 6 187485 fmalita 2013-02-11 09:55:34 -0800 Comment on attachment 187485 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=187485&action=review >> Source/Platform/chromium/public/WebFilterOperation.h:52 >> + FilterTypeSaturatingBrightness, // Legacy brightness implementation used by internal clients > > I'm not sure this comment adds any value in isolation. Perhaps specify that it's not one in CSS/SVG if that's the distinguishing factor? Sounds good, thanks! 829991 7 fmalita 2013-02-11 12:39:47 -0800 Committed r142496: <http://trac.webkit.org/changeset/142496> 830016 8 jamesr 2013-02-11 13:06:56 -0800 (In reply to comment #7) > Committed r142496: <http://trac.webkit.org/changeset/142496> This breaks the build: FAILED: ../../Source/WebKit/chromium/third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/source/webkit/chromium/cc/cc.render_surface_filters.o.d -DCHROMIUM_BUILD -DUSE_LIBJPEG_TURBO=1 -DENABLE_ONE_CLICK_SIGNIN -DENABLE_REMOTING=1 -DENABLE_WEBRTC=1 -DENABLE_PEPPER_THREADING -DENABLE_CONFIGURATION_POLICY -DENABLE_INPUT_SPEECH -DENABLE_NOTIFICATIONS -DENABLE_HIDPI=1 -DENABLE_GPU=1 -DENABLE_EGLIMAGE=1 -DUSE_SKIA=1 -DENABLE_TASK_MANAGER=1 -DENABLE_EXTENSIONS=1 -DENABLE_PLUGIN_INSTALLATION=1 -DENABLE_PLUGINS=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_THEMES=1 -DENABLE_BACKGROUND=1 -DENABLE_AUTOMATION=1 -DENABLE_GOOGLE_NOW=1 -DENABLE_LANGUAGE_DETECTION=1 -DENABLE_PRINTING=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_APP_LIST=1 -DENABLE_MANAGED_USERS=1 -DCC_IMPLEMENTATION=1 -DSK_BUILD_NO_IMAGE_ENCODE -DSK_DEFERRED_CANVAS_USES_GPIPE=1 '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' -DGR_AGGRESSIVE_SHADER_OPTS=1 -DSK_ENABLE_INST_COUNT=0 -DSK_USE_POSIX_THREADS -DU_USING_ICU_NAMESPACE=0 -DU_STATIC_IMPLEMENTATION -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -I../../Source/WebKit/chromium/third_party/icu/public/common -I../../Source/WebKit/chromium/third_party/icu/public/i18n -I../../Source/WebKit/chromium/third_party/khronos -I../../Source/WebKit/chromium/gpu -I../../Source/WebKit/chromium -I../../Source/WebKit/chromium/skia/config -I../../Source/WebKit/chromium/third_party/skia/src/core -I../../Source/WebKit/chromium/third_party/skia/include/config -I../../Source/WebKit/chromium/third_party/skia/include/core -I../../Source/WebKit/chromium/third_party/skia/include/effects -I../../Source/WebKit/chromium/third_party/skia/include/pdf -I../../Source/WebKit/chromium/third_party/skia/include/gpu -I../../Source/WebKit/chromium/third_party/skia/include/gpu/gl -I../../Source/WebKit/chromium/third_party/skia/include/pipe -I../../Source/WebKit/chromium/third_party/skia/include/ports -I../../Source/WebKit/chromium/third_party/skia/include/utils -I../../Source/WebKit/chromium/skia/ext -I../../Source/WebKit/chromium/third_party/skia/include/utils/mac -Igen/ui/gl -I../../Source/WebKit/chromium/third_party/mesa/MesaLib/include -I../../Source/Platform/chromium -Igen/webkit -I../../Source/Platform/chromium -Igen/webcore_headers -I../../Source/WebKit/chromium/third_party/npapi -I../../Source/WebKit/chromium/third_party/npapi/bindings -I../../Source/WebKit/chromium/v8/include -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-reserved-user-defined-literal -Wno-char-subscripts -Wno-unused-function -Wno-covered-switch-default -fno-rtti -fno-exceptions -fvisibility-inlines-hidden -fno-threadsafe-statics -fcolor-diagnostics -fno-strict-aliasing -std=gnu++11 -c ../../Source/WebKit/chromium/cc/render_surface_filters.cc -o obj/source/webkit/chromium/cc/cc.render_surface_filters.o ../../Source/WebKit/chromium/cc/render_surface_filters.cc:348:17: error: enumeration value 'FilterTypeSaturatingBrightness' not handled in switch [-Werror,-Wswitch] switch (op.type()) { ^ ../../Source/WebKit/chromium/cc/render_surface_filters.cc:384:17: error: enumeration value 'FilterTypeSaturatingBrightness' not handled in switch [-Werror,-Wswitch] switch (op.type()) { ^ 2 errors generated. ninja: build stopped: subcommand failed. http://build.webkit.org/builders/Chromium%20Mac%20Release/builds/55540/steps/compile-webkit/logs/stdio I think we'll have to add a default: to the chromium side switch statement. 830024 9 senorblanco 2013-02-11 13:12:36 -0800 (In reply to comment #8) > (In reply to comment #7) > > Committed r142496: <http://trac.webkit.org/changeset/142496> > > This breaks the build: > > FAILED: ../../Source/WebKit/chromium/third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/source/webkit/chromium/cc/cc.render_surface_filters.o.d -DCHROMIUM_BUILD -DUSE_LIBJPEG_TURBO=1 -DENABLE_ONE_CLICK_SIGNIN -DENABLE_REMOTING=1 -DENABLE_WEBRTC=1 -DENABLE_PEPPER_THREADING -DENABLE_CONFIGURATION_POLICY -DENABLE_INPUT_SPEECH -DENABLE_NOTIFICATIONS -DENABLE_HIDPI=1 -DENABLE_GPU=1 -DENABLE_EGLIMAGE=1 -DUSE_SKIA=1 -DENABLE_TASK_MANAGER=1 -DENABLE_EXTENSIONS=1 -DENABLE_PLUGIN_INSTALLATION=1 -DENABLE_PLUGINS=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_THEMES=1 -DENABLE_BACKGROUND=1 -DENABLE_AUTOMATION=1 -DENABLE_GOOGLE_NOW=1 -DENABLE_LANGUAGE_DETECTION=1 -DENABLE_PRINTING=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_APP_LIST=1 -DENABLE_MANAGED_USERS=1 -DCC_IMPLEMENTATION=1 -DSK_BUILD_NO_IMAGE_ENCODE -DSK_DEFERRED_CANVAS_USES_GPIPE=1 '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' -DGR_AGGRESSIVE_SHADER_OPTS=1 -DSK_ENABLE_INST_COUNT=0 -DSK_USE_POSIX_THREADS -DU_USING_ICU_NAMESPACE=0 -DU_STATIC_IMPLEMENTATION -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -I../../Source/WebKit/chromium/third_party/icu/public/common -I../../Source/WebKit/chromium/third_party/icu/public/i18n -I../../Source/WebKit/chromium/third_party/khronos -I../../Source/WebKit/chromium/gpu -I../../Source/WebKit/chromium -I../../Source/WebKit/chromium/skia/config -I../../Source/WebKit/chromium/third_party/skia/src/core -I../../Source/WebKit/chromium/third_party/skia/include/config -I../../Source/WebKit/chromium/third_party/skia/include/core -I../../Source/WebKit/chromium/third_party/skia/include/effects -I../../Source/WebKit/chromium/third_party/skia/include/pdf -I../../Source/WebKit/chromium/third_party/skia/include/gpu -I../../Source/WebKit/chromium/third_party/skia/include/gpu/gl -I../../Source/WebKit/chromium/third_party/skia/include/pipe -I../../Source/WebKit/chromium/third_party/skia/include/ports -I../../Source/WebKit/chromium/third_party/skia/include/utils -I../../Source/WebKit/chromium/skia/ext -I../../Source/WebKit/chromium/third_party/skia/include/utils/mac -Igen/ui/gl -I../../Source/WebKit/chromium/third_party/mesa/MesaLib/include -I../../Source/Platform/chromium -Igen/webkit -I../../Source/Platform/chromium -Igen/webcore_headers -I../../Source/WebKit/chromium/third_party/npapi -I../../Source/WebKit/chromium/third_party/npapi/bindings -I../../Source/WebKit/chromium/v8/include -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-reserved-user-defined-literal -Wno-char-subscripts -Wno-unused-function -Wno-covered-switch-default -fno-rtti -fno-exceptions -fvisibility-inlines-hidden -fno-threadsafe-statics -fcolor-diagnostics -fno-strict-aliasing -std=gnu++11 -c ../../Source/WebKit/chromium/cc/render_surface_filters.cc -o obj/source/webkit/chromium/cc/cc.render_surface_filters.o > ../../Source/WebKit/chromium/cc/render_surface_filters.cc:348:17: error: enumeration value 'FilterTypeSaturatingBrightness' not handled in switch [-Werror,-Wswitch] > switch (op.type()) { > ^ > ../../Source/WebKit/chromium/cc/render_surface_filters.cc:384:17: error: enumeration value 'FilterTypeSaturatingBrightness' not handled in switch [-Werror,-Wswitch] > switch (op.type()) { > ^ > 2 errors generated. > ninja: build stopped: subcommand failed. > > http://build.webkit.org/builders/Chromium%20Mac%20Release/builds/55540/steps/compile-webkit/logs/stdio > > I think we'll have to add a default: to the chromium side switch statement. I think Florin already did that (will check). Was this on the build.webkit.org builders? Maybe they just need a Chromium DEPS roll. 830033 10 senorblanco 2013-02-11 13:17:21 -0800 (In reply to comment #9) > (In reply to comment #8) > > (In reply to comment #7) > > > Committed r142496: <http://trac.webkit.org/changeset/142496> > > > > This breaks the build: > > > > FAILED: ../../Source/WebKit/chromium/third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/source/webkit/chromium/cc/cc.render_surface_filters.o.d -DCHROMIUM_BUILD -DUSE_LIBJPEG_TURBO=1 -DENABLE_ONE_CLICK_SIGNIN -DENABLE_REMOTING=1 -DENABLE_WEBRTC=1 -DENABLE_PEPPER_THREADING -DENABLE_CONFIGURATION_POLICY -DENABLE_INPUT_SPEECH -DENABLE_NOTIFICATIONS -DENABLE_HIDPI=1 -DENABLE_GPU=1 -DENABLE_EGLIMAGE=1 -DUSE_SKIA=1 -DENABLE_TASK_MANAGER=1 -DENABLE_EXTENSIONS=1 -DENABLE_PLUGIN_INSTALLATION=1 -DENABLE_PLUGINS=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_THEMES=1 -DENABLE_BACKGROUND=1 -DENABLE_AUTOMATION=1 -DENABLE_GOOGLE_NOW=1 -DENABLE_LANGUAGE_DETECTION=1 -DENABLE_PRINTING=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_APP_LIST=1 -DENABLE_MANAGED_USERS=1 -DCC_IMPLEMENTATION=1 -DSK_BUILD_NO_IMAGE_ENCODE -DSK_DEFERRED_CANVAS_USES_GPIPE=1 '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' -DGR_AGGRESSIVE_SHADER_OPTS=1 -DSK_ENABLE_INST_COUNT=0 -DSK_USE_POSIX_THREADS -DU_USING_ICU_NAMESPACE=0 -DU_STATIC_IMPLEMENTATION -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -I../../Source/WebKit/chromium/third_party/icu/public/common -I../../Source/WebKit/chromium/third_party/icu/public/i18n -I../../Source/WebKit/chromium/third_party/khronos -I../../Source/WebKit/chromium/gpu -I../../Source/WebKit/chromium -I../../Source/WebKit/chromium/skia/config -I../../Source/WebKit/chromium/third_party/skia/src/core -I../../Source/WebKit/chromium/third_party/skia/include/config -I../../Source/WebKit/chromium/third_party/skia/include/core -I../../Source/WebKit/chromium/third_party/skia/include/effects -I../../Source/WebKit/chromium/third_party/skia/include/pdf -I../../Source/WebKit/chromium/third_party/skia/include/gpu -I../../Source/WebKit/chromium/third_party/skia/include/gpu/gl -I../../Source/WebKit/chromium/third_party/skia/include/pipe -I../../Source/WebKit/chromium/third_party/skia/include/ports -I../../Source/WebKit/chromium/third_party/skia/include/utils -I../../Source/WebKit/chromium/skia/ext -I../../Source/WebKit/chromium/third_party/skia/include/utils/mac -Igen/ui/gl -I../../Source/WebKit/chromium/third_party/mesa/MesaLib/include -I../../Source/Platform/chromium -Igen/webkit -I../../Source/Platform/chromium -Igen/webcore_headers -I../../Source/WebKit/chromium/third_party/npapi -I../../Source/WebKit/chromium/third_party/npapi/bindings -I../../Source/WebKit/chromium/v8/include -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-reserved-user-defined-literal -Wno-char-subscripts -Wno-unused-function -Wno-covered-switch-default -fno-rtti -fno-exceptions -fvisibility-inlines-hidden -fno-threadsafe-statics -fcolor-diagnostics -fno-strict-aliasing -std=gnu++11 -c ../../Source/WebKit/chromium/cc/render_surface_filters.cc -o obj/source/webkit/chromium/cc/cc.render_surface_filters.o > > ../../Source/WebKit/chromium/cc/render_surface_filters.cc:348:17: error: enumeration value 'FilterTypeSaturatingBrightness' not handled in switch [-Werror,-Wswitch] > > switch (op.type()) { > > ^ > > ../../Source/WebKit/chromium/cc/render_surface_filters.cc:384:17: error: enumeration value 'FilterTypeSaturatingBrightness' not handled in switch [-Werror,-Wswitch] > > switch (op.type()) { > > ^ > > 2 errors generated. > > ninja: build stopped: subcommand failed. > > > > http://build.webkit.org/builders/Chromium%20Mac%20Release/builds/55540/steps/compile-webkit/logs/stdio > > > > I think we'll have to add a default: to the chromium side switch statement. > > I think Florin already did that (will check). Was this on the build.webkit.org builders? Maybe they just need a Chromium DEPS roll. Never mind, that was in cc_messages.cc. Looks like we need some in render_surface_filters.cc as well. 830064 11 fmalita 2013-02-11 13:37:17 -0800 (In reply to comment #10) > Never mind, that was in cc_messages.cc. Looks like we need some in render_surface_filters.cc as well. Yes, missed that somehow. Already landed http://build.chromium.org/p/chromium.webkit/changes/102436, rolling into WK right now. 187485 2013-02-10 10:04:45 -0800 2013-02-11 09:55:34 -0800 Patch bug-109380-20130210130117.patch text/plain 3251 fmalita U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNDA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCBmZDY4NDM5NzhlMDE5 ZjAyYTc4YzcyY2JmNTYzZDkzMmRlMjRiZjUxLi4wZjU3NjNjMTlkODUyODU0YWNiZTY5OGVkNGE5 YjVhZWYyNzZjYjhkIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMy0wMi0xMCAg RmxvcmluIE1hbGl0YSAgPGZtYWxpdGFAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1 bV0gRmlsdGVyVHlwZVNhdHVyYXRpbmdCcmlnaHRuZXNzIGVudW0KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwOTM4MAorCisgICAgICAgIEludHJvZHVj ZSBhIG5ldyBXZWJGaWx0ZXJPcGVyYXRpb246OkZpbHRlclR5cGUgZW51bSAoRmlsdGVyVHlwZVNh dHVyYXRpbmdCcmlnaHRuZXNzKQorICAgICAgICB0byBzdXBwb3J0IGV4aXN0aW5nIGludGVybnRh bCBjbGllbnRzIHdoaWNoIHJlbHkgb24gdGhlIGN1cnJlbnQgc2F0dXJhdGluZyBicmlnaHRuZXNz CisgICAgICAgIGJlaGF2aW9yIChpbiBwcmVwYXJhdGlvbiBvZiBzd2l0Y2hpbmcgdG8gdGhlIG5l dyBicmlnaHRuZXNzIGltcGxlbWVudGF0aW9uKS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIGNocm9taXVtL3B1YmxpYy9XZWJGaWx0ZXJPcGVyYXRp b24uaDoKKyAgICAgICAgKFdlYktpdDo6V2ViRmlsdGVyT3BlcmF0aW9uOjphbW91bnQpOgorICAg ICAgICAoV2ViS2l0OjpXZWJGaWx0ZXJPcGVyYXRpb246OmNyZWF0ZVNhdHVyYXRpbmdCcmlnaHRu ZXNzRmlsdGVyKToKKyAgICAgICAgKFdlYktpdDo6V2ViRmlsdGVyT3BlcmF0aW9uOjpzZXRBbW91 bnQpOgorCiAyMDEzLTAyLTA5ICBKYW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgW2Nocm9taXVtXSBFbmFibGUgbW9yZSBvZiB3ZWJraXRfdW5pdF90ZXN0cyBp biBjb21wb25lbnQgYnVpbGRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0v cHVibGljL1dlYkZpbHRlck9wZXJhdGlvbi5oIGIvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1 YmxpYy9XZWJGaWx0ZXJPcGVyYXRpb24uaAppbmRleCAzNjI4ZjQ4N2I2OGZiM2EyM2RhM2Y1NTQ2 YjRlNjY1MTk0MWUxOTk0Li5hNzJlZjMzOTFhZTJkODI1ZGM5OGViNGVlODRiZDlkZDg4YWE4OWYy IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkZpbHRlck9w ZXJhdGlvbi5oCisrKyBiL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViRmlsdGVy T3BlcmF0aW9uLmgKQEAgLTQ5LDYgKzQ5LDcgQEAgcHVibGljOgogICAgICAgICBGaWx0ZXJUeXBl RHJvcFNoYWRvdywKICAgICAgICAgRmlsdGVyVHlwZUNvbG9yTWF0cml4LAogICAgICAgICBGaWx0 ZXJUeXBlWm9vbSwKKyAgICAgICAgRmlsdGVyVHlwZVNhdHVyYXRpbmdCcmlnaHRuZXNzLCAvLyBM ZWdhY3kgYnJpZ2h0bmVzcyBpbXBsZW1lbnRhdGlvbiB1c2VkIGJ5IGludGVybmFsIGNsaWVudHMK ICAgICB9OwogCiAgICAgRmlsdGVyVHlwZSB0eXBlKCkgY29uc3QgeyByZXR1cm4gbV90eXBlOyB9 CkBAIC02NSw3ICs2Niw4IEBAIHB1YmxpYzoKICAgICAgICAgICAgICAgICAgICB8fCBtX3R5cGUg PT0gRmlsdGVyVHlwZU9wYWNpdHkKICAgICAgICAgICAgICAgICAgICB8fCBtX3R5cGUgPT0gRmls dGVyVHlwZUJsdXIKICAgICAgICAgICAgICAgICAgICB8fCBtX3R5cGUgPT0gRmlsdGVyVHlwZURy b3BTaGFkb3cKLSAgICAgICAgICAgICAgICAgICB8fCBtX3R5cGUgPT0gRmlsdGVyVHlwZVpvb20p OworICAgICAgICAgICAgICAgICAgIHx8IG1fdHlwZSA9PSBGaWx0ZXJUeXBlWm9vbQorICAgICAg ICAgICAgICAgICAgIHx8IG1fdHlwZSA9PSBGaWx0ZXJUeXBlU2F0dXJhdGluZ0JyaWdodG5lc3Mp OwogICAgICAgICByZXR1cm4gbV9hbW91bnQ7CiAgICAgfQogICAgIFdlYlBvaW50IGRyb3BTaGFk b3dPZmZzZXQoKSBjb25zdApAQCAtMTAyLDYgKzEwNCw3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMg V2ViRmlsdGVyT3BlcmF0aW9uIGNyZWF0ZURyb3BTaGFkb3dGaWx0ZXIoV2ViUG9pbnQgb2Zmc2V0 LCBmbG9hdCBzdGREZXZpYXRpb24sIFdlYkNvbG9yIGNvbG9yKSB7IHJldHVybiBXZWJGaWx0ZXJP cGVyYXRpb24oRmlsdGVyVHlwZURyb3BTaGFkb3csIG9mZnNldCwgc3RkRGV2aWF0aW9uLCBjb2xv cik7IH0KICAgICBzdGF0aWMgV2ViRmlsdGVyT3BlcmF0aW9uIGNyZWF0ZUNvbG9yTWF0cml4Rmls dGVyKFNrU2NhbGFyIG1hdHJpeFsyMF0pIHsgcmV0dXJuIFdlYkZpbHRlck9wZXJhdGlvbihGaWx0 ZXJUeXBlQ29sb3JNYXRyaXgsIG1hdHJpeCk7IH0KICAgICBzdGF0aWMgV2ViRmlsdGVyT3BlcmF0 aW9uIGNyZWF0ZVpvb21GaWx0ZXIoV2ViUmVjdCByZWN0LCBpbnQgaW5zZXQpIHsgcmV0dXJuIFdl YkZpbHRlck9wZXJhdGlvbihGaWx0ZXJUeXBlWm9vbSwgcmVjdCwgaW5zZXQpOyB9CisgICAgc3Rh dGljIFdlYkZpbHRlck9wZXJhdGlvbiBjcmVhdGVTYXR1cmF0aW5nQnJpZ2h0bmVzc0ZpbHRlcihm bG9hdCBhbW91bnQpIHsgcmV0dXJuIFdlYkZpbHRlck9wZXJhdGlvbihGaWx0ZXJUeXBlU2F0dXJh dGluZ0JyaWdodG5lc3MsIGFtb3VudCk7IH0KIAogICAgIGJvb2wgZXF1YWxzKGNvbnN0IFdlYkZp bHRlck9wZXJhdGlvbiYgb3RoZXIpIGNvbnN0OwogCkBAIC0xMjAsNyArMTIzLDggQEAgcHVibGlj OgogICAgICAgICAgICAgICAgICAgIHx8IG1fdHlwZSA9PSBGaWx0ZXJUeXBlT3BhY2l0eQogICAg ICAgICAgICAgICAgICAgIHx8IG1fdHlwZSA9PSBGaWx0ZXJUeXBlQmx1cgogICAgICAgICAgICAg ICAgICAgIHx8IG1fdHlwZSA9PSBGaWx0ZXJUeXBlRHJvcFNoYWRvdwotICAgICAgICAgICAgICAg ICAgIHx8IG1fdHlwZSA9PSBGaWx0ZXJUeXBlWm9vbSk7CisgICAgICAgICAgICAgICAgICAgfHwg bV90eXBlID09IEZpbHRlclR5cGVab29tCisgICAgICAgICAgICAgICAgICAgfHwgbV90eXBlID09 IEZpbHRlclR5cGVTYXR1cmF0aW5nQnJpZ2h0bmVzcyk7CiAgICAgICAgIG1fYW1vdW50ID0gYW1v dW50OwogICAgIH0KICAgICB2b2lkIHNldERyb3BTaGFkb3dPZmZzZXQoV2ViUG9pbnQgb2Zmc2V0 KQo=