150435 2015-10-21 21:38:41 -0700 [GTK] Try to fix the build after r191402. 2015-10-22 02:33:16 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 150415 1 hs85.jeong hs85.jeong berto bugs-noreply cgarcia clopez commit-queue gustavo mcatanzaro mrobinson ossy oldest_to_newest 1135565 0 hs85.jeong 2015-10-21 21:38:41 -0700 https://build.webkit.org/builders/GTK%20Linux%2032-bit%20Release/builds/56507/steps/compile-webkit/logs/stdio ../../Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h:86:41: error: invalid covariant return type for ‘virtual WTF::RefPtr<WebKit::WebContextMenuProxy> WebKit::PageClientImpl::createContextMenuProxy(WebKit::WebPageProxy&, const WebKit::ContextMenuContextData&, const WebKit::UserData&)’ virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&) override; ^ In file included from ../../Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h:33:0, from ../../Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp:39: ../../Source/WebKit2/UIProcess/PageClient.h:227:50: error: overriding ‘virtual std::unique_ptr<WebKit::WebContextMenuProxy> WebKit::PageClient::createContextMenuProxy(WebKit::WebPageProxy&, const WebKit::ContextMenuContextData&, const WebKit::UserData&)’ virtual std::unique_ptr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&) = 0; ^ In file included from ../../Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h:34:0, from ../../Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp:48: ../../Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h:50:18: error: ‘virtual void WebKit::WebContextMenuProxyGtk::showContextMenu()’ marked override, but does not override virtual void showContextMenu() override; ^ ../../Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h:51:18: error: ‘virtual void WebKit::WebContextMenuProxyGtk::hideContextMenu()’ marked override, but does not override virtual void hideContextMenu() override; ^ ../../Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h:52:18: error: ‘virtual void WebKit::WebContextMenuProxyGtk::cancelTracking()’ marked override, but does not override virtual void cancelTracking() override; ^ ../../Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h: In static member function ‘static WTF::Ref<WebKit::WebContextMenuProxyGtk> WebKit::WebContextMenuProxyGtk::create(GtkWidget*, WebKit::WebPageProxy&, const WebKit::ContextMenuContextData&, const WebKit::UserData&)’: ../../Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h:46:85: error: invalid new-expression of abstract class type ‘WebKit::WebContextMenuProxyGtk’ return adoptRef(*new WebContextMenuProxyGtk(webView, page, context, userData)); ^ In file included from ../../Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h:34:0, from ../../Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp:48: ../../Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h:42:7: note: because the following virtual functions are pure within ‘WebKit::WebContextMenuProxyGtk’: class WebContextMenuProxyGtk : public WebContextMenuProxy { ^ In file included from ../../Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h:31:0, from ../../Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h:34, from ../../Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp:48: ../../Source/WebKit2/UIProcess/WebContextMenuProxy.h:43:18: note: virtual void WebKit::WebContextMenuProxy::show() virtual void show() = 0; ^ FAILED: /usr/lib/ccache/c++ -DBUILDING_GTK__=1 -DBUILDING_WEBKIT -DBUILDING_WITH_CMAKE=1 -DDATADIR=\"/usr/local/share\" -DDATA_DIR=\"share\" -DENABLE_DATABASE_PROCESS=1 -DENABLE_PLUGIN_PROCESS=1 -DGETTEXT_PACKAGE=\"WebKit2GTK-4.0\" -DHAVE_CONFIG_H=1 -DLIBDIR=\"/usr/local/lib\" -DLIBEXECDIR=\"/usr/local/libexec\" -DLOCALEDIR=\"/usr/local/share/locale\" -DPKGLIBEXECDIR=\"/usr/local/libexec/webkit2gtk-4.0\" -DUSER_AGENT_GTK_MAJOR_VERSION=602 -DUSER_AGENT_GTK_MINOR_VERSION=1 -DWEBKIT2_COMPILATION -DWEBKITGTK_API_VERSION_STRING=\"4.0\" -DWebKit2_EXPORTS -march=pentium4 -msse2 -mfpmath=sse -std=c++11 -O3 -DNDEBUG -fno-exceptions -fno-strict-aliasing -fno-rtti -fPIC -I../../Source/WebKit2/Platform -I../../Source/WebKit2/Shared -I../../Source/WebKit2/Shared/API/c -I../../Source/WebKit2/UIProcess/API/C -I../../Source/WebKit2/WebProcess/InjectedBundle -I../../Source/WebKit2/WebProcess/InjectedBundle/API/c -IDerivedSources -IDerivedSources/InjectedBundle -IDerivedSources/webkitdom -IDerivedSources/ForwardingHeaders -IDerivedSources/ForwardingHeaders/webkit2gtk -IDerivedSources/ForwardingHeaders/webkit2gtk-webextension -IDerivedSources/webkit2gtk/webkit2 -IDerivedSources/webkit2gtk -I../../Source/JavaScriptCore/llint -I../../Source/WebKit2 -I../../Source/WebKit2/DatabaseProcess -I../../Source/WebKit2/DatabaseProcess/IndexedDB -I../../Source/WebKit2/DatabaseProcess/IndexedDB/sqlite -I../../Source/WebKit2/NetworkProcess -I../../Source/WebKit2/NetworkProcess/FileAPI -I../../Source/WebKit2/NetworkProcess/cache -I../../Source/WebKit2/Platform/IPC -I../../Source/WebKit2/PluginProcess -I../../Source/WebKit2/Shared/API -I../../Source/WebKit2/Shared/Authentication -I../../Source/WebKit2/Shared/CoreIPCSupport -I../../Source/WebKit2/Shared/Databases -I../../Source/WebKit2/Shared/Databases/IndexedDB -I../../Source/WebKit2/Shared/Downloads -I../../Source/WebKit2/Shared/FileAPI -I../../Source/WebKit2/Shared/Network -I../../Source/WebKit2/Shared/Network/CustomProtocols -I../../Source/WebKit2/Shared/Plugins -I../../Source/WebKit2/Shared/Plugins/Netscape -I../../Source/WebKit2/Shared/Plugins/Netscape/x11 -I../../Source/WebKit2/Shared/WebsiteData -I../../Source/WebKit2/UIProcess -I../../Source/WebKit2/UIProcess/API -I../../Source/WebKit2/UIProcess/API/cpp -I../../Source/WebKit2/UIProcess/Authentication -I../../Source/WebKit2/UIProcess/Databases -I../../Source/WebKit2/UIProcess/Downloads -I../../Source/WebKit2/UIProcess/InspectorServer -I../../Source/WebKit2/UIProcess/Launcher -I../../Source/WebKit2/UIProcess/Network -I../../Source/WebKit2/UIProcess/Network/CustomProtocols -I../../Source/WebKit2/UIProcess/Notifications -I../../Source/WebKit2/UIProcess/Plugins -I../../Source/WebKit2/UIProcess/Storage -I../../Source/WebKit2/UIProcess/UserContent -I../../Source/WebKit2/UIProcess/WebsiteData -I../../Source/WebKit2/WebProcess -I../../Source/WebKit2/WebProcess/ApplicationCache -I../../Source/WebKit2/WebProcess/Battery -I../../Source/WebKit2/WebProcess/Cookies -I../../Source/WebKit2/WebProcess/Databases -I../../Source/WebKit2/WebProcess/Databases/IndexedDB -I../../Source/WebKit2/WebProcess/FileAPI -I../../Source/WebKit2/WebProcess/FullScreen -I../../Source/WebKit2/WebProcess/Geolocation -I../../Source/WebKit2/WebProcess/IconDatabase -I../../Source/WebKit2/WebProcess/InjectedBundle/API -I../../Source/WebKit2/WebProcess/InjectedBundle/DOM -I../../Source/WebKit2/WebProcess/Launching -I../../Source/WebKit2/WebProcess/MediaCache -I../../Source/WebKit2/WebProcess/MediaStream -I../../Source/WebKit2/WebProcess/Network -I../../Source/WebKit2/WebProcess/Notifications -I../../Source/WebKit2/WebProcess/OriginData -I../../Source/WebKit2/WebProcess/Plugins -I../../Source/WebKit2/WebProcess/Plugins/Netscape -I../../Source/WebKit2/WebProcess/ResourceCache -I../../Source/WebKit2/WebProcess/Storage -I../../Source/WebKit2/WebProcess/UserContent -I../../Source/WebKit2/WebProcess/WebCoreSupport -I../../Source/WebKit2/WebProcess/WebPage -I../../Source/WebCore -I../../Source/WebCore/Modules/battery -I../../Source/WebCore/Modules/indexeddb -I../../Source/WebCore/Modules/indexeddb/legacy -I../../Source/WebCore/Modules/mediastream -I../../Source/WebCore/Modules/networkinfo -I../../Source/WebCore/Modules/notifications -I../../Source/WebCore/Modules/streams -I../../Source/WebCore/Modules/vibration -I../../Source/WebCore/Modules/webdatabase -I../../Source/WebCore/accessibility -I../../Source/WebCore/bindings/js -I../../Source/WebCore/bindings -I../../Source/WebCore/bridge -I../../Source/WebCore/bridge/jsc -I../../Source/WebCore/contentextensions -I../../Source/WebCore/css -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/shadow -I../../Source/WebCore/html/track -I../../Source/WebCore/inspector -I../../Source/WebCore/loader -I../../Source/WebCore/loader/archive -I../../Source/WebCore/loader/icon -I../../Source/WebCore/loader/cache -I../../Source/WebCore/page -I../../Source/WebCore/page/animation -I../../Source/WebCore/page/scrolling -I../../Source/WebCore/platform -I../../Source/WebCore/platform/animation -I../../Source/WebCore/platform/audio -I../../Source/WebCore/platform/graphics -I../../Source/WebCore/platform/graphics/filters -I../../Source/WebCore/platform/graphics/harfbuzz -I../../Source/WebCore/platform/graphics/harfbuzz/ng -I../../Source/WebCore/platform/graphics/surfaces -I../../Source/WebCore/platform/graphics/texmap -I../../Source/WebCore/platform/graphics/transforms -I../../Source/WebCore/platform/mediastream -I../../Source/WebCore/platform/network -I../../Source/WebCore/platform/sql -I../../Source/WebCore/platform/text -I../../Source/WebCore/plugins -I../../Source/WebCore/rendering -I../../Source/WebCore/rendering/line -I../../Source/WebCore/rendering/shapes -I../../Source/WebCore/rendering/style -I../../Source/WebCore/storage -I../../Source/WebCore/style -I../../Source/WebCore/svg -I../../Source/WebCore/svg/graphics -I../../Source/WebCore/svg/properties -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/collector/handles -I../../Source/JavaScriptCore/dfg -I../../Source/JavaScriptCore/disassembler -I../../Source/JavaScriptCore/heap -I../../Source/JavaScriptCore/interpreter -I../../Source/JavaScriptCore/jit -I../../Source/JavaScriptCore/parser -I../../Source/JavaScriptCore/profiler -I../../Source/JavaScriptCore/runtime -I../../Source/WTF -IDerivedSources/JavaScriptCore -IDerivedSources/WebCore -IDerivedSources/WebKit2 -IDerivedSources/WebKit2/include -I. -I../../Source -I../../Source/ThirdParty/ANGLE -I../../Source/ThirdParty/ANGLE/include/KHR -I../../Source/WebKit2/PluginProcess/unix -I../../Source/WebCore/platform/cairo -I../../Source/WebCore/platform/gtk -I../../Source/WebCore/platform/graphics/cairo -I../../Source/WebCore/platform/graphics/opentype -I../../Source/WebCore/platform/graphics/x11 -I../../Source/WebCore/platform/network/soup -I../../Source/WebCore/platform/text/enchant -I../../Source/WebKit2/DatabaseProcess/unix -I../../Source/WebKit2/NetworkProcess/gtk -I../../Source/WebKit2/NetworkProcess/unix -I../../Source/WebKit2/Shared/API/c/gtk -I../../Source/WebKit2/Shared/Network/CustomProtocols/soup -I../../Source/WebKit2/Shared/Downloads/soup -I../../Source/WebKit2/Shared/Plugins/unix -I../../Source/WebKit2/Shared/glib -I../../Source/WebKit2/Shared/gtk -I../../Source/WebKit2/Shared/linux -I../../Source/WebKit2/Shared/linux/SeccompFilters -I../../Source/WebKit2/Shared/soup -I../../Source/WebKit2/Shared/unix -I../../Source/WebKit2/UIProcess/API/C/cairo -I../../Source/WebKit2/UIProcess/API/C/gtk -I../../Source/WebKit2/UIProcess/API/C/soup -I../../Source/WebKit2/UIProcess/API/cpp/gtk -I../../Source/WebKit2/UIProcess/API/gtk -I../../Source/WebKit2/UIProcess/Network/CustomProtocols/soup -I../../Source/WebKit2/UIProcess/Plugins/gtk -I../../Source/WebKit2/UIProcess/gstreamer -I../../Source/WebKit2/UIProcess/gtk -I../../Source/WebKit2/UIProcess/soup -I../../Source/WebKit2/WebProcess/InjectedBundle/API/gtk -I../../Source/WebKit2/WebProcess/gtk -I../../Source/WebKit2/WebProcess/soup -I../../Source/WebKit2/WebProcess/unix -I../../Source/WebKit2/WebProcess/WebCoreSupport/gtk -I../../Source/WebKit2/WebProcess/WebCoreSupport/soup -I../../Source/WebKit2/WebProcess/WebPage/atk -I../../Source/WebKit2/WebProcess/WebPage/gtk -I../../Source/WTF/wtf/gtk -I../../Source/WTF/wtf/glib -isystem ../DependenciesGTK/Root/include/cairo -isystem /usr/include/enchant -isystem ../DependenciesGTK/Root/include/glib-2.0 -isystem ../DependenciesGTK/Root/lib/glib-2.0/include -isystem ../DependenciesGTK/Root/include/libxml2 -isystem /usr/include/dbus-1.0 -isystem /usr/lib/i386-linux-gnu/dbus-1.0/include -isystem ../DependenciesGTK/Root/include/gstreamer-1.0 -isystem ../DependenciesGTK/Root/include/harfbuzz -isystem ../DependenciesGTK/Root/include/libsoup-2.4 -isystem ../DependenciesGTK/Root/include/gdk-pixbuf-2.0 -isystem /usr/include/libpng12 -isystem ../DependenciesGTK/Root/include/gtk-3.0 -isystem ../DependenciesGTK/Root/include/at-spi2-atk/2.0 -isystem ../DependenciesGTK/Root/include/gio-unix-2.0 -isystem ../DependenciesGTK/Root/include/pango-1.0 -isystem ../DependenciesGTK/Root/include/atk-1.0 -isystem ../DependenciesGTK/Root/include/pixman-1 -isystem ../DependenciesGTK/Root/include/freetype2 -isystem /usr/include/libdrm -isystem ../DependenciesGTK/Root/include/gtk-3.0/unix-print -Wall -Wextra -Wcast-align -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wundef -Wwrite-strings -include /var/lib/buildbot/webkit32/gtk-linux-32-release/build/Source/WebKit2/WebKit2Prefix.h -Wno-unused-parameter -MMD -MT Source/WebKit2/CMakeFiles/WebKit2.dir/UIProcess/API/gtk/WebKitWebContext.cpp.o -MF Source/WebKit2/CMakeFiles/WebKit2.dir/UIProcess/API/gtk/WebKitWebContext.cpp.o.d -o Source/WebKit2/CMakeFiles/WebKit2.dir/UIProcess/API/gtk/WebKitWebContext.cpp.o -c ../../Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp In file included from ../../Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h:34:0, from ../../Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp:49: ../../Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h:50:18: error: ‘virtual void WebKit::WebContextMenuProxyGtk::showContextMenu()’ marked override, but does not override virtual void showContextMenu() override; ^ ../../Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h:51:18: error: ‘virtual void WebKit::WebContextMenuProxyGtk::hideContextMenu()’ marked override, but does not override virtual void hideContextMenu() override; ^ ../../Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h:52:18: error: ‘virtual void WebKit::WebContextMenuProxyGtk::cancelTracking()’ marked override, but does not override virtual void cancelTracking() override; ^ ../../Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h: In static member function ‘static WTF::Ref<WebKit::WebContextMenuProxyGtk> WebKit::WebContextMenuProxyGtk::create(GtkWidget*, WebKit::WebPageProxy&, const WebKit::ContextMenuContextData&, const WebKit::UserData&)’: ../../Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h:46:85: error: invalid new-expression of abstract class type ‘WebKit::WebContextMenuProxyGtk’ return adoptRef(*new WebContextMenuProxyGtk(webView, page, context, userData)); ^ In file included from ../../Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h:34:0, from ../../Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp:49: ../../Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h:42:7: note: because the following virtual functions are pure within ‘WebKit::WebContextMenuProxyGtk’: class WebContextMenuProxyGtk : public WebContextMenuProxy { ^ In file included from ../../Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h:31:0, from ../../Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h:34, from ../../Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp:49: ../../Source/WebKit2/UIProcess/WebContextMenuProxy.h:43:18: note: virtual void WebKit::WebContextMenuProxy::show() virtual void show() = 0; 1135569 1 263791 hs85.jeong 2015-10-21 21:41:06 -0700 Created attachment 263791 Patch 1135570 2 commit-queue 2015-10-21 21:44:05 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1135597 3 263791 cgarcia 2015-10-22 00:11:19 -0700 Comment on attachment 263791 Patch Thanks for the patch. I don't think this is enough, though. Now, the destructor should do the dismiss and cancel tracking, so instead of removing the code, it should be moved to the destructor I think. Maybe we don't need to track the signal handlers anymore, but I think we should at least we need to popdown the menu and call webkitWebViewBaseSetActiveContextMenuProxy with nullptr. 1135598 4 263799 hs85.jeong 2015-10-22 00:18:13 -0700 Created attachment 263799 Patch 1135602 5 hs85.jeong 2015-10-22 00:19:50 -0700 (In reply to comment #3) > Comment on attachment 263791 [details] > Patch > > Thanks for the patch. I don't think this is enough, though. Now, the > destructor should do the dismiss and cancel tracking, so instead of removing > the code, it should be moved to the destructor I think. Maybe we don't need > to track the signal handlers anymore, but I think we should at least we need > to popdown the menu and call webkitWebViewBaseSetActiveContextMenuProxy with > nullptr. Oh I see. I add the codes to call the popdown and webkitWebViewBaseSetActiveContextMenuProxy at destructor. 1135608 6 263799 cgarcia 2015-10-22 00:29:04 -0700 Comment on attachment 263799 Patch Thanks! I think we should also disconnect the signals, because the user can have a reference to the actions. 1135613 7 263804 hs85.jeong 2015-10-22 00:40:38 -0700 Created attachment 263804 Patch 1135614 8 hs85.jeong 2015-10-22 00:44:42 -0700 (In reply to comment #6) > Comment on attachment 263799 [details] > Patch > > Thanks! I think we should also disconnect the signals, because the user can > have a reference to the actions. I moved the cancelTrakcing()s' functions to destructor. But I got another problem after applying this patch. I got a segment fault with this patch when reopen the contextMenu in MiniBrowser. If I removed the webkitWebViewBaseSetActiveContextMenuProxy in destructor, then it works correctly. 1135619 9 cgarcia 2015-10-22 00:58:48 -0700 (In reply to comment #8) > (In reply to comment #6) > > Comment on attachment 263799 [details] > > Patch > > > > Thanks! I think we should also disconnect the signals, because the user can > > have a reference to the actions. > > I moved the cancelTrakcing()s' functions to destructor. > But I got another problem after applying this patch. > > I got a segment fault with this patch when reopen the contextMenu in > MiniBrowser. > > If I removed the webkitWebViewBaseSetActiveContextMenuProxy in destructor, > then it works correctly. hmm, I think this is because the web page proxy doesn't destroy the active context menu, so the previous one is reused. I think we need to rework this to create/destroy the GtkMenu in show(). Feel free to land the build fix, so that bots can work again, and I'll fix the remaining issues if you want 1135620 10 hs85.jeong 2015-10-22 01:02:13 -0700 (In reply to comment #9) > (In reply to comment #8) > > (In reply to comment #6) > > > Comment on attachment 263799 [details] > > > Patch > > > > > > Thanks! I think we should also disconnect the signals, because the user can > > > have a reference to the actions. > > > > I moved the cancelTrakcing()s' functions to destructor. > > But I got another problem after applying this patch. > > > > I got a segment fault with this patch when reopen the contextMenu in > > MiniBrowser. > > > > If I removed the webkitWebViewBaseSetActiveContextMenuProxy in destructor, > > then it works correctly. > > hmm, I think this is because the web page proxy doesn't destroy the active > context menu, so the previous one is reused. I think we need to rework this > to create/destroy the GtkMenu in show(). Feel free to land the build fix, so > that bots can work again, and I'll fix the remaining issues if you want Okay, Thanks. 1135621 11 hs85.jeong 2015-10-22 01:04:58 -0700 (In reply to comment #10) > (In reply to comment #9) > > (In reply to comment #8) > > > (In reply to comment #6) > > > > Comment on attachment 263799 [details] > > > > Patch > > > > > > > > Thanks! I think we should also disconnect the signals, because the user can > > > > have a reference to the actions. > > > > > > I moved the cancelTrakcing()s' functions to destructor. > > > But I got another problem after applying this patch. > > > > > > I got a segment fault with this patch when reopen the contextMenu in > > > MiniBrowser. > > > > > > If I removed the webkitWebViewBaseSetActiveContextMenuProxy in destructor, > > > then it works correctly. > > > > hmm, I think this is because the web page proxy doesn't destroy the active > > context menu, so the previous one is reused. I think we need to rework this > > to create/destroy the GtkMenu in show(). Feel free to land the build fix, so > > that bots can work again, and I'll fix the remaining issues if you want > > Okay, Thanks. Could you give me the r+ again? 1135622 12 263804 cgarcia 2015-10-22 01:06:31 -0700 Comment on attachment 263804 Patch I'll land this asap 1135623 13 cgarcia 2015-10-22 01:09:14 -0700 Committed r191447: <http://trac.webkit.org/changeset/191447> 263791 2015-10-21 21:41:06 -0700 2015-10-22 00:18:03 -0700 Patch bug-150435-20151022134021.patch text/plain 6839 hs85.jeong SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5MTQzMikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDE1LTEwLTIxICBIdW5zZW9w IEplb25nICA8aHM4NS5qZW9uZ0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbR1RLXSBUcnkgdG8g Zml4IHRoZSBidWlsZCBhZnRlciByMTkxNDAyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUwNDM1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5j cHA6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpjcmVhdGVQb3B1cE1lbnVQcm94 eSk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpjcmVhdGVDb250ZXh0TWVudVBy b3h5KToKKyAgICAgICAgKFdlYktpdDo6UGFnZUNsaWVudEltcGw6OmNyZWF0ZUNvbG9yUGlja2Vy KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5oOgorICAgICAg ICAqIFVJUHJvY2Vzcy9ndGsvV2ViQ29udGV4dE1lbnVQcm94eUd0ay5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYkNvbnRleHRNZW51UHJveHlHdGs6OnBvcHVsYXRlKToKKyAgICAgICAgKFdlYktp dDo6V2ViQ29udGV4dE1lbnVQcm94eUd0azo6c2hvdyk6CisgICAgICAgIChXZWJLaXQ6OldlYkNv bnRleHRNZW51UHJveHlHdGs6OldlYkNvbnRleHRNZW51UHJveHlHdGspOgorICAgICAgICAoV2Vi S2l0OjpXZWJDb250ZXh0TWVudVByb3h5R3RrOjp+V2ViQ29udGV4dE1lbnVQcm94eUd0ayk6Cisg ICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHRNZW51UHJveHlHdGs6Om1lbnVQb3NpdGlvbkZ1bmN0 aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dE1lbnVQcm94eUd0azo6c2hvd0NvbnRl eHRNZW51KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dE1lbnVQcm94eUd0 azo6aGlkZUNvbnRleHRNZW51KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4 dE1lbnVQcm94eUd0azo6Y2FuY2VsVHJhY2tpbmcpOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJv Y2Vzcy9ndGsvV2ViQ29udGV4dE1lbnVQcm94eUd0ay5oOgorICAgICAgICAoV2ViS2l0OjpXZWJD b250ZXh0TWVudVByb3h5R3RrOjpndGtNZW51KToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4 dE1lbnVQcm94eUd0azo6Y3JlYXRlKTogRGVsZXRlZC4KKwogMjAxNS0xMC0yMSAgR3l1eW91bmcg S2ltICA8Z3l1eW91bmcua2ltQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW0VGTF1bR1RLXVtXSzJd IEZpeCBidWlsZCBicmVhayBzaW5jZSByMTkxNDAyLCByMTkxNDAxCkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuY3BwCShyZXZp c2lvbiAxOTE0MzIpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xp ZW50SW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxMSw5ICsyMTEsOSBAQCBSZWZQdHI8V2Vi UG9wdXBNZW51UHJveHk+IFBhZ2VDbGllbnRJbXBsCiAgICAgcmV0dXJuIFdlYlBvcHVwTWVudVBy b3h5R3RrOjpjcmVhdGUobV92aWV3V2lkZ2V0LCBwYWdlKTsKIH0KIAotUmVmUHRyPFdlYkNvbnRl eHRNZW51UHJveHk+IFBhZ2VDbGllbnRJbXBsOjpjcmVhdGVDb250ZXh0TWVudVByb3h5KFdlYlBh Z2VQcm94eSYgcGFnZSwgY29uc3QgQ29udGV4dE1lbnVDb250ZXh0RGF0YSYgY29udGV4dCwgY29u c3QgVXNlckRhdGEmIHVzZXJEYXRhKQorc3RkOjp1bmlxdWVfcHRyPFdlYkNvbnRleHRNZW51UHJv eHk+IFBhZ2VDbGllbnRJbXBsOjpjcmVhdGVDb250ZXh0TWVudVByb3h5KFdlYlBhZ2VQcm94eSYg cGFnZSwgY29uc3QgQ29udGV4dE1lbnVDb250ZXh0RGF0YSYgY29udGV4dCwgY29uc3QgVXNlckRh dGEmIHVzZXJEYXRhKQogewotICAgIHJldHVybiBXZWJDb250ZXh0TWVudVByb3h5R3RrOjpjcmVh dGUobV92aWV3V2lkZ2V0LCBwYWdlLCBjb250ZXh0LCB1c2VyRGF0YSk7CisgICAgcmV0dXJuIHN0 ZDo6bWFrZV91bmlxdWU8V2ViQ29udGV4dE1lbnVQcm94eUd0az4obV92aWV3V2lkZ2V0LCBwYWdl LCBjb250ZXh0LCB1c2VyRGF0YSk7CiB9CiAKIFJlZlB0cjxXZWJDb2xvclBpY2tlcj4gUGFnZUNs aWVudEltcGw6OmNyZWF0ZUNvbG9yUGlja2VyKFdlYlBhZ2VQcm94eSogcGFnZSwgY29uc3QgV2Vi Q29yZTo6Q29sb3ImIGNvbG9yLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiByZWN0KQpJbmRleDog U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5o CShyZXZpc2lvbiAxOTE0MzIpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9Q YWdlQ2xpZW50SW1wbC5oCSh3b3JraW5nIGNvcHkpCkBAIC04Myw3ICs4Myw3IEBAIHByaXZhdGU6 CiAgICAgdmlydHVhbCBXZWJDb3JlOjpJbnRSZWN0IHJvb3RWaWV3VG9TY3JlZW4oY29uc3QgV2Vi Q29yZTo6SW50UmVjdCYpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBkb25lV2l0aEtleUV2 ZW50KGNvbnN0IE5hdGl2ZVdlYktleWJvYXJkRXZlbnQmLCBib29sIHdhc0V2ZW50SGFuZGxlZCkg b3ZlcnJpZGU7CiAgICAgdmlydHVhbCBSZWZQdHI8V2ViUG9wdXBNZW51UHJveHk+IGNyZWF0ZVBv cHVwTWVudVByb3h5KFdlYlBhZ2VQcm94eSYpIG92ZXJyaWRlOwotICAgIHZpcnR1YWwgUmVmUHRy PFdlYkNvbnRleHRNZW51UHJveHk+IGNyZWF0ZUNvbnRleHRNZW51UHJveHkoV2ViUGFnZVByb3h5 JiwgY29uc3QgQ29udGV4dE1lbnVDb250ZXh0RGF0YSYsIGNvbnN0IFVzZXJEYXRhJikgb3ZlcnJp ZGU7CisgICAgdmlydHVhbCBzdGQ6OnVuaXF1ZV9wdHI8V2ViQ29udGV4dE1lbnVQcm94eT4gY3Jl YXRlQ29udGV4dE1lbnVQcm94eShXZWJQYWdlUHJveHkmLCBjb25zdCBDb250ZXh0TWVudUNvbnRl eHREYXRhJiwgY29uc3QgVXNlckRhdGEmKSBvdmVycmlkZTsKICNpZiBFTkFCTEUoSU5QVVRfVFlQ RV9DT0xPUikKICAgICB2aXJ0dWFsIFJlZlB0cjxXZWJDb2xvclBpY2tlcj4gY3JlYXRlQ29sb3JQ aWNrZXIoV2ViUGFnZVByb3h5KiwgY29uc3QgV2ViQ29yZTo6Q29sb3ImIGludGlhbENvbG9yLCBj b25zdCBXZWJDb3JlOjpJbnRSZWN0Jikgb3ZlcnJpZGU7CiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViQ29udGV4dE1lbnVQcm94eUd0ay5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJDb250ZXh0TWVudVByb3h5R3Rr LmNwcAkocmV2aXNpb24gMTkxNDMyKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9X ZWJDb250ZXh0TWVudVByb3h5R3RrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQxLDcgKzE0MSw3 IEBAIHZvaWQgV2ViQ29udGV4dE1lbnVQcm94eUd0azo6cG9wdWxhdGUoY28KICAgICB9CiB9CiAK LXZvaWQgV2ViQ29udGV4dE1lbnVQcm94eUd0azo6c2hvd0NvbnRleHRNZW51KCkKK3ZvaWQgV2Vi Q29udGV4dE1lbnVQcm94eUd0azo6c2hvdygpCiB7CiAgICAgVmVjdG9yPFJlZlB0cjxXZWJDb250 ZXh0TWVudUl0ZW0+PiBwcm9wb3NlZEFQSUl0ZW1zOwogICAgIGZvciAoYXV0byYgaXRlbSA6IG1f Y29udGV4dC5tZW51SXRlbXMoKSkgewpAQCAtMTczLDExICsxNzMsNiBAQCB2b2lkIFdlYkNvbnRl eHRNZW51UHJveHlHdGs6OnNob3dDb250ZXh0CiAgICAgICAgICAgICAgICAgICAgZXZlbnQgPyBl dmVudC0+YnV0dG9uLmJ1dHRvbiA6IDMsIGV2ZW50ID8gZXZlbnQtPmJ1dHRvbi50aW1lIDogR0RL X0NVUlJFTlRfVElNRSk7CiB9CiAKLXZvaWQgV2ViQ29udGV4dE1lbnVQcm94eUd0azo6aGlkZUNv bnRleHRNZW51KCkKLXsKLSAgICBndGtfbWVudV9wb3Bkb3duKG1fbWVudS5wbGF0Zm9ybURlc2Ny aXB0aW9uKCkpOwotfQotCiBXZWJDb250ZXh0TWVudVByb3h5R3RrOjpXZWJDb250ZXh0TWVudVBy b3h5R3RrKEd0a1dpZGdldCogd2ViVmlldywgV2ViUGFnZVByb3h5JiBwYWdlLCBjb25zdCBDb250 ZXh0TWVudUNvbnRleHREYXRhJiBjb250ZXh0LCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCiAg ICAgOiBXZWJDb250ZXh0TWVudVByb3h5KGNvbnRleHQsIHVzZXJEYXRhKQogICAgICwgbV93ZWJW aWV3KHdlYlZpZXcpCkBAIC0xODgsNyArMTgzLDYgQEAgV2ViQ29udGV4dE1lbnVQcm94eUd0azo6 V2ViQ29udGV4dE1lbnVQcgogCiBXZWJDb250ZXh0TWVudVByb3h5R3RrOjp+V2ViQ29udGV4dE1l bnVQcm94eUd0aygpCiB7Ci0gICAgY2FuY2VsVHJhY2tpbmcoKTsKIH0KIAogdm9pZCBXZWJDb250 ZXh0TWVudVByb3h5R3RrOjptZW51UG9zaXRpb25GdW5jdGlvbihHdGtNZW51KiBtZW51LCBnaW50 KiB4LCBnaW50KiB5LCBnYm9vbGVhbiogcHVzaEluLCBXZWJDb250ZXh0TWVudVByb3h5R3RrKiBw b3B1cE1lbnUpCkBAIC0yMDgsMTUgKzIwMiw1IEBAIHZvaWQgV2ViQ29udGV4dE1lbnVQcm94eUd0 azo6bWVudVBvc2l0aW8KICAgICAqcHVzaEluID0gRkFMU0U7CiB9CiAKLXZvaWQgV2ViQ29udGV4 dE1lbnVQcm94eUd0azo6Y2FuY2VsVHJhY2tpbmcoKQotewotICAgIGZvciAoYXV0byBpdGVyID0g bV9zaWduYWxIYW5kbGVycy5iZWdpbigpOyBpdGVyICE9IG1fc2lnbmFsSGFuZGxlcnMuZW5kKCk7 ICsraXRlcikKLSAgICAgICAgZ19zaWduYWxfaGFuZGxlcl9kaXNjb25uZWN0KGl0ZXItPnZhbHVl LCBpdGVyLT5rZXkpOwotICAgIG1fc2lnbmFsSGFuZGxlcnMuY2xlYXIoKTsKLQotICAgIHdlYmtp dFdlYlZpZXdCYXNlU2V0QWN0aXZlQ29udGV4dE1lbnVQcm94eShXRUJLSVRfV0VCX1ZJRVdfQkFT RShtX3dlYlZpZXcpLCBudWxscHRyKTsKLSAgICBtX21lbnUuc2V0UGxhdGZvcm1EZXNjcmlwdGlv bihudWxscHRyKTsKLX0KLQogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAjZW5kaWYgLy8gRU5BQkxF KENPTlRFWFRfTUVOVVMpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYkNv bnRleHRNZW51UHJveHlHdGsuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvZ3RrL1dlYkNvbnRleHRNZW51UHJveHlHdGsuaAkocmV2aXNpb24gMTkxNDMyKQorKysgU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJDb250ZXh0TWVudVByb3h5R3RrLmgJKHdvcmtp bmcgY29weSkKQEAgLTQxLDIyICs0MSwxNCBAQCBjbGFzcyBXZWJQYWdlUHJveHk7CiAKIGNsYXNz IFdlYkNvbnRleHRNZW51UHJveHlHdGsgOiBwdWJsaWMgV2ViQ29udGV4dE1lbnVQcm94eSB7CiBw dWJsaWM6Ci0gICAgc3RhdGljIFJlZjxXZWJDb250ZXh0TWVudVByb3h5R3RrPiBjcmVhdGUoR3Rr V2lkZ2V0KiB3ZWJWaWV3LCBXZWJQYWdlUHJveHkmIHBhZ2UsIGNvbnN0IENvbnRleHRNZW51Q29u dGV4dERhdGEmIGNvbnRleHQsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKLSAgICB7Ci0gICAg ICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFdlYkNvbnRleHRNZW51UHJveHlHdGsod2ViVmlldywg cGFnZSwgY29udGV4dCwgdXNlckRhdGEpKTsKLSAgICB9CisgICAgV2ViQ29udGV4dE1lbnVQcm94 eUd0ayhHdGtXaWRnZXQqLCBXZWJQYWdlUHJveHkmLCBjb25zdCBDb250ZXh0TWVudUNvbnRleHRE YXRhJiwgY29uc3QgVXNlckRhdGEmKTsKICAgICB+V2ViQ29udGV4dE1lbnVQcm94eUd0aygpOwog Ci0gICAgdmlydHVhbCB2b2lkIHNob3dDb250ZXh0TWVudSgpIG92ZXJyaWRlOwotICAgIHZpcnR1 YWwgdm9pZCBoaWRlQ29udGV4dE1lbnUoKSBvdmVycmlkZTsKLSAgICB2aXJ0dWFsIHZvaWQgY2Fu Y2VsVHJhY2tpbmcoKSBvdmVycmlkZTsKLQogICAgIHZvaWQgcG9wdWxhdGUoVmVjdG9yPFdlYkNv cmU6OkNvbnRleHRNZW51SXRlbT4mKTsKICAgICBHdGtNZW51KiBndGtNZW51KCkgY29uc3QgeyBy ZXR1cm4gbV9tZW51LnBsYXRmb3JtRGVzY3JpcHRpb24oKTsgfQogCiBwcml2YXRlOgotICAgIFdl YkNvbnRleHRNZW51UHJveHlHdGsoR3RrV2lkZ2V0KiwgV2ViUGFnZVByb3h5JiwgY29uc3QgQ29u dGV4dE1lbnVDb250ZXh0RGF0YSYsIGNvbnN0IFVzZXJEYXRhJik7Ci0KKyAgICB2aXJ0dWFsIHZv aWQgc2hvdygpIG92ZXJyaWRlOwogICAgIHZvaWQgYXBwZW5kKFdlYkNvcmU6OkNvbnRleHRNZW51 SXRlbSYpOwogICAgIHZvaWQgcG9wdWxhdGUoY29uc3QgVmVjdG9yPFJlZlB0cjxXZWJDb250ZXh0 TWVudUl0ZW0+PiYpOwogICAgIHN0YXRpYyB2b2lkIG1lbnVQb3NpdGlvbkZ1bmN0aW9uKEd0a01l bnUqLCBnaW50KiwgZ2ludCosIGdib29sZWFuKiwgV2ViQ29udGV4dE1lbnVQcm94eUd0ayopOwo= 263799 2015-10-22 00:18:13 -0700 2015-10-22 00:40:29 -0700 Patch bug-150435-20151022161727.patch text/plain 6983 hs85.jeong SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5MTQzMikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDE1LTEwLTIxICBIdW5zZW9w IEplb25nICA8aHM4NS5qZW9uZ0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbR1RLXSBUcnkgdG8g Zml4IHRoZSBidWlsZCBhZnRlciByMTkxNDAyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUwNDM1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5j cHA6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpjcmVhdGVQb3B1cE1lbnVQcm94 eSk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpjcmVhdGVDb250ZXh0TWVudVBy b3h5KToKKyAgICAgICAgKFdlYktpdDo6UGFnZUNsaWVudEltcGw6OmNyZWF0ZUNvbG9yUGlja2Vy KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5oOgorICAgICAg ICAqIFVJUHJvY2Vzcy9ndGsvV2ViQ29udGV4dE1lbnVQcm94eUd0ay5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYkNvbnRleHRNZW51UHJveHlHdGs6OnBvcHVsYXRlKToKKyAgICAgICAgKFdlYktp dDo6V2ViQ29udGV4dE1lbnVQcm94eUd0azo6c2hvdyk6CisgICAgICAgIChXZWJLaXQ6OldlYkNv bnRleHRNZW51UHJveHlHdGs6OldlYkNvbnRleHRNZW51UHJveHlHdGspOgorICAgICAgICAoV2Vi S2l0OjpXZWJDb250ZXh0TWVudVByb3h5R3RrOjp+V2ViQ29udGV4dE1lbnVQcm94eUd0ayk6Cisg ICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHRNZW51UHJveHlHdGs6Om1lbnVQb3NpdGlvbkZ1bmN0 aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dE1lbnVQcm94eUd0azo6c2hvd0NvbnRl eHRNZW51KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dE1lbnVQcm94eUd0 azo6aGlkZUNvbnRleHRNZW51KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4 dE1lbnVQcm94eUd0azo6Y2FuY2VsVHJhY2tpbmcpOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJv Y2Vzcy9ndGsvV2ViQ29udGV4dE1lbnVQcm94eUd0ay5oOgorICAgICAgICAoV2ViS2l0OjpXZWJD b250ZXh0TWVudVByb3h5R3RrOjpndGtNZW51KToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4 dE1lbnVQcm94eUd0azo6Y3JlYXRlKTogRGVsZXRlZC4KKwogMjAxNS0xMC0yMSAgR3l1eW91bmcg S2ltICA8Z3l1eW91bmcua2ltQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW0VGTF1bR1RLXVtXSzJd IEZpeCBidWlsZCBicmVhayBzaW5jZSByMTkxNDAyLCByMTkxNDAxCkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuY3BwCShyZXZp c2lvbiAxOTE0MzIpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xp ZW50SW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxMSw5ICsyMTEsOSBAQCBSZWZQdHI8V2Vi UG9wdXBNZW51UHJveHk+IFBhZ2VDbGllbnRJbXBsCiAgICAgcmV0dXJuIFdlYlBvcHVwTWVudVBy b3h5R3RrOjpjcmVhdGUobV92aWV3V2lkZ2V0LCBwYWdlKTsKIH0KIAotUmVmUHRyPFdlYkNvbnRl eHRNZW51UHJveHk+IFBhZ2VDbGllbnRJbXBsOjpjcmVhdGVDb250ZXh0TWVudVByb3h5KFdlYlBh Z2VQcm94eSYgcGFnZSwgY29uc3QgQ29udGV4dE1lbnVDb250ZXh0RGF0YSYgY29udGV4dCwgY29u c3QgVXNlckRhdGEmIHVzZXJEYXRhKQorc3RkOjp1bmlxdWVfcHRyPFdlYkNvbnRleHRNZW51UHJv eHk+IFBhZ2VDbGllbnRJbXBsOjpjcmVhdGVDb250ZXh0TWVudVByb3h5KFdlYlBhZ2VQcm94eSYg cGFnZSwgY29uc3QgQ29udGV4dE1lbnVDb250ZXh0RGF0YSYgY29udGV4dCwgY29uc3QgVXNlckRh dGEmIHVzZXJEYXRhKQogewotICAgIHJldHVybiBXZWJDb250ZXh0TWVudVByb3h5R3RrOjpjcmVh dGUobV92aWV3V2lkZ2V0LCBwYWdlLCBjb250ZXh0LCB1c2VyRGF0YSk7CisgICAgcmV0dXJuIHN0 ZDo6bWFrZV91bmlxdWU8V2ViQ29udGV4dE1lbnVQcm94eUd0az4obV92aWV3V2lkZ2V0LCBwYWdl LCBjb250ZXh0LCB1c2VyRGF0YSk7CiB9CiAKIFJlZlB0cjxXZWJDb2xvclBpY2tlcj4gUGFnZUNs aWVudEltcGw6OmNyZWF0ZUNvbG9yUGlja2VyKFdlYlBhZ2VQcm94eSogcGFnZSwgY29uc3QgV2Vi Q29yZTo6Q29sb3ImIGNvbG9yLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiByZWN0KQpJbmRleDog U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5o CShyZXZpc2lvbiAxOTE0MzIpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9Q YWdlQ2xpZW50SW1wbC5oCSh3b3JraW5nIGNvcHkpCkBAIC04Myw3ICs4Myw3IEBAIHByaXZhdGU6 CiAgICAgdmlydHVhbCBXZWJDb3JlOjpJbnRSZWN0IHJvb3RWaWV3VG9TY3JlZW4oY29uc3QgV2Vi Q29yZTo6SW50UmVjdCYpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBkb25lV2l0aEtleUV2 ZW50KGNvbnN0IE5hdGl2ZVdlYktleWJvYXJkRXZlbnQmLCBib29sIHdhc0V2ZW50SGFuZGxlZCkg b3ZlcnJpZGU7CiAgICAgdmlydHVhbCBSZWZQdHI8V2ViUG9wdXBNZW51UHJveHk+IGNyZWF0ZVBv cHVwTWVudVByb3h5KFdlYlBhZ2VQcm94eSYpIG92ZXJyaWRlOwotICAgIHZpcnR1YWwgUmVmUHRy PFdlYkNvbnRleHRNZW51UHJveHk+IGNyZWF0ZUNvbnRleHRNZW51UHJveHkoV2ViUGFnZVByb3h5 JiwgY29uc3QgQ29udGV4dE1lbnVDb250ZXh0RGF0YSYsIGNvbnN0IFVzZXJEYXRhJikgb3ZlcnJp ZGU7CisgICAgdmlydHVhbCBzdGQ6OnVuaXF1ZV9wdHI8V2ViQ29udGV4dE1lbnVQcm94eT4gY3Jl YXRlQ29udGV4dE1lbnVQcm94eShXZWJQYWdlUHJveHkmLCBjb25zdCBDb250ZXh0TWVudUNvbnRl eHREYXRhJiwgY29uc3QgVXNlckRhdGEmKSBvdmVycmlkZTsKICNpZiBFTkFCTEUoSU5QVVRfVFlQ RV9DT0xPUikKICAgICB2aXJ0dWFsIFJlZlB0cjxXZWJDb2xvclBpY2tlcj4gY3JlYXRlQ29sb3JQ aWNrZXIoV2ViUGFnZVByb3h5KiwgY29uc3QgV2ViQ29yZTo6Q29sb3ImIGludGlhbENvbG9yLCBj b25zdCBXZWJDb3JlOjpJbnRSZWN0Jikgb3ZlcnJpZGU7CiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViQ29udGV4dE1lbnVQcm94eUd0ay5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJDb250ZXh0TWVudVByb3h5R3Rr LmNwcAkocmV2aXNpb24gMTkxNDMyKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9X ZWJDb250ZXh0TWVudVByb3h5R3RrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQxLDcgKzE0MSw3 IEBAIHZvaWQgV2ViQ29udGV4dE1lbnVQcm94eUd0azo6cG9wdWxhdGUoY28KICAgICB9CiB9CiAK LXZvaWQgV2ViQ29udGV4dE1lbnVQcm94eUd0azo6c2hvd0NvbnRleHRNZW51KCkKK3ZvaWQgV2Vi Q29udGV4dE1lbnVQcm94eUd0azo6c2hvdygpCiB7CiAgICAgVmVjdG9yPFJlZlB0cjxXZWJDb250 ZXh0TWVudUl0ZW0+PiBwcm9wb3NlZEFQSUl0ZW1zOwogICAgIGZvciAoYXV0byYgaXRlbSA6IG1f Y29udGV4dC5tZW51SXRlbXMoKSkgewpAQCAtMTczLDExICsxNzMsNiBAQCB2b2lkIFdlYkNvbnRl eHRNZW51UHJveHlHdGs6OnNob3dDb250ZXh0CiAgICAgICAgICAgICAgICAgICAgZXZlbnQgPyBl dmVudC0+YnV0dG9uLmJ1dHRvbiA6IDMsIGV2ZW50ID8gZXZlbnQtPmJ1dHRvbi50aW1lIDogR0RL X0NVUlJFTlRfVElNRSk7CiB9CiAKLXZvaWQgV2ViQ29udGV4dE1lbnVQcm94eUd0azo6aGlkZUNv bnRleHRNZW51KCkKLXsKLSAgICBndGtfbWVudV9wb3Bkb3duKG1fbWVudS5wbGF0Zm9ybURlc2Ny aXB0aW9uKCkpOwotfQotCiBXZWJDb250ZXh0TWVudVByb3h5R3RrOjpXZWJDb250ZXh0TWVudVBy b3h5R3RrKEd0a1dpZGdldCogd2ViVmlldywgV2ViUGFnZVByb3h5JiBwYWdlLCBjb25zdCBDb250 ZXh0TWVudUNvbnRleHREYXRhJiBjb250ZXh0LCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCiAg ICAgOiBXZWJDb250ZXh0TWVudVByb3h5KGNvbnRleHQsIHVzZXJEYXRhKQogICAgICwgbV93ZWJW aWV3KHdlYlZpZXcpCkBAIC0xODgsNyArMTgzLDggQEAgV2ViQ29udGV4dE1lbnVQcm94eUd0azo6 V2ViQ29udGV4dE1lbnVQcgogCiBXZWJDb250ZXh0TWVudVByb3h5R3RrOjp+V2ViQ29udGV4dE1l bnVQcm94eUd0aygpCiB7Ci0gICAgY2FuY2VsVHJhY2tpbmcoKTsKKyAgICBndGtfbWVudV9wb3Bk b3duKG1fbWVudS5wbGF0Zm9ybURlc2NyaXB0aW9uKCkpOworICAgIHdlYmtpdFdlYlZpZXdCYXNl U2V0QWN0aXZlQ29udGV4dE1lbnVQcm94eShXRUJLSVRfV0VCX1ZJRVdfQkFTRShtX3dlYlZpZXcp LCBudWxscHRyKTsKIH0KIAogdm9pZCBXZWJDb250ZXh0TWVudVByb3h5R3RrOjptZW51UG9zaXRp b25GdW5jdGlvbihHdGtNZW51KiBtZW51LCBnaW50KiB4LCBnaW50KiB5LCBnYm9vbGVhbiogcHVz aEluLCBXZWJDb250ZXh0TWVudVByb3h5R3RrKiBwb3B1cE1lbnUpCkBAIC0yMDgsMTUgKzIwNCw1 IEBAIHZvaWQgV2ViQ29udGV4dE1lbnVQcm94eUd0azo6bWVudVBvc2l0aW8KICAgICAqcHVzaElu ID0gRkFMU0U7CiB9CiAKLXZvaWQgV2ViQ29udGV4dE1lbnVQcm94eUd0azo6Y2FuY2VsVHJhY2tp bmcoKQotewotICAgIGZvciAoYXV0byBpdGVyID0gbV9zaWduYWxIYW5kbGVycy5iZWdpbigpOyBp dGVyICE9IG1fc2lnbmFsSGFuZGxlcnMuZW5kKCk7ICsraXRlcikKLSAgICAgICAgZ19zaWduYWxf aGFuZGxlcl9kaXNjb25uZWN0KGl0ZXItPnZhbHVlLCBpdGVyLT5rZXkpOwotICAgIG1fc2lnbmFs SGFuZGxlcnMuY2xlYXIoKTsKLQotICAgIHdlYmtpdFdlYlZpZXdCYXNlU2V0QWN0aXZlQ29udGV4 dE1lbnVQcm94eShXRUJLSVRfV0VCX1ZJRVdfQkFTRShtX3dlYlZpZXcpLCBudWxscHRyKTsKLSAg ICBtX21lbnUuc2V0UGxhdGZvcm1EZXNjcmlwdGlvbihudWxscHRyKTsKLX0KLQogfSAvLyBuYW1l c3BhY2UgV2ViS2l0CiAjZW5kaWYgLy8gRU5BQkxFKENPTlRFWFRfTUVOVVMpCkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYkNvbnRleHRNZW51UHJveHlHdGsuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYkNvbnRleHRNZW51UHJveHlH dGsuaAkocmV2aXNpb24gMTkxNDMyKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9X ZWJDb250ZXh0TWVudVByb3h5R3RrLmgJKHdvcmtpbmcgY29weSkKQEAgLTQxLDIyICs0MSwxNCBA QCBjbGFzcyBXZWJQYWdlUHJveHk7CiAKIGNsYXNzIFdlYkNvbnRleHRNZW51UHJveHlHdGsgOiBw dWJsaWMgV2ViQ29udGV4dE1lbnVQcm94eSB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFJlZjxXZWJD b250ZXh0TWVudVByb3h5R3RrPiBjcmVhdGUoR3RrV2lkZ2V0KiB3ZWJWaWV3LCBXZWJQYWdlUHJv eHkmIHBhZ2UsIGNvbnN0IENvbnRleHRNZW51Q29udGV4dERhdGEmIGNvbnRleHQsIGNvbnN0IFVz ZXJEYXRhJiB1c2VyRGF0YSkKLSAgICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFdl YkNvbnRleHRNZW51UHJveHlHdGsod2ViVmlldywgcGFnZSwgY29udGV4dCwgdXNlckRhdGEpKTsK LSAgICB9CisgICAgV2ViQ29udGV4dE1lbnVQcm94eUd0ayhHdGtXaWRnZXQqLCBXZWJQYWdlUHJv eHkmLCBjb25zdCBDb250ZXh0TWVudUNvbnRleHREYXRhJiwgY29uc3QgVXNlckRhdGEmKTsKICAg ICB+V2ViQ29udGV4dE1lbnVQcm94eUd0aygpOwogCi0gICAgdmlydHVhbCB2b2lkIHNob3dDb250 ZXh0TWVudSgpIG92ZXJyaWRlOwotICAgIHZpcnR1YWwgdm9pZCBoaWRlQ29udGV4dE1lbnUoKSBv dmVycmlkZTsKLSAgICB2aXJ0dWFsIHZvaWQgY2FuY2VsVHJhY2tpbmcoKSBvdmVycmlkZTsKLQog ICAgIHZvaWQgcG9wdWxhdGUoVmVjdG9yPFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbT4mKTsKICAg ICBHdGtNZW51KiBndGtNZW51KCkgY29uc3QgeyByZXR1cm4gbV9tZW51LnBsYXRmb3JtRGVzY3Jp cHRpb24oKTsgfQogCiBwcml2YXRlOgotICAgIFdlYkNvbnRleHRNZW51UHJveHlHdGsoR3RrV2lk Z2V0KiwgV2ViUGFnZVByb3h5JiwgY29uc3QgQ29udGV4dE1lbnVDb250ZXh0RGF0YSYsIGNvbnN0 IFVzZXJEYXRhJik7Ci0KKyAgICB2aXJ0dWFsIHZvaWQgc2hvdygpIG92ZXJyaWRlOwogICAgIHZv aWQgYXBwZW5kKFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbSYpOwogICAgIHZvaWQgcG9wdWxhdGUo Y29uc3QgVmVjdG9yPFJlZlB0cjxXZWJDb250ZXh0TWVudUl0ZW0+PiYpOwogICAgIHN0YXRpYyB2 b2lkIG1lbnVQb3NpdGlvbkZ1bmN0aW9uKEd0a01lbnUqLCBnaW50KiwgZ2ludCosIGdib29sZWFu KiwgV2ViQ29udGV4dE1lbnVQcm94eUd0ayopOwo= 263804 2015-10-22 00:40:38 -0700 2015-10-22 01:10:28 -0700 Patch bug-150435-20151022163952.patch text/plain 7174 hs85.jeong SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5MTQzMikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDE1LTEwLTIxICBIdW5zZW9w IEplb25nICA8aHM4NS5qZW9uZ0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbR1RLXSBUcnkgdG8g Zml4IHRoZSBidWlsZCBhZnRlciByMTkxNDAyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUwNDM1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5j cHA6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpjcmVhdGVQb3B1cE1lbnVQcm94 eSk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpjcmVhdGVDb250ZXh0TWVudVBy b3h5KToKKyAgICAgICAgKFdlYktpdDo6UGFnZUNsaWVudEltcGw6OmNyZWF0ZUNvbG9yUGlja2Vy KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5oOgorICAgICAg ICAqIFVJUHJvY2Vzcy9ndGsvV2ViQ29udGV4dE1lbnVQcm94eUd0ay5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYkNvbnRleHRNZW51UHJveHlHdGs6OnBvcHVsYXRlKToKKyAgICAgICAgKFdlYktp dDo6V2ViQ29udGV4dE1lbnVQcm94eUd0azo6c2hvdyk6CisgICAgICAgIChXZWJLaXQ6OldlYkNv bnRleHRNZW51UHJveHlHdGs6OldlYkNvbnRleHRNZW51UHJveHlHdGspOgorICAgICAgICAoV2Vi S2l0OjpXZWJDb250ZXh0TWVudVByb3h5R3RrOjp+V2ViQ29udGV4dE1lbnVQcm94eUd0ayk6Cisg ICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHRNZW51UHJveHlHdGs6Om1lbnVQb3NpdGlvbkZ1bmN0 aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dE1lbnVQcm94eUd0azo6c2hvd0NvbnRl eHRNZW51KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dE1lbnVQcm94eUd0 azo6aGlkZUNvbnRleHRNZW51KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4 dE1lbnVQcm94eUd0azo6Y2FuY2VsVHJhY2tpbmcpOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJv Y2Vzcy9ndGsvV2ViQ29udGV4dE1lbnVQcm94eUd0ay5oOgorICAgICAgICAoV2ViS2l0OjpXZWJD b250ZXh0TWVudVByb3h5R3RrOjpndGtNZW51KToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4 dE1lbnVQcm94eUd0azo6Y3JlYXRlKTogRGVsZXRlZC4KKwogMjAxNS0xMC0yMSAgR3l1eW91bmcg S2ltICA8Z3l1eW91bmcua2ltQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW0VGTF1bR1RLXVtXSzJd IEZpeCBidWlsZCBicmVhayBzaW5jZSByMTkxNDAyLCByMTkxNDAxCkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuY3BwCShyZXZp c2lvbiAxOTE0MzIpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xp ZW50SW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxMSw5ICsyMTEsOSBAQCBSZWZQdHI8V2Vi UG9wdXBNZW51UHJveHk+IFBhZ2VDbGllbnRJbXBsCiAgICAgcmV0dXJuIFdlYlBvcHVwTWVudVBy b3h5R3RrOjpjcmVhdGUobV92aWV3V2lkZ2V0LCBwYWdlKTsKIH0KIAotUmVmUHRyPFdlYkNvbnRl eHRNZW51UHJveHk+IFBhZ2VDbGllbnRJbXBsOjpjcmVhdGVDb250ZXh0TWVudVByb3h5KFdlYlBh Z2VQcm94eSYgcGFnZSwgY29uc3QgQ29udGV4dE1lbnVDb250ZXh0RGF0YSYgY29udGV4dCwgY29u c3QgVXNlckRhdGEmIHVzZXJEYXRhKQorc3RkOjp1bmlxdWVfcHRyPFdlYkNvbnRleHRNZW51UHJv eHk+IFBhZ2VDbGllbnRJbXBsOjpjcmVhdGVDb250ZXh0TWVudVByb3h5KFdlYlBhZ2VQcm94eSYg cGFnZSwgY29uc3QgQ29udGV4dE1lbnVDb250ZXh0RGF0YSYgY29udGV4dCwgY29uc3QgVXNlckRh dGEmIHVzZXJEYXRhKQogewotICAgIHJldHVybiBXZWJDb250ZXh0TWVudVByb3h5R3RrOjpjcmVh dGUobV92aWV3V2lkZ2V0LCBwYWdlLCBjb250ZXh0LCB1c2VyRGF0YSk7CisgICAgcmV0dXJuIHN0 ZDo6bWFrZV91bmlxdWU8V2ViQ29udGV4dE1lbnVQcm94eUd0az4obV92aWV3V2lkZ2V0LCBwYWdl LCBjb250ZXh0LCB1c2VyRGF0YSk7CiB9CiAKIFJlZlB0cjxXZWJDb2xvclBpY2tlcj4gUGFnZUNs aWVudEltcGw6OmNyZWF0ZUNvbG9yUGlja2VyKFdlYlBhZ2VQcm94eSogcGFnZSwgY29uc3QgV2Vi Q29yZTo6Q29sb3ImIGNvbG9yLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiByZWN0KQpJbmRleDog U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5o CShyZXZpc2lvbiAxOTE0MzIpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9Q YWdlQ2xpZW50SW1wbC5oCSh3b3JraW5nIGNvcHkpCkBAIC04Myw3ICs4Myw3IEBAIHByaXZhdGU6 CiAgICAgdmlydHVhbCBXZWJDb3JlOjpJbnRSZWN0IHJvb3RWaWV3VG9TY3JlZW4oY29uc3QgV2Vi Q29yZTo6SW50UmVjdCYpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBkb25lV2l0aEtleUV2 ZW50KGNvbnN0IE5hdGl2ZVdlYktleWJvYXJkRXZlbnQmLCBib29sIHdhc0V2ZW50SGFuZGxlZCkg b3ZlcnJpZGU7CiAgICAgdmlydHVhbCBSZWZQdHI8V2ViUG9wdXBNZW51UHJveHk+IGNyZWF0ZVBv cHVwTWVudVByb3h5KFdlYlBhZ2VQcm94eSYpIG92ZXJyaWRlOwotICAgIHZpcnR1YWwgUmVmUHRy PFdlYkNvbnRleHRNZW51UHJveHk+IGNyZWF0ZUNvbnRleHRNZW51UHJveHkoV2ViUGFnZVByb3h5 JiwgY29uc3QgQ29udGV4dE1lbnVDb250ZXh0RGF0YSYsIGNvbnN0IFVzZXJEYXRhJikgb3ZlcnJp ZGU7CisgICAgdmlydHVhbCBzdGQ6OnVuaXF1ZV9wdHI8V2ViQ29udGV4dE1lbnVQcm94eT4gY3Jl YXRlQ29udGV4dE1lbnVQcm94eShXZWJQYWdlUHJveHkmLCBjb25zdCBDb250ZXh0TWVudUNvbnRl eHREYXRhJiwgY29uc3QgVXNlckRhdGEmKSBvdmVycmlkZTsKICNpZiBFTkFCTEUoSU5QVVRfVFlQ RV9DT0xPUikKICAgICB2aXJ0dWFsIFJlZlB0cjxXZWJDb2xvclBpY2tlcj4gY3JlYXRlQ29sb3JQ aWNrZXIoV2ViUGFnZVByb3h5KiwgY29uc3QgV2ViQ29yZTo6Q29sb3ImIGludGlhbENvbG9yLCBj b25zdCBXZWJDb3JlOjpJbnRSZWN0Jikgb3ZlcnJpZGU7CiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViQ29udGV4dE1lbnVQcm94eUd0ay5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJDb250ZXh0TWVudVByb3h5R3Rr LmNwcAkocmV2aXNpb24gMTkxNDMyKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9X ZWJDb250ZXh0TWVudVByb3h5R3RrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQxLDcgKzE0MSw3 IEBAIHZvaWQgV2ViQ29udGV4dE1lbnVQcm94eUd0azo6cG9wdWxhdGUoY28KICAgICB9CiB9CiAK LXZvaWQgV2ViQ29udGV4dE1lbnVQcm94eUd0azo6c2hvd0NvbnRleHRNZW51KCkKK3ZvaWQgV2Vi Q29udGV4dE1lbnVQcm94eUd0azo6c2hvdygpCiB7CiAgICAgVmVjdG9yPFJlZlB0cjxXZWJDb250 ZXh0TWVudUl0ZW0+PiBwcm9wb3NlZEFQSUl0ZW1zOwogICAgIGZvciAoYXV0byYgaXRlbSA6IG1f Y29udGV4dC5tZW51SXRlbXMoKSkgewpAQCAtMTczLDExICsxNzMsNiBAQCB2b2lkIFdlYkNvbnRl eHRNZW51UHJveHlHdGs6OnNob3dDb250ZXh0CiAgICAgICAgICAgICAgICAgICAgZXZlbnQgPyBl dmVudC0+YnV0dG9uLmJ1dHRvbiA6IDMsIGV2ZW50ID8gZXZlbnQtPmJ1dHRvbi50aW1lIDogR0RL X0NVUlJFTlRfVElNRSk7CiB9CiAKLXZvaWQgV2ViQ29udGV4dE1lbnVQcm94eUd0azo6aGlkZUNv bnRleHRNZW51KCkKLXsKLSAgICBndGtfbWVudV9wb3Bkb3duKG1fbWVudS5wbGF0Zm9ybURlc2Ny aXB0aW9uKCkpOwotfQotCiBXZWJDb250ZXh0TWVudVByb3h5R3RrOjpXZWJDb250ZXh0TWVudVBy b3h5R3RrKEd0a1dpZGdldCogd2ViVmlldywgV2ViUGFnZVByb3h5JiBwYWdlLCBjb25zdCBDb250 ZXh0TWVudUNvbnRleHREYXRhJiBjb250ZXh0LCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCiAg ICAgOiBXZWJDb250ZXh0TWVudVByb3h5KGNvbnRleHQsIHVzZXJEYXRhKQogICAgICwgbV93ZWJW aWV3KHdlYlZpZXcpCkBAIC0xODgsNyArMTgzLDE0IEBAIFdlYkNvbnRleHRNZW51UHJveHlHdGs6 OldlYkNvbnRleHRNZW51UHIKIAogV2ViQ29udGV4dE1lbnVQcm94eUd0azo6fldlYkNvbnRleHRN ZW51UHJveHlHdGsoKQogewotICAgIGNhbmNlbFRyYWNraW5nKCk7CisgICAgZ3RrX21lbnVfcG9w ZG93bihtX21lbnUucGxhdGZvcm1EZXNjcmlwdGlvbigpKTsKKworICAgIGZvciAoYXV0byYgaGFu ZGxlciA6IG1fc2lnbmFsSGFuZGxlcnMpCisgICAgICAgIGdfc2lnbmFsX2hhbmRsZXJfZGlzY29u bmVjdChoYW5kbGVyLnZhbHVlLCBoYW5kbGVyLmtleSk7CisgICAgbV9zaWduYWxIYW5kbGVycy5j bGVhcigpOworCisgICAgd2Via2l0V2ViVmlld0Jhc2VTZXRBY3RpdmVDb250ZXh0TWVudVByb3h5 KFdFQktJVF9XRUJfVklFV19CQVNFKG1fd2ViVmlldyksIG51bGxwdHIpOworICAgIG1fbWVudS5z ZXRQbGF0Zm9ybURlc2NyaXB0aW9uKG51bGxwdHIpOwogfQogCiB2b2lkIFdlYkNvbnRleHRNZW51 UHJveHlHdGs6Om1lbnVQb3NpdGlvbkZ1bmN0aW9uKEd0a01lbnUqIG1lbnUsIGdpbnQqIHgsIGdp bnQqIHksIGdib29sZWFuKiBwdXNoSW4sIFdlYkNvbnRleHRNZW51UHJveHlHdGsqIHBvcHVwTWVu dSkKQEAgLTIwOCwxNSArMjEwLDUgQEAgdm9pZCBXZWJDb250ZXh0TWVudVByb3h5R3RrOjptZW51 UG9zaXRpbwogICAgICpwdXNoSW4gPSBGQUxTRTsKIH0KIAotdm9pZCBXZWJDb250ZXh0TWVudVBy b3h5R3RrOjpjYW5jZWxUcmFja2luZygpCi17Ci0gICAgZm9yIChhdXRvIGl0ZXIgPSBtX3NpZ25h bEhhbmRsZXJzLmJlZ2luKCk7IGl0ZXIgIT0gbV9zaWduYWxIYW5kbGVycy5lbmQoKTsgKytpdGVy KQotICAgICAgICBnX3NpZ25hbF9oYW5kbGVyX2Rpc2Nvbm5lY3QoaXRlci0+dmFsdWUsIGl0ZXIt PmtleSk7Ci0gICAgbV9zaWduYWxIYW5kbGVycy5jbGVhcigpOwotCi0gICAgd2Via2l0V2ViVmll d0Jhc2VTZXRBY3RpdmVDb250ZXh0TWVudVByb3h5KFdFQktJVF9XRUJfVklFV19CQVNFKG1fd2Vi VmlldyksIG51bGxwdHIpOwotICAgIG1fbWVudS5zZXRQbGF0Zm9ybURlc2NyaXB0aW9uKG51bGxw dHIpOwotfQotCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKICNlbmRpZiAvLyBFTkFCTEUoQ09OVEVY VF9NRU5VUykKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViQ29udGV4dE1l bnVQcm94eUd0ay5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsv V2ViQ29udGV4dE1lbnVQcm94eUd0ay5oCShyZXZpc2lvbiAxOTE0MzIpCisrKyBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYkNvbnRleHRNZW51UHJveHlHdGsuaAkod29ya2luZyBjb3B5 KQpAQCAtNDEsMjIgKzQxLDE0IEBAIGNsYXNzIFdlYlBhZ2VQcm94eTsKIAogY2xhc3MgV2ViQ29u dGV4dE1lbnVQcm94eUd0ayA6IHB1YmxpYyBXZWJDb250ZXh0TWVudVByb3h5IHsKIHB1YmxpYzoK LSAgICBzdGF0aWMgUmVmPFdlYkNvbnRleHRNZW51UHJveHlHdGs+IGNyZWF0ZShHdGtXaWRnZXQq IHdlYlZpZXcsIFdlYlBhZ2VQcm94eSYgcGFnZSwgY29uc3QgQ29udGV4dE1lbnVDb250ZXh0RGF0 YSYgY29udGV4dCwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQotICAgIHsKLSAgICAgICAgcmV0 dXJuIGFkb3B0UmVmKCpuZXcgV2ViQ29udGV4dE1lbnVQcm94eUd0ayh3ZWJWaWV3LCBwYWdlLCBj b250ZXh0LCB1c2VyRGF0YSkpOwotICAgIH0KKyAgICBXZWJDb250ZXh0TWVudVByb3h5R3RrKEd0 a1dpZGdldCosIFdlYlBhZ2VQcm94eSYsIGNvbnN0IENvbnRleHRNZW51Q29udGV4dERhdGEmLCBj b25zdCBVc2VyRGF0YSYpOwogICAgIH5XZWJDb250ZXh0TWVudVByb3h5R3RrKCk7CiAKLSAgICB2 aXJ0dWFsIHZvaWQgc2hvd0NvbnRleHRNZW51KCkgb3ZlcnJpZGU7Ci0gICAgdmlydHVhbCB2b2lk IGhpZGVDb250ZXh0TWVudSgpIG92ZXJyaWRlOwotICAgIHZpcnR1YWwgdm9pZCBjYW5jZWxUcmFj a2luZygpIG92ZXJyaWRlOwotCiAgICAgdm9pZCBwb3B1bGF0ZShWZWN0b3I8V2ViQ29yZTo6Q29u dGV4dE1lbnVJdGVtPiYpOwogICAgIEd0a01lbnUqIGd0a01lbnUoKSBjb25zdCB7IHJldHVybiBt X21lbnUucGxhdGZvcm1EZXNjcmlwdGlvbigpOyB9CiAKIHByaXZhdGU6Ci0gICAgV2ViQ29udGV4 dE1lbnVQcm94eUd0ayhHdGtXaWRnZXQqLCBXZWJQYWdlUHJveHkmLCBjb25zdCBDb250ZXh0TWVu dUNvbnRleHREYXRhJiwgY29uc3QgVXNlckRhdGEmKTsKLQorICAgIHZpcnR1YWwgdm9pZCBzaG93 KCkgb3ZlcnJpZGU7CiAgICAgdm9pZCBhcHBlbmQoV2ViQ29yZTo6Q29udGV4dE1lbnVJdGVtJik7 CiAgICAgdm9pZCBwb3B1bGF0ZShjb25zdCBWZWN0b3I8UmVmUHRyPFdlYkNvbnRleHRNZW51SXRl bT4+Jik7CiAgICAgc3RhdGljIHZvaWQgbWVudVBvc2l0aW9uRnVuY3Rpb24oR3RrTWVudSosIGdp bnQqLCBnaW50KiwgZ2Jvb2xlYW4qLCBXZWJDb250ZXh0TWVudVByb3h5R3RrKik7Cg==