162798 2016-09-30 11:53:24 -0700 Remove ClipRects's custom refcounting. 2016-09-30 20:17:45 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan commit-queue ddkilzer esprehn+autocc glenn jh718.park kondapallykalyan simon.fraser oldest_to_newest 1235321 0 zalan 2016-09-30 11:53:24 -0700 and use RefCounted instead. More secure. 1235343 1 290365 zalan 2016-09-30 12:36:29 -0700 Created attachment 290365 Patch 1235351 2 290365 simon.fraser 2016-09-30 12:46:38 -0700 Comment on attachment 290365 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=290365&action=review > Source/WebCore/rendering/RenderLayer.cpp:208 > + bool m_fixed = false; Why isn't this { false } 1235362 3 290369 zalan 2016-09-30 12:58:48 -0700 Created attachment 290369 Patch 1235391 4 290369 commit-queue 2016-09-30 13:54:26 -0700 Comment on attachment 290369 Patch Clearing flags on attachment: 290369 Committed r206661: <http://trac.webkit.org/changeset/206661> 1235392 5 commit-queue 2016-09-30 13:54:30 -0700 All reviewed patches have been landed. Closing bug. 1235556 6 ddkilzer 2016-09-30 19:03:48 -0700 (In reply to comment #4) > Comment on attachment 290369 [details] > Patch > > Clearing flags on attachment: 290369 > > Committed r206661: <http://trac.webkit.org/changeset/206661> This caused EFL build to fail: <https://build.webkit.org/builders/EFL%20Linux%2064-bit%20Release%20WK2?numbuilds=25> FAILED: /usr/bin/c++ -DBUILDING_EFL__=1 -DBUILDING_WITH_CMAKE=1 -DBUILDING_WebCore -DDATA_DIR=\"/usr/local/share/ewebkit2-1\" -DDEFAULT_THEME_DIR=\"/home/joonghunpark1/WebKit-BuildSlave/efl-linux-64-release-wk2/build/WebKitBuild/Release/WebCore/platform/efl/DefaultTheme\" -DHAVE_CONFIG_H=1 -DTEST_HYPHENATAION_PATH=\"/home/joonghunpark1/WebKit-BuildSlave/efl-linux-64-release-wk2/build/WebKitBuild/DependenciesEFL/Root/webkitgtk-test-dicts\" -DUNINSTALLED_AUDIO_RESOURCES_DIR=\"/home/joonghunpark1/WebKit-BuildSlave/efl-linux-64-release-wk2/build/Source/WebCore/platform/audio/resources\" -DUSER_AGENT_EFL_MAJOR_VERSION=\"602\" -DUSER_AGENT_EFL_MINOR_VERSION=\"1\" -DUSE_GSTREAMER_MPEGTS -DUSE_WEBAUDIO_GSTREAMER=1 -DWEBKIT_EXEC_PATH=\"/home/joonghunpark1/WebKit-BuildSlave/efl-linux-64-release-wk2/build/WebKitBuild/Release/bin\" -DWEB_INSPECTOR_DIR=\"/home/joonghunpark1/WebKit-BuildSlave/efl-linux-64-release-wk2/build/WebKitBuild/Release/share/ewebkit2-1/inspector\" -std=c++1y -O3 -DNDEBUG -fno-exceptions -fno-strict-aliasing -fno-rtti -ffunction-sections -fdata-sections -fno-rtti -I../../Source/WebCore -I../../Source/WebCore/Modules/airplay -I../../Source/WebCore/Modules/applepay -I../../Source/WebCore/Modules/battery -I../../Source/WebCore/Modules/encryptedmedia -I../../Source/WebCore/Modules/fetch -I../../Source/WebCore/Modules/geolocation -I../../Source/WebCore/Modules/indexeddb -I../../Source/WebCore/Modules/indexeddb/client -I../../Source/WebCore/Modules/indexeddb/server -I../../Source/WebCore/Modules/indexeddb/shared -I../../Source/WebCore/Modules/indieui -I../../Source/WebCore/Modules/mediacontrols -I../../Source/WebCore/Modules/mediasession -I../../Source/WebCore/Modules/mediasource -I../../Source/WebCore/Modules/mediastream -I../../Source/WebCore/Modules/navigatorcontentutils -I../../Source/WebCore/Modules/notifications -I../../Source/WebCore/Modules/plugins -I../../Source/WebCore/Modules/proximity -I../../Source/WebCore/Modules/quota -I../../Source/WebCore/Modules/speech -I../../Source/WebCore/Modules/streams -I../../Source/WebCore/Modules/vibration -I../../Source/WebCore/Modules/webaudio -I../../Source/WebCore/Modules/webdatabase -I../../Source/WebCore/Modules/websockets -I../../Source/WebCore/accessibility -I../../Source/WebCore/animation -I../../Source/WebCore/bindings -I../../Source/WebCore/bindings/generic -I../../Source/WebCore/bindings/js -I../../Source/WebCore/bridge -I../../Source/WebCore/bridge/c -I../../Source/WebCore/bridge/jsc -I../../Source/WebCore/contentextensions -I../../Source/WebCore/crypto -I../../Source/WebCore/crypto/algorithms -I../../Source/WebCore/crypto/keys -I../../Source/WebCore/crypto/parameters -I../../Source/WebCore/css -I../../Source/WebCore/css/parser -I../../Source/WebCore/cssjit -I../../Source/WebCore/dom -I../../Source/WebCore/dom/default -I../../Source/WebCore/editing -I../../Source/WebCore/fileapi -I../../Source/WebCore/history -I../../Source/WebCore/html -I../../Source/WebCore/html/canvas -I../../Source/WebCore/html/forms -I../../Source/WebCore/html/parser -I../../Source/WebCore/html/shadow -I../../Source/WebCore/html/track -I../../Source/WebCore/inspector -I../../Source/WebCore/loader -I../../Source/WebCore/loader/appcache -I../../Source/WebCore/loader/archive -I../../Source/WebCore/loader/archive/mhtml -I../../Source/WebCore/loader/cache -I../../Source/WebCore/loader/icon -I../../Source/WebCore/mathml -I../../Source/WebCore/page -I../../Source/WebCore/page/animation -I../../Source/WebCore/page/csp -I../../Source/WebCore/page/scrolling -I../../Source/WebCore/platform -I../../Source/WebCore/platform/animation -I../../Source/WebCore/platform/audio -I../../Source/WebCore/platform/crypto -I../../Source/WebCore/platform/gamepad -I../../Source/WebCore/platform/gamepad/deprecated -I../../Source/WebCore/platform/gamepad/linux -I../../Source/WebCore/platform/graphics -I../../Source/WebCore/platform/graphics/cpu/arm -I../../Source/WebCore/platform/graphics/cpu/arm/filters -I../../Source/WebCore/platform/graphics/displaylists -I../../Source/WebCore/platform/graphics/filters -I../../Source/WebCore/platform/graphics/harfbuzz -I../../Source/WebCore/platform/graphics/harfbuzz/ng -I../../Source/WebCore/platform/graphics/opentype -I../../Source/WebCore/platform/graphics/transforms -I../../Source/WebCore/platform/mediastream -I../../Source/WebCore/platform/mock -I../../Source/WebCore/platform/mock/mediasource -I../../Source/WebCore/platform/network -I../../Source/WebCore/platform/sql -I../../Source/WebCore/platform/text -I../../Source/WebCore/platform/text/icu -I../../Source/WebCore/plugins -I../../Source/WebCore/rendering -I../../Source/WebCore/rendering/line -I../../Source/WebCore/rendering/mathml -I../../Source/WebCore/rendering/shapes -I../../Source/WebCore/rendering/style -I../../Source/WebCore/rendering/svg -I../../Source/WebCore/replay -I../../Source/WebCore/storage -I../../Source/WebCore/style -I../../Source/WebCore/svg -I../../Source/WebCore/svg/animation -I../../Source/WebCore/svg/graphics -I../../Source/WebCore/svg/graphics/filters -I../../Source/WebCore/svg/properties -I../../Source/WebCore/websockets -I../../Source/WebCore/workers -I../../Source/WebCore/xml -I../../Source/WebCore/xml/parser -IDerivedSources -IDerivedSources/ForwardingHeaders -IDerivedSources/WebCore -I../../Source -I. -I../../Source/WebCore/Modules/gamepad/deprecated -I../../Source/WebCore/platform/graphics/gpu -I../../Source/WebCore/platform/mediastream/openwebrtc -I../../Source/WebCore/platform/graphics/gstreamer -I../../Source/WebCore/platform/audio/gstreamer -I../../Source/WebCore/platform/image-decoders -I../../Source/WebCore/platform/image-decoders/bmp -I../../Source/WebCore/platform/image-decoders/gif -I../../Source/WebCore/platform/image-decoders/ico -I../../Source/WebCore/platform/image-decoders/jpeg -I../../Source/WebCore/platform/image-decoders/png -I../../Source/WebCore/platform/image-decoders/webp -I../../Source/WebCore/platform/linux -I../../Source/WebCore/platform/graphics/texmap -I../../Source/WebCore/page/scrolling/coordinatedgraphics -I../../Source/WebCore/platform/graphics/texmap/coordinated -IDerivedSources/JavaScriptCore -IDerivedSources/JavaScriptCore/inspector -I../../Source/JavaScriptCore -I../../Source/JavaScriptCore/ForwardingHeaders -I../../Source/JavaScriptCore/API -I../../Source/JavaScriptCore/assembler -I../../Source/JavaScriptCore/bytecode -I../../Source/JavaScriptCore/bytecompiler -I../../Source/JavaScriptCore/dfg -I../../Source/JavaScriptCore/disassembler -I../../Source/JavaScriptCore/heap -I../../Source/JavaScriptCore/debugger -I../../Source/JavaScriptCore/interpreter -I../../Source/JavaScriptCore/jit -I../../Source/JavaScriptCore/llint -I../../Source/JavaScriptCore/parser -I../../Source/JavaScriptCore/profiler -I../../Source/JavaScriptCore/runtime -I../../Source/JavaScriptCore/yarr -I../../Source/ThirdParty/ANGLE -I../../Source/ThirdParty/ANGLE/include/KHR -I../../Source/WebCore/editing/atk -I../../Source/WebCore/page/efl -I../../Source/WebCore/platform/cairo -I../../Source/WebCore/platform/efl -I../../Source/WebCore/platform/gamepad/efl -I../../Source/WebCore/platform/geoclue -I../../Source/WebCore/platform/graphics/cairo -I../../Source/WebCore/platform/graphics/efl -I../../Source/WebCore/platform/graphics/freetype -I../../Source/WebCore/platform/graphics/opengl -I../../Source/WebCore/platform/graphics/surfaces -I../../Source/WebCore/platform/graphics/surfaces/efl -I../../Source/WebCore/platform/graphics/surfaces/glx -I../../Source/WebCore/platform/graphics/x11 -I../../Source/WebCore/platform/network/soup -I../../Source/WebCore/platform/text/efl -I../../Source/WebCore/plugins/efl -I../../Source/WTF -I../../Source/WTF/wtf/efl -I../../Source/WebCore/accessibility/atk -isystem ../DependenciesEFL/Root/include/gstreamer-1.0 -isystem ../DependenciesEFL/Root/lib/gstreamer-1.0/include -isystem ../DependenciesEFL/Root/include/glib-2.0 -isystem ../DependenciesEFL/Root/lib/glib-2.0/include -isystem ../DependenciesEFL/Root/include/cairo -isystem ../DependenciesEFL/Root/include/efl-1 -isystem ../DependenciesEFL/Root/include/ecore-1 -isystem ../DependenciesEFL/Root/include/eo-1 -isystem ../DependenciesEFL/Root/include/eina-1 -isystem ../DependenciesEFL/Root/include/eina-1/eina -isystem ../DependenciesEFL/Root/include/ecore-evas-1 -isystem ../DependenciesEFL/Root/include/ecore-input-evas-1 -isystem ../DependenciesEFL/Root/include/evas-1 -isystem ../DependenciesEFL/Root/include/evas-1/canvas -isystem ../DependenciesEFL/Root/include/freetype2 -isystem ../DependenciesEFL/Root/include/libxml2 -isystem ../DependenciesEFL/Root/include/ecore-input-1 -isystem ../DependenciesEFL/Root/include/eeze-1 -isystem ../DependenciesEFL/Root/include/ecore-file-1 -isystem ../DependenciesEFL/Root/include/ecore-con-1 -isystem ../DependenciesEFL/Root/include/eet-1 -isystem ../DependenciesEFL/Root/include/emile-1 -isystem /usr/include/libpng12 -isystem /usr/include/luajit-2.0 -isystem ../DependenciesEFL/Root/include/ecore-x-1 -isystem ../DependenciesEFL/Root/include/edje-1 -isystem ../DependenciesEFL/Root/include/eio-1 -isystem ../DependenciesEFL/Root/include/efreet-1 -isystem ../DependenciesEFL/Root/include/ecore-ipc-1 -isystem ../DependenciesEFL/Root/include/embryo-1 -isystem ../DependenciesEFL/Root/include/ecore-imf-evas-1 -isystem ../DependenciesEFL/Root/include/ecore-imf-1 -isystem ../DependenciesEFL/Root/include/eldbus-1 -isystem /usr/include/dbus-1.0 -isystem /usr/lib/x86_64-linux-gnu/dbus-1.0/include -isystem ../DependenciesEFL/Root/include/freetype2/freetype -isystem ../DependenciesEFL/Root/include/gio-unix-2.0 -isystem ../DependenciesEFL/Root/include/libsoup-2.4 -isystem ../DependenciesEFL/Root/include/harfbuzz -isystem /usr/include/enchant -isystem ../DependenciesEFL/Root/include/atk-1.0 -isystem /usr/include/espeak -I../../Source/WebCore/testing -Werror -Wall -Wextra -Wcast-align -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wundef -Wwrite-strings -fPIC -MMD -MT Source/WebCore/CMakeFiles/WebCore.dir/rendering/RenderLayer.cpp.o -MF Source/WebCore/CMakeFiles/WebCore.dir/rendering/RenderLayer.cpp.o.d -o Source/WebCore/CMakeFiles/WebCore.dir/rendering/RenderLayer.cpp.o -c ../../Source/WebCore/rendering/RenderLayer.cpp ../../Source/WebCore/rendering/RenderLayer.cpp: In copy constructor ‘WebCore::ClipRects::ClipRects(const WebCore::ClipRects&)’: ../../Source/WebCore/rendering/RenderLayer.cpp:200:5: error: base class ‘class WTF::RefCounted<WebCore::ClipRects>’ should be explicitly initialized in the copy constructor [-Werror=extra] ClipRects(const ClipRects& other) ^ cc1plus: all warnings being treated as errors ninja: build stopped: subcommand failed. 1235557 7 ddkilzer 2016-09-30 19:11:02 -0700 This seems like the fix: diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp index d98ebfe..5039236 100644 --- a/Source/WebCore/rendering/RenderLayer.cpp +++ b/Source/WebCore/rendering/RenderLayer.cpp @@ -198,7 +198,8 @@ private: } ClipRects(const ClipRects& other) - : m_fixed(other.fixed()) + : RefCounted<ClipRects>() + , m_fixed(other.fixed()) , m_overflowClipRect(other.overflowClipRect()) , m_fixedClipRect(other.fixedClipRect()) , m_posClipRect(other.posClipRect()) 1235575 8 ddkilzer 2016-09-30 20:17:45 -0700 (In reply to comment #7) > This seems like the fix: > > diff --git a/Source/WebCore/rendering/RenderLayer.cpp > b/Source/WebCore/rendering/RenderLayer.cpp > index d98ebfe..5039236 100644 > --- a/Source/WebCore/rendering/RenderLayer.cpp > +++ b/Source/WebCore/rendering/RenderLayer.cpp > @@ -198,7 +198,8 @@ private: > } > > ClipRects(const ClipRects& other) > - : m_fixed(other.fixed()) > + : RefCounted<ClipRects>() > + , m_fixed(other.fixed()) > , m_overflowClipRect(other.overflowClipRect()) > , m_fixedClipRect(other.fixedClipRect()) > , m_posClipRect(other.posClipRect()) Fixed in r206704: <https://trac.webkit.org/changeset/206704> 290365 2016-09-30 12:36:29 -0700 2016-09-30 12:58:46 -0700 Patch bug-162798-20160930123326.patch text/plain 5181 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjA2NjQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTMwMTU4OTM5OGYwMzA0 ZDkwOGEwMzE0NmJlOWVjNDk2NjIxYWU5Ny4uMzZmYjVlMTc1ZTM1ZjM4YWMwNTBkYzY0OGQ3ZDNk NjIxZGE2NDBjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE2LTA5LTMwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIENsaXBSZWN0cydz IGN1c3RvbSByZWZjb3VudGluZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE2Mjc5OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEl0J3Mgc2FmZXIgdG8gdXNlIFJlZkNvdW50ZWQ8Pi4gCisKKyAgICAgICAg Tm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy TGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2xpcFJlY3RzOjpDbGlwUmVjdHMpOgorICAg ICAgICAoV2ViQ29yZTo6Q2xpcFJlY3RzQ2FjaGU6OmdldENsaXBSZWN0cyk6CisgICAgICAgIChX ZWJDb3JlOjpDbGlwUmVjdHNDYWNoZTo6c2V0Q2xpcFJlY3RzKToKKyAgICAgICAgKFdlYkNvcmU6 OkNsaXBSZWN0c0NhY2hlOjpnZXRJbmRleCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXll cjo6dXBkYXRlQ2xpcFJlY3RzKToKKyAgICAgICAgKFdlYkNvcmU6OkNsaXBSZWN0czo6cmVmKTog RGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkNsaXBSZWN0czo6ZGVyZWYpOiBEZWxldGVkLgor CiAyMDE2LTA5LTMwICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAg ICBSZW1vdmUgInJlbSIgdW5pdCBvcHRpbWl6YXRpb24gZm9yIGRvY3VtZW50IGVsZW1lbnQgZm9u dCBzaXplIGNoYW5nZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmlu ZGV4IGU5ZjEwOTQ0ZWIxMzU1MzhlODM4Y2RiYWQ4ZWQ1NjM2YTJlODcxOTAuLjQ2OWE0MjIyNWEx NzliMDQwMDVlYmI2YWZmZWY4OGFhNGY5YzIzNTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyLmNwcApAQCAtMTM3LDcgKzEzNyw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAogdXNpbmcgbmFtZXNwYWNlIEhUTUxOYW1lczsKIAotY2xhc3MgQ2xpcFJlY3RzIHsKK2NsYXNz IENsaXBSZWN0cyA6IHB1YmxpYyBSZWZDb3VudGVkPENsaXBSZWN0cz4gewogICAgIFdURl9NQUtF X0ZBU1RfQUxMT0NBVEVEOwogcHVibGljOgogICAgIHN0YXRpYyBSZWY8Q2xpcFJlY3RzPiBjcmVh dGUoKQpAQCAtMTUwLDggKzE1MCw2IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIGFkb3B0UmVm KCpuZXcgQ2xpcFJlY3RzKG90aGVyKSk7CiAgICAgfQogCi0gICAgQ2xpcFJlY3RzKCkgPSBkZWZh dWx0OwotCiAgICAgdm9pZCByZXNldCgpCiAgICAgewogICAgICAgICBtX292ZXJmbG93Q2xpcFJl Y3QucmVzZXQoKTsKQEAgLTE3MiwxMyArMTcwLDYgQEAgcHVibGljOgogICAgIGJvb2wgZml4ZWQo KSBjb25zdCB7IHJldHVybiBtX2ZpeGVkOyB9CiAgICAgdm9pZCBzZXRGaXhlZChib29sIGZpeGVk KSB7IG1fZml4ZWQgPSBmaXhlZDsgfQogCi0gICAgdm9pZCByZWYoKSB7IG1fcmVmQ291bnQrKzsg fQotICAgIHZvaWQgZGVyZWYoKQotICAgIHsKLSAgICAgICAgaWYgKCEtLW1fcmVmQ291bnQpCi0g ICAgICAgICAgICBkZWxldGUgdGhpczsKLSAgICB9Ci0KICAgICBib29sIG9wZXJhdG9yPT0oY29u c3QgQ2xpcFJlY3RzJiBvdGhlcikgY29uc3QKICAgICB7CiAgICAgICAgIHJldHVybiBtX292ZXJm bG93Q2xpcFJlY3QgPT0gb3RoZXIub3ZlcmZsb3dDbGlwUmVjdCgpCkBAIC0xOTcsNiArMTg4LDgg QEAgcHVibGljOgogICAgIH0KIAogcHJpdmF0ZToKKyAgICBDbGlwUmVjdHMoKSA9IGRlZmF1bHQ7 CisKICAgICBDbGlwUmVjdHMoY29uc3QgTGF5b3V0UmVjdCYgY2xpcFJlY3QpCiAgICAgICAgIDog bV9vdmVyZmxvd0NsaXBSZWN0KGNsaXBSZWN0KQogICAgICAgICAsIG1fZml4ZWRDbGlwUmVjdChj bGlwUmVjdCkKQEAgLTIwNSwxOCArMTk4LDE3IEBAIHByaXZhdGU6CiAgICAgfQogCiAgICAgQ2xp cFJlY3RzKGNvbnN0IENsaXBSZWN0cyYgb3RoZXIpCi0gICAgICAgIDogbV9vdmVyZmxvd0NsaXBS ZWN0KG90aGVyLm92ZXJmbG93Q2xpcFJlY3QoKSkKKyAgICAgICAgOiBtX2ZpeGVkKG90aGVyLmZp eGVkKCkpCisgICAgICAgICwgbV9vdmVyZmxvd0NsaXBSZWN0KG90aGVyLm92ZXJmbG93Q2xpcFJl Y3QoKSkKICAgICAgICAgLCBtX2ZpeGVkQ2xpcFJlY3Qob3RoZXIuZml4ZWRDbGlwUmVjdCgpKQog ICAgICAgICAsIG1fcG9zQ2xpcFJlY3Qob3RoZXIucG9zQ2xpcFJlY3QoKSkKLSAgICAgICAgLCBt X2ZpeGVkKG90aGVyLmZpeGVkKCkpCiAgICAgewogICAgIH0KIAorICAgIGJvb2wgbV9maXhlZCA9 IGZhbHNlOwogICAgIENsaXBSZWN0IG1fb3ZlcmZsb3dDbGlwUmVjdDsKICAgICBDbGlwUmVjdCBt X2ZpeGVkQ2xpcFJlY3Q7CiAgICAgQ2xpcFJlY3QgbV9wb3NDbGlwUmVjdDsKLSAgICB1bnNpZ25l ZCBtX3JlZkNvdW50ID0gMTsKLSAgICBib29sIG1fZml4ZWQgPSBmYWxzZTsKIH07CiAKIGNsYXNz IENsaXBSZWN0c0NhY2hlIHsKQEAgLTIzMiw4ICsyMjQsMTUgQEAgcHVibGljOgogI2VuZGlmCiAg ICAgfQogCi0gICAgQ2xpcFJlY3RzKiBnZXRDbGlwUmVjdHMoQ2xpcFJlY3RzVHlwZSBjbGlwUmVj dHNUeXBlLCBTaG91bGRSZXNwZWN0T3ZlcmZsb3dDbGlwIHJlc3BlY3RPdmVyZmxvdykgeyByZXR1 cm4gbV9jbGlwUmVjdHNbZ2V0SW5kZXgoY2xpcFJlY3RzVHlwZSwgcmVzcGVjdE92ZXJmbG93KV0u Z2V0KCk7IH0KLSAgICB2b2lkIHNldENsaXBSZWN0cyhDbGlwUmVjdHNUeXBlIGNsaXBSZWN0c1R5 cGUsIFNob3VsZFJlc3BlY3RPdmVyZmxvd0NsaXAgcmVzcGVjdE92ZXJmbG93LCBSZWZQdHI8Q2xp cFJlY3RzPiYmIGNsaXBSZWN0cykgeyBtX2NsaXBSZWN0c1tnZXRJbmRleChjbGlwUmVjdHNUeXBl LCByZXNwZWN0T3ZlcmZsb3cpXSA9IFdURk1vdmUoY2xpcFJlY3RzKTsgfQorICAgIENsaXBSZWN0 cyogZ2V0Q2xpcFJlY3RzKENsaXBSZWN0c1R5cGUgY2xpcFJlY3RzVHlwZSwgU2hvdWxkUmVzcGVj dE92ZXJmbG93Q2xpcCByZXNwZWN0T3ZlcmZsb3cpIGNvbnN0CisgICAgeworICAgICAgICByZXR1 cm4gbV9jbGlwUmVjdHNbZ2V0SW5kZXgoY2xpcFJlY3RzVHlwZSwgcmVzcGVjdE92ZXJmbG93KV0u Z2V0KCk7CisgICAgfQorCisgICAgdm9pZCBzZXRDbGlwUmVjdHMoQ2xpcFJlY3RzVHlwZSBjbGlw UmVjdHNUeXBlLCBTaG91bGRSZXNwZWN0T3ZlcmZsb3dDbGlwIHJlc3BlY3RPdmVyZmxvdywgUmVm UHRyPENsaXBSZWN0cz4mJiBjbGlwUmVjdHMpCisgICAgeworICAgICAgICBtX2NsaXBSZWN0c1tn ZXRJbmRleChjbGlwUmVjdHNUeXBlLCByZXNwZWN0T3ZlcmZsb3cpXSA9IFdURk1vdmUoY2xpcFJl Y3RzKTsKKyAgICB9CiAKICNpZm5kZWYgTkRFQlVHCiAgICAgY29uc3QgUmVuZGVyTGF5ZXIqIG1f Y2xpcFJlY3RzUm9vdFtOdW1DYWNoZWRDbGlwUmVjdHNUeXBlc107CkBAIC0yNDEsMTEgKzI0MCwx MiBAQCBwdWJsaWM6CiAjZW5kaWYKIAogcHJpdmF0ZToKLSAgICBpbnQgZ2V0SW5kZXgoQ2xpcFJl Y3RzVHlwZSBjbGlwUmVjdHNUeXBlLCBTaG91bGRSZXNwZWN0T3ZlcmZsb3dDbGlwIHJlc3BlY3RP dmVyZmxvdykKKyAgICB1bnNpZ25lZCBnZXRJbmRleChDbGlwUmVjdHNUeXBlIGNsaXBSZWN0c1R5 cGUsIFNob3VsZFJlc3BlY3RPdmVyZmxvd0NsaXAgcmVzcGVjdE92ZXJmbG93KSBjb25zdAogICAg IHsKLSAgICAgICAgaW50IGluZGV4ID0gc3RhdGljX2Nhc3Q8aW50PihjbGlwUmVjdHNUeXBlKTsK KyAgICAgICAgdW5zaWduZWQgaW5kZXggPSBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oY2xpcFJlY3Rz VHlwZSk7CiAgICAgICAgIGlmIChyZXNwZWN0T3ZlcmZsb3cgPT0gUmVzcGVjdE92ZXJmbG93Q2xp cCkKLSAgICAgICAgICAgIGluZGV4ICs9IHN0YXRpY19jYXN0PGludD4oTnVtQ2FjaGVkQ2xpcFJl Y3RzVHlwZXMpOworICAgICAgICAgICAgaW5kZXggKz0gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KE51 bUNhY2hlZENsaXBSZWN0c1R5cGVzKTsKKyAgICAgICAgQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1Q TElDQVRJT04oaW5kZXggPCBOdW1DYWNoZWRDbGlwUmVjdHNUeXBlcyAqIDIpOwogICAgICAgICBy ZXR1cm4gaW5kZXg7CiAgICAgfQogCkBAIC01NDE4LDkgKzU0MTgsOSBAQCBSZWY8Q2xpcFJlY3Rz PiBSZW5kZXJMYXllcjo6dXBkYXRlQ2xpcFJlY3RzKGNvbnN0IENsaXBSZWN0c0NvbnRleHQmIGNs aXBSZWN0c0NvbgogICAgICAgICAgICAgLy8gVGhpcyBjb2RlIGlzIHVzZWZ1bCB0byBjaGVjayBj YWNoZWQgY2xpcCByZWN0cywgYnV0IGlzIHRvbyBleHBlbnNpdmUgdG8gbGVhdmUgZW5hYmxlZCBp biBkZWJ1ZyBidWlsZHMgYnkgZGVmYXVsdC4KICAgICAgICAgICAgIENsaXBSZWN0c0NvbnRleHQg dGVtcENvbnRleHQoY2xpcFJlY3RzQ29udGV4dCk7CiAgICAgICAgICAgICB0ZW1wQ29udGV4dC5j bGlwUmVjdHNUeXBlID0gVGVtcG9yYXJ5Q2xpcFJlY3RzOwotICAgICAgICAgICAgQ2xpcFJlY3Rz IHRlbXBDbGlwUmVjdHM7CisgICAgICAgICAgICBSZWY8Q2xpcFJlY3RzPiB0ZW1wQ2xpcFJlY3Rz ID0gQ2xpcFJlY3RzOjpjcmVhdGUoKTsKICAgICAgICAgICAgIGNhbGN1bGF0ZUNsaXBSZWN0cyh0 ZW1wQ29udGV4dCwgdGVtcENsaXBSZWN0cyk7Ci0gICAgICAgICAgICBBU1NFUlQodGVtcENsaXBS ZWN0cyA9PSAqY2xpcFJlY3RzKTsKKyAgICAgICAgICAgIEFTU0VSVCh0ZW1wQ2xpcFJlY3RzLmdl dCgpID09ICpjbGlwUmVjdHMpOwogI2VuZGlmCiAgICAgICAgICAgICByZXR1cm4gKmNsaXBSZWN0 czsgLy8gV2UgaGF2ZSB0aGUgY29ycmVjdCBjYWNoZWQgdmFsdWUuCiAgICAgICAgIH0K 290369 2016-09-30 12:58:48 -0700 2016-09-30 13:54:26 -0700 Patch bug-162798-20160930125545.patch text/plain 5181 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjA2NjQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTMwMTU4OTM5OGYwMzA0 ZDkwOGEwMzE0NmJlOWVjNDk2NjIxYWU5Ny4uYzNmZTZiYjRhYjQ3ZDE0OWNmNjFmMDYxZTIyYWFl ZTRhMzEzMTMyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE2LTA5LTMwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIENsaXBSZWN0cydz IGN1c3RvbSByZWZjb3VudGluZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE2Mjc5OAorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4K KworICAgICAgICBJdCdzIHNhZmVyIHRvIHVzZSBSZWZDb3VudGVkPD4uIAorCisgICAgICAgIE5v IGNoYW5nZSBpbiBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxh eWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNsaXBSZWN0czo6Q2xpcFJlY3RzKToKKyAgICAg ICAgKFdlYkNvcmU6OkNsaXBSZWN0c0NhY2hlOjpnZXRDbGlwUmVjdHMpOgorICAgICAgICAoV2Vi Q29yZTo6Q2xpcFJlY3RzQ2FjaGU6OnNldENsaXBSZWN0cyk6CisgICAgICAgIChXZWJDb3JlOjpD bGlwUmVjdHNDYWNoZTo6Z2V0SW5kZXgpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6 OnVwZGF0ZUNsaXBSZWN0cyk6CisgICAgICAgIChXZWJDb3JlOjpDbGlwUmVjdHM6OnJlZik6IERl bGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpDbGlwUmVjdHM6OmRlcmVmKTogRGVsZXRlZC4KKwog MjAxNi0wOS0zMCAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAg UmVtb3ZlICJyZW0iIHVuaXQgb3B0aW1pemF0aW9uIGZvciBkb2N1bWVudCBlbGVtZW50IGZvbnQg c2l6ZSBjaGFuZ2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAppbmRl eCBlOWYxMDk0NGViMTM1NTM4ZTgzOGNkYmFkOGVkNTYzNmEyZTg3MTkwLi5kOThlYmZlY2MxY2Q0 Y2UxZTQ2OTJkOTg1ZGNiZGU2NTk3NTgwMTAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllci5jcHAKQEAgLTEzNyw3ICsxMzcsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK IHVzaW5nIG5hbWVzcGFjZSBIVE1MTmFtZXM7CiAKLWNsYXNzIENsaXBSZWN0cyB7CitjbGFzcyBD bGlwUmVjdHMgOiBwdWJsaWMgUmVmQ291bnRlZDxDbGlwUmVjdHM+IHsKICAgICBXVEZfTUFLRV9G QVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKICAgICBzdGF0aWMgUmVmPENsaXBSZWN0cz4gY3JlYXRl KCkKQEAgLTE1MCw4ICsxNTAsNiBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBhZG9wdFJlZigq bmV3IENsaXBSZWN0cyhvdGhlcikpOwogICAgIH0KIAotICAgIENsaXBSZWN0cygpID0gZGVmYXVs dDsKLQogICAgIHZvaWQgcmVzZXQoKQogICAgIHsKICAgICAgICAgbV9vdmVyZmxvd0NsaXBSZWN0 LnJlc2V0KCk7CkBAIC0xNzIsMTMgKzE3MCw2IEBAIHB1YmxpYzoKICAgICBib29sIGZpeGVkKCkg Y29uc3QgeyByZXR1cm4gbV9maXhlZDsgfQogICAgIHZvaWQgc2V0Rml4ZWQoYm9vbCBmaXhlZCkg eyBtX2ZpeGVkID0gZml4ZWQ7IH0KIAotICAgIHZvaWQgcmVmKCkgeyBtX3JlZkNvdW50Kys7IH0K LSAgICB2b2lkIGRlcmVmKCkKLSAgICB7Ci0gICAgICAgIGlmICghLS1tX3JlZkNvdW50KQotICAg ICAgICAgICAgZGVsZXRlIHRoaXM7Ci0gICAgfQotCiAgICAgYm9vbCBvcGVyYXRvcj09KGNvbnN0 IENsaXBSZWN0cyYgb3RoZXIpIGNvbnN0CiAgICAgewogICAgICAgICByZXR1cm4gbV9vdmVyZmxv d0NsaXBSZWN0ID09IG90aGVyLm92ZXJmbG93Q2xpcFJlY3QoKQpAQCAtMTk3LDYgKzE4OCw4IEBA IHB1YmxpYzoKICAgICB9CiAKIHByaXZhdGU6CisgICAgQ2xpcFJlY3RzKCkgPSBkZWZhdWx0Owor CiAgICAgQ2xpcFJlY3RzKGNvbnN0IExheW91dFJlY3QmIGNsaXBSZWN0KQogICAgICAgICA6IG1f b3ZlcmZsb3dDbGlwUmVjdChjbGlwUmVjdCkKICAgICAgICAgLCBtX2ZpeGVkQ2xpcFJlY3QoY2xp cFJlY3QpCkBAIC0yMDUsMTggKzE5OCwxNyBAQCBwcml2YXRlOgogICAgIH0KIAogICAgIENsaXBS ZWN0cyhjb25zdCBDbGlwUmVjdHMmIG90aGVyKQotICAgICAgICA6IG1fb3ZlcmZsb3dDbGlwUmVj dChvdGhlci5vdmVyZmxvd0NsaXBSZWN0KCkpCisgICAgICAgIDogbV9maXhlZChvdGhlci5maXhl ZCgpKQorICAgICAgICAsIG1fb3ZlcmZsb3dDbGlwUmVjdChvdGhlci5vdmVyZmxvd0NsaXBSZWN0 KCkpCiAgICAgICAgICwgbV9maXhlZENsaXBSZWN0KG90aGVyLmZpeGVkQ2xpcFJlY3QoKSkKICAg ICAgICAgLCBtX3Bvc0NsaXBSZWN0KG90aGVyLnBvc0NsaXBSZWN0KCkpCi0gICAgICAgICwgbV9m aXhlZChvdGhlci5maXhlZCgpKQogICAgIHsKICAgICB9CiAKKyAgICBib29sIG1fZml4ZWQgeyBm YWxzZSB9OwogICAgIENsaXBSZWN0IG1fb3ZlcmZsb3dDbGlwUmVjdDsKICAgICBDbGlwUmVjdCBt X2ZpeGVkQ2xpcFJlY3Q7CiAgICAgQ2xpcFJlY3QgbV9wb3NDbGlwUmVjdDsKLSAgICB1bnNpZ25l ZCBtX3JlZkNvdW50ID0gMTsKLSAgICBib29sIG1fZml4ZWQgPSBmYWxzZTsKIH07CiAKIGNsYXNz IENsaXBSZWN0c0NhY2hlIHsKQEAgLTIzMiw4ICsyMjQsMTUgQEAgcHVibGljOgogI2VuZGlmCiAg ICAgfQogCi0gICAgQ2xpcFJlY3RzKiBnZXRDbGlwUmVjdHMoQ2xpcFJlY3RzVHlwZSBjbGlwUmVj dHNUeXBlLCBTaG91bGRSZXNwZWN0T3ZlcmZsb3dDbGlwIHJlc3BlY3RPdmVyZmxvdykgeyByZXR1 cm4gbV9jbGlwUmVjdHNbZ2V0SW5kZXgoY2xpcFJlY3RzVHlwZSwgcmVzcGVjdE92ZXJmbG93KV0u Z2V0KCk7IH0KLSAgICB2b2lkIHNldENsaXBSZWN0cyhDbGlwUmVjdHNUeXBlIGNsaXBSZWN0c1R5 cGUsIFNob3VsZFJlc3BlY3RPdmVyZmxvd0NsaXAgcmVzcGVjdE92ZXJmbG93LCBSZWZQdHI8Q2xp cFJlY3RzPiYmIGNsaXBSZWN0cykgeyBtX2NsaXBSZWN0c1tnZXRJbmRleChjbGlwUmVjdHNUeXBl LCByZXNwZWN0T3ZlcmZsb3cpXSA9IFdURk1vdmUoY2xpcFJlY3RzKTsgfQorICAgIENsaXBSZWN0 cyogZ2V0Q2xpcFJlY3RzKENsaXBSZWN0c1R5cGUgY2xpcFJlY3RzVHlwZSwgU2hvdWxkUmVzcGVj dE92ZXJmbG93Q2xpcCByZXNwZWN0T3ZlcmZsb3cpIGNvbnN0CisgICAgeworICAgICAgICByZXR1 cm4gbV9jbGlwUmVjdHNbZ2V0SW5kZXgoY2xpcFJlY3RzVHlwZSwgcmVzcGVjdE92ZXJmbG93KV0u Z2V0KCk7CisgICAgfQorCisgICAgdm9pZCBzZXRDbGlwUmVjdHMoQ2xpcFJlY3RzVHlwZSBjbGlw UmVjdHNUeXBlLCBTaG91bGRSZXNwZWN0T3ZlcmZsb3dDbGlwIHJlc3BlY3RPdmVyZmxvdywgUmVm UHRyPENsaXBSZWN0cz4mJiBjbGlwUmVjdHMpCisgICAgeworICAgICAgICBtX2NsaXBSZWN0c1tn ZXRJbmRleChjbGlwUmVjdHNUeXBlLCByZXNwZWN0T3ZlcmZsb3cpXSA9IFdURk1vdmUoY2xpcFJl Y3RzKTsKKyAgICB9CiAKICNpZm5kZWYgTkRFQlVHCiAgICAgY29uc3QgUmVuZGVyTGF5ZXIqIG1f Y2xpcFJlY3RzUm9vdFtOdW1DYWNoZWRDbGlwUmVjdHNUeXBlc107CkBAIC0yNDEsMTEgKzI0MCwx MiBAQCBwdWJsaWM6CiAjZW5kaWYKIAogcHJpdmF0ZToKLSAgICBpbnQgZ2V0SW5kZXgoQ2xpcFJl Y3RzVHlwZSBjbGlwUmVjdHNUeXBlLCBTaG91bGRSZXNwZWN0T3ZlcmZsb3dDbGlwIHJlc3BlY3RP dmVyZmxvdykKKyAgICB1bnNpZ25lZCBnZXRJbmRleChDbGlwUmVjdHNUeXBlIGNsaXBSZWN0c1R5 cGUsIFNob3VsZFJlc3BlY3RPdmVyZmxvd0NsaXAgcmVzcGVjdE92ZXJmbG93KSBjb25zdAogICAg IHsKLSAgICAgICAgaW50IGluZGV4ID0gc3RhdGljX2Nhc3Q8aW50PihjbGlwUmVjdHNUeXBlKTsK KyAgICAgICAgdW5zaWduZWQgaW5kZXggPSBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oY2xpcFJlY3Rz VHlwZSk7CiAgICAgICAgIGlmIChyZXNwZWN0T3ZlcmZsb3cgPT0gUmVzcGVjdE92ZXJmbG93Q2xp cCkKLSAgICAgICAgICAgIGluZGV4ICs9IHN0YXRpY19jYXN0PGludD4oTnVtQ2FjaGVkQ2xpcFJl Y3RzVHlwZXMpOworICAgICAgICAgICAgaW5kZXggKz0gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KE51 bUNhY2hlZENsaXBSZWN0c1R5cGVzKTsKKyAgICAgICAgQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1Q TElDQVRJT04oaW5kZXggPCBOdW1DYWNoZWRDbGlwUmVjdHNUeXBlcyAqIDIpOwogICAgICAgICBy ZXR1cm4gaW5kZXg7CiAgICAgfQogCkBAIC01NDE4LDkgKzU0MTgsOSBAQCBSZWY8Q2xpcFJlY3Rz PiBSZW5kZXJMYXllcjo6dXBkYXRlQ2xpcFJlY3RzKGNvbnN0IENsaXBSZWN0c0NvbnRleHQmIGNs aXBSZWN0c0NvbgogICAgICAgICAgICAgLy8gVGhpcyBjb2RlIGlzIHVzZWZ1bCB0byBjaGVjayBj YWNoZWQgY2xpcCByZWN0cywgYnV0IGlzIHRvbyBleHBlbnNpdmUgdG8gbGVhdmUgZW5hYmxlZCBp biBkZWJ1ZyBidWlsZHMgYnkgZGVmYXVsdC4KICAgICAgICAgICAgIENsaXBSZWN0c0NvbnRleHQg dGVtcENvbnRleHQoY2xpcFJlY3RzQ29udGV4dCk7CiAgICAgICAgICAgICB0ZW1wQ29udGV4dC5j bGlwUmVjdHNUeXBlID0gVGVtcG9yYXJ5Q2xpcFJlY3RzOwotICAgICAgICAgICAgQ2xpcFJlY3Rz IHRlbXBDbGlwUmVjdHM7CisgICAgICAgICAgICBSZWY8Q2xpcFJlY3RzPiB0ZW1wQ2xpcFJlY3Rz ID0gQ2xpcFJlY3RzOjpjcmVhdGUoKTsKICAgICAgICAgICAgIGNhbGN1bGF0ZUNsaXBSZWN0cyh0 ZW1wQ29udGV4dCwgdGVtcENsaXBSZWN0cyk7Ci0gICAgICAgICAgICBBU1NFUlQodGVtcENsaXBS ZWN0cyA9PSAqY2xpcFJlY3RzKTsKKyAgICAgICAgICAgIEFTU0VSVCh0ZW1wQ2xpcFJlY3RzLmdl dCgpID09ICpjbGlwUmVjdHMpOwogI2VuZGlmCiAgICAgICAgICAgICByZXR1cm4gKmNsaXBSZWN0 czsgLy8gV2UgaGF2ZSB0aGUgY29ycmVjdCBjYWNoZWQgdmFsdWUuCiAgICAgICAgIH0K