150222 2015-10-15 21:38:58 -0700 [GTK] Try to fix the build after r191137 2015-10-16 00:14:47 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hs85.jeong hs85.jeong berto bugs-noreply cgarcia clopez commit-queue gustavo mcatanzaro mrobinson oldest_to_newest 1133762 0 hs85.jeong 2015-10-15 21:38:58 -0700 https://build.webkit.org/builders/GTK%20Linux%2032-bit%20Release/builds/56339/steps/compile-webkit/logs/stdio In file included from ../../Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h:34:0, from ../../Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp:31: ../../Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h:50:18: error: ‘virtual void WebKit::WebContextMenuProxyGtk::showContextMenu(const WebCore::IntPoint&, const WTF::Vector<WTF::RefPtr<WebKit::WebContextMenuItem> >&, const WebKit::ContextMenuContextData&)’ marked override, but does not override virtual void showContextMenu(const WebCore::IntPoint&, const Vector<RefPtr<WebContextMenuItem>>&, const ContextMenuContextData&) override; ^ ../../Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h: In static member function ‘static WTF::Ref<WebKit::WebContextMenuProxyGtk> WebKit::WebContextMenuProxyGtk::create(GtkWidget*, WebKit::WebPageProxy*)’: ../../Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h:46:66: error: invalid new-expression of abstract class type ‘WebKit::WebContextMenuProxyGtk’ return adoptRef(*new WebContextMenuProxyGtk(webView, page)); ^ ../../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/WebKitUIClient.cpp:31: ../../Source/WebKit2/UIProcess/WebContextMenuProxy.h:43:18: note: virtual void WebKit::WebContextMenuProxy::showContextMenu(const WTF::Vector<WTF::RefPtr<WebKit::WebContextMenuItem> >&) virtual void showContextMenu(const Vector<RefPtr<WebContextMenuItem>>&) = 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(const WebCore::IntPoint&, const WTF::Vector<WTF::RefPtr<WebKit::WebContextMenuItem> >&, const WebKit::ContextMenuContextData&)’ marked override, but does not override virtual void showContextMenu(const WebCore::IntPoint&, const Vector<RefPtr<WebContextMenuItem>>&, const ContextMenuContextData&) override; ^ ../../Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h: In static member function ‘static WTF::Ref<WebKit::WebContextMenuProxyGtk> WebKit::WebContextMenuProxyGtk::create(GtkWidget*, WebKit::WebPageProxy*)’: ../../Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h:46:66: error: invalid new-expression of abstract class type ‘WebKit::WebContextMenuProxyGtk’ return adoptRef(*new WebContextMenuProxyGtk(webView, page)); ^ ../../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::showContextMenu(const WTF::Vector<WTF::RefPtr<WebKit::WebContextMenuItem> >&) virtual void showContextMenu(const Vector<RefPtr<WebContextMenuItem>>&) = 0; ^ 1133763 1 263246 hs85.jeong 2015-10-15 21:41:50 -0700 Created attachment 263246 Patch 1133764 2 commit-queue 2015-10-15 21:43:38 -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 1133776 3 263246 cgarcia 2015-10-15 23:28:44 -0700 Comment on attachment 263246 Patch Thanks! 1133778 4 263246 commit-queue 2015-10-16 00:14:41 -0700 Comment on attachment 263246 Patch Clearing flags on attachment: 263246 Committed r191172: <http://trac.webkit.org/changeset/191172> 1133779 5 commit-queue 2015-10-16 00:14:47 -0700 All reviewed patches have been landed. Closing bug. 263246 2015-10-15 21:41:50 -0700 2015-10-16 00:14:41 -0700 Patch bug-150222-20151016134111.patch text/plain 8771 hs85.jeong SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5MTE2NykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE1LTEwLTE1ICBIdW5zZW9w IEplb25nICA8aHM4NS5qZW9uZ0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbR1RLXSBUcnkgdG8g Zml4IHRoZSBidWlsZCBhZnRlciByMTkxMTM3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNTAyMjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmNw cDoKKyAgICAgICAgKFdlYktpdDo6UGFnZUNsaWVudEltcGw6OmRvbmVXaXRoS2V5RXZlbnQpOgor ICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6Y3JlYXRlUG9wdXBNZW51UHJveHkpOgor ICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6Y3JlYXRlQ29udGV4dE1lbnVQcm94eSk6 CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpjcmVhdGVDb2xvclBpY2tlcik6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvZ3RrL1dlYkNvbnRleHRNZW51UHJveHlHdGsuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJDb250ZXh0TWVudVByb3h5R3RrOjpwb3B1bGF0ZSk6CisgICAgICAgIChXZWJLaXQ6Oldl YkNvbnRleHRNZW51UHJveHlHdGs6OnNob3dDb250ZXh0TWVudSk6CisgICAgICAgIChXZWJLaXQ6 OldlYkNvbnRleHRNZW51UHJveHlHdGs6OmhpZGVDb250ZXh0TWVudSk6CisgICAgICAgIChXZWJL aXQ6OldlYkNvbnRleHRNZW51UHJveHlHdGs6OldlYkNvbnRleHRNZW51UHJveHlHdGspOgorICAg ICAgICAqIFVJUHJvY2Vzcy9ndGsvV2ViQ29udGV4dE1lbnVQcm94eUd0ay5oOgorICAgICAgICAo V2ViS2l0OjpXZWJDb250ZXh0TWVudVByb3h5R3RrOjpjcmVhdGUpOgorICAgICAgICAoV2ViS2l0 OjpXZWJDb250ZXh0TWVudVByb3h5R3RrOjpndGtNZW51KToKKyAgICAgICAgKiBVSVByb2Nlc3Mv Z3RrL1dlYlBvcHVwTWVudVByb3h5R3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUG9wdXBN ZW51UHJveHlHdGs6OldlYlBvcHVwTWVudVByb3h5R3RrKToKKyAgICAgICAgKiBVSVByb2Nlc3Mv Z3RrL1dlYlBvcHVwTWVudVByb3h5R3RrLmg6CisgICAgICAgIChXZWJLaXQ6OldlYlBvcHVwTWVu dVByb3h5R3RrOjpjcmVhdGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQb3B1cE1lbnVQcm94eUd0 azo6c2V0Q3VycmVudGx5U2VsZWN0ZWRNZW51SXRlbSk6CisKIDIwMTUtMTAtMTUgIEd5dXlvdW5n IEtpbSAgPGd5dXlvdW5nLmtpbUB3ZWJraXQub3JnPgogCiAgICAgICAgICBFRkwgYnVpbGQgZml4 IHNpbmNlIHIxOTExMzcKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1Bh Z2VDbGllbnRJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5jcHAJKHJldmlzaW9uIDE5MTE2NikKKysrIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMjA2LDE0ICsyMDYsMTQgQEAgdm9pZCBQYWdlQ2xpZW50SW1wbDo6ZG9uZVdpdGhLZXlF dmVudChjbwogICAgIGd0a19tYWluX2RvX2V2ZW50KGV2ZW50Lm5hdGl2ZUV2ZW50KCkpOwogfQog Ci1SZWZQdHI8V2ViUG9wdXBNZW51UHJveHk+IFBhZ2VDbGllbnRJbXBsOjpjcmVhdGVQb3B1cE1l bnVQcm94eShXZWJQYWdlUHJveHkqIHBhZ2UpCitSZWZQdHI8V2ViUG9wdXBNZW51UHJveHk+IFBh Z2VDbGllbnRJbXBsOjpjcmVhdGVQb3B1cE1lbnVQcm94eShXZWJQYWdlUHJveHkmIHBhZ2UpCiB7 CiAgICAgcmV0dXJuIFdlYlBvcHVwTWVudVByb3h5R3RrOjpjcmVhdGUobV92aWV3V2lkZ2V0LCBw YWdlKTsKIH0KIAotUmVmUHRyPFdlYkNvbnRleHRNZW51UHJveHk+IFBhZ2VDbGllbnRJbXBsOjpj cmVhdGVDb250ZXh0TWVudVByb3h5KFdlYlBhZ2VQcm94eSogcGFnZSkKK1JlZlB0cjxXZWJDb250 ZXh0TWVudVByb3h5PiBQYWdlQ2xpZW50SW1wbDo6Y3JlYXRlQ29udGV4dE1lbnVQcm94eShXZWJQ YWdlUHJveHkmIHBhZ2UsIGNvbnN0IENvbnRleHRNZW51Q29udGV4dERhdGEmIGNvbnRleHQsIGNv bnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKIHsKLSAgICByZXR1cm4gV2ViQ29udGV4dE1lbnVQcm94 eUd0azo6Y3JlYXRlKG1fdmlld1dpZGdldCwgcGFnZSk7CisgICAgcmV0dXJuIFdlYkNvbnRleHRN ZW51UHJveHlHdGs6OmNyZWF0ZShtX3ZpZXdXaWRnZXQsIHBhZ2UsIGNvbnRleHQsIHVzZXJEYXRh KTsKIH0KIAogUmVmUHRyPFdlYkNvbG9yUGlja2VyPiBQYWdlQ2xpZW50SW1wbDo6Y3JlYXRlQ29s b3JQaWNrZXIoV2ViUGFnZVByb3h5KiBwYWdlLCBjb25zdCBXZWJDb3JlOjpDb2xvciYgY29sb3Is IGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHJlY3QpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmgJKHJldmlzaW9uIDE5MTE2NikK KysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmgJKHdv cmtpbmcgY29weSkKQEAgLTgyLDggKzgyLDggQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIFdlYkNv cmU6OkludFBvaW50IHNjcmVlblRvUm9vdFZpZXcoY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmKSBv dmVycmlkZTsKICAgICB2aXJ0dWFsIFdlYkNvcmU6OkludFJlY3Qgcm9vdFZpZXdUb1NjcmVlbihj b25zdCBXZWJDb3JlOjpJbnRSZWN0Jikgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIGRvbmVX aXRoS2V5RXZlbnQoY29uc3QgTmF0aXZlV2ViS2V5Ym9hcmRFdmVudCYsIGJvb2wgd2FzRXZlbnRI YW5kbGVkKSBvdmVycmlkZTsKLSAgICB2aXJ0dWFsIFJlZlB0cjxXZWJQb3B1cE1lbnVQcm94eT4g Y3JlYXRlUG9wdXBNZW51UHJveHkoV2ViUGFnZVByb3h5Kikgb3ZlcnJpZGU7Ci0gICAgdmlydHVh bCBSZWZQdHI8V2ViQ29udGV4dE1lbnVQcm94eT4gY3JlYXRlQ29udGV4dE1lbnVQcm94eShXZWJQ YWdlUHJveHkqKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIFJlZlB0cjxXZWJQb3B1cE1lbnVQcm94 eT4gY3JlYXRlUG9wdXBNZW51UHJveHkoV2ViUGFnZVByb3h5Jikgb3ZlcnJpZGU7CisgICAgdmly dHVhbCBSZWZQdHI8V2ViQ29udGV4dE1lbnVQcm94eT4gY3JlYXRlQ29udGV4dE1lbnVQcm94eShX ZWJQYWdlUHJveHkmLCBjb25zdCBDb250ZXh0TWVudUNvbnRleHREYXRhJiwgY29uc3QgVXNlckRh dGEmKSBvdmVycmlkZTsKICNpZiBFTkFCTEUoSU5QVVRfVFlQRV9DT0xPUikKICAgICB2aXJ0dWFs IFJlZlB0cjxXZWJDb2xvclBpY2tlcj4gY3JlYXRlQ29sb3JQaWNrZXIoV2ViUGFnZVByb3h5Kiwg Y29uc3QgV2ViQ29yZTo6Q29sb3ImIGludGlhbENvbG9yLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0 Jikgb3ZlcnJpZGU7CiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsv V2ViQ29udGV4dE1lbnVQcm94eUd0ay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL2d0ay9XZWJDb250ZXh0TWVudVByb3h5R3RrLmNwcAkocmV2aXNpb24gMTkxMTY2 KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJDb250ZXh0TWVudVByb3h5R3Rr LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTM5LDcgKzEzOSw3IEBAIHZvaWQgV2ViQ29udGV4dE1l bnVQcm94eUd0azo6cG9wdWxhdGUoY28KICAgICB9CiB9CiAKLXZvaWQgV2ViQ29udGV4dE1lbnVQ cm94eUd0azo6c2hvd0NvbnRleHRNZW51KGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBwb3NpdGlv biwgY29uc3QgVmVjdG9yPFJlZlB0cjxXZWJDb250ZXh0TWVudUl0ZW0+PiYgaXRlbXMsIGNvbnN0 IENvbnRleHRNZW51Q29udGV4dERhdGEmKQordm9pZCBXZWJDb250ZXh0TWVudVByb3h5R3RrOjpz aG93Q29udGV4dE1lbnUoY29uc3QgVmVjdG9yPFJlZlB0cjxXZWJDb250ZXh0TWVudUl0ZW0+PiYg aXRlbXMpCiB7CiAgICAgaWYgKCFpdGVtcy5pc0VtcHR5KCkpCiAgICAgICAgIHBvcHVsYXRlKGl0 ZW1zKTsKQEAgLTE0Nyw3ICsxNDcsNyBAQCB2b2lkIFdlYkNvbnRleHRNZW51UHJveHlHdGs6OnNo b3dDb250ZXh0CiAgICAgaWYgKCFtX21lbnUuaXRlbUNvdW50KCkpCiAgICAgICAgIHJldHVybjsK IAotICAgIG1fcG9wdXBQb3NpdGlvbiA9IGNvbnZlcnRXaWRnZXRQb2ludFRvU2NyZWVuUG9pbnQo bV93ZWJWaWV3LCBwb3NpdGlvbik7CisgICAgbV9wb3B1cFBvc2l0aW9uID0gY29udmVydFdpZGdl dFBvaW50VG9TY3JlZW5Qb2ludChtX3dlYlZpZXcsIG1fY29udGV4dC5tZW51TG9jYXRpb24oKSk7 CiAKICAgICAvLyBEaXNwbGF5IG1lbnUgaW5pdGlhdGVkIGJ5IHJpZ2h0IGNsaWNrIChtb3VzZSBi dXR0b24gcHJlc3NlZCA9IDMpLgogICAgIE5hdGl2ZVdlYk1vdXNlRXZlbnQqIG1vdXNlRXZlbnQg PSBtX3BhZ2UtPmN1cnJlbnRseVByb2Nlc3NlZE1vdXNlRG93bkV2ZW50KCk7CkBAIC0xNjIsOSAr MTYyLDEwIEBAIHZvaWQgV2ViQ29udGV4dE1lbnVQcm94eUd0azo6aGlkZUNvbnRleHQKICAgICBn dGtfbWVudV9wb3Bkb3duKG1fbWVudS5wbGF0Zm9ybURlc2NyaXB0aW9uKCkpOwogfQogCi1XZWJD b250ZXh0TWVudVByb3h5R3RrOjpXZWJDb250ZXh0TWVudVByb3h5R3RrKEd0a1dpZGdldCogd2Vi VmlldywgV2ViUGFnZVByb3h5KiBwYWdlKQotICAgIDogbV93ZWJWaWV3KHdlYlZpZXcpCi0gICAg LCBtX3BhZ2UocGFnZSkKK1dlYkNvbnRleHRNZW51UHJveHlHdGs6OldlYkNvbnRleHRNZW51UHJv eHlHdGsoR3RrV2lkZ2V0KiB3ZWJWaWV3LCBXZWJQYWdlUHJveHkmIHBhZ2UsIGNvbnN0IENvbnRl eHRNZW51Q29udGV4dERhdGEmIGNvbnRleHQsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKKyAg ICA6IFdlYkNvbnRleHRNZW51UHJveHkoY29udGV4dCwgdXNlckRhdGEpCisgICAgLCBtX3dlYlZp ZXcod2ViVmlldykKKyAgICAsIG1fcGFnZSgmcGFnZSkKIHsKICAgICB3ZWJraXRXZWJWaWV3QmFz ZVNldEFjdGl2ZUNvbnRleHRNZW51UHJveHkoV0VCS0lUX1dFQl9WSUVXX0JBU0UobV93ZWJWaWV3 KSwgdGhpcyk7CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYkNvbnRl eHRNZW51UHJveHlHdGsuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv Z3RrL1dlYkNvbnRleHRNZW51UHJveHlHdGsuaAkocmV2aXNpb24gMTkxMTY2KQorKysgU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJDb250ZXh0TWVudVByb3h5R3RrLmgJKHdvcmtpbmcg Y29weSkKQEAgLTQxLDEzICs0MSwxMyBAQCBjbGFzcyBXZWJQYWdlUHJveHk7CiAKIGNsYXNzIFdl YkNvbnRleHRNZW51UHJveHlHdGsgOiBwdWJsaWMgV2ViQ29udGV4dE1lbnVQcm94eSB7CiBwdWJs aWM6Ci0gICAgc3RhdGljIFJlZjxXZWJDb250ZXh0TWVudVByb3h5R3RrPiBjcmVhdGUoR3RrV2lk Z2V0KiB3ZWJWaWV3LCBXZWJQYWdlUHJveHkqIHBhZ2UpCisgICAgc3RhdGljIFJlZjxXZWJDb250 ZXh0TWVudVByb3h5R3RrPiBjcmVhdGUoR3RrV2lkZ2V0KiB3ZWJWaWV3LCBXZWJQYWdlUHJveHkm IHBhZ2UsIGNvbnN0IENvbnRleHRNZW51Q29udGV4dERhdGEmIGNvbnRleHQsIGNvbnN0IFVzZXJE YXRhJiB1c2VyRGF0YSkKICAgICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFdlYkNv bnRleHRNZW51UHJveHlHdGsod2ViVmlldywgcGFnZSkpOworICAgICAgICByZXR1cm4gYWRvcHRS ZWYoKm5ldyBXZWJDb250ZXh0TWVudVByb3h5R3RrKHdlYlZpZXcsIHBhZ2UsIGNvbnRleHQsIHVz ZXJEYXRhKSk7CiAgICAgfQogICAgIH5XZWJDb250ZXh0TWVudVByb3h5R3RrKCk7CiAKLSAgICB2 aXJ0dWFsIHZvaWQgc2hvd0NvbnRleHRNZW51KGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiwgY29u c3QgVmVjdG9yPFJlZlB0cjxXZWJDb250ZXh0TWVudUl0ZW0+PiYsIGNvbnN0IENvbnRleHRNZW51 Q29udGV4dERhdGEmKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIHZvaWQgc2hvd0NvbnRleHRNZW51 KGNvbnN0IFZlY3RvcjxSZWZQdHI8V2ViQ29udGV4dE1lbnVJdGVtPj4mKSBvdmVycmlkZTsKICAg ICB2aXJ0dWFsIHZvaWQgaGlkZUNvbnRleHRNZW51KCkgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2 b2lkIGNhbmNlbFRyYWNraW5nKCkgb3ZlcnJpZGU7CiAKQEAgLTU1LDcgKzU1LDcgQEAgcHVibGlj OgogICAgIEd0a01lbnUqIGd0a01lbnUoKSBjb25zdCB7IHJldHVybiBtX21lbnUucGxhdGZvcm1E ZXNjcmlwdGlvbigpOyB9CiAKIHByaXZhdGU6Ci0gICAgV2ViQ29udGV4dE1lbnVQcm94eUd0ayhH dGtXaWRnZXQqLCBXZWJQYWdlUHJveHkqKTsKKyAgICBXZWJDb250ZXh0TWVudVByb3h5R3RrKEd0 a1dpZGdldCosIFdlYlBhZ2VQcm94eSYsIGNvbnN0IENvbnRleHRNZW51Q29udGV4dERhdGEmLCBj b25zdCBVc2VyRGF0YSYpOwogCiAgICAgdm9pZCBhcHBlbmQoV2ViQ29yZTo6Q29udGV4dE1lbnVJ dGVtJik7CiAgICAgdm9pZCBwb3B1bGF0ZShjb25zdCBWZWN0b3I8UmVmUHRyPFdlYkNvbnRleHRN ZW51SXRlbT4+Jik7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYlBvcHVw TWVudVByb3h5R3RrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv Z3RrL1dlYlBvcHVwTWVudVByb3h5R3RrLmNwcAkocmV2aXNpb24gMTkxMTY2KQorKysgU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJQb3B1cE1lbnVQcm94eUd0ay5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTM4LDcgKzM4LDcgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVz cGFjZSBXZWJLaXQgewogCi1XZWJQb3B1cE1lbnVQcm94eUd0azo6V2ViUG9wdXBNZW51UHJveHlH dGsoR3RrV2lkZ2V0KiB3ZWJWaWV3LCBXZWJQb3B1cE1lbnVQcm94eTo6Q2xpZW50KiBjbGllbnQp CitXZWJQb3B1cE1lbnVQcm94eUd0azo6V2ViUG9wdXBNZW51UHJveHlHdGsoR3RrV2lkZ2V0KiB3 ZWJWaWV3LCBXZWJQb3B1cE1lbnVQcm94eTo6Q2xpZW50JiBjbGllbnQpCiAgICAgOiBXZWJQb3B1 cE1lbnVQcm94eShjbGllbnQpCiAgICAgLCBtX3dlYlZpZXcod2ViVmlldykKICAgICAsIG1fcG9w dXAoZ3RrX21lbnVfbmV3KCkpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dl YlBvcHVwTWVudVByb3h5R3RrLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL2d0ay9XZWJQb3B1cE1lbnVQcm94eUd0ay5oCShyZXZpc2lvbiAxOTExNjYpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYlBvcHVwTWVudVByb3h5R3RrLmgJKHdvcmtpbmcg Y29weSkKQEAgLTM3LDcgKzM3LDcgQEAgY2xhc3MgV2ViUGFnZVByb3h5OwogCiBjbGFzcyBXZWJQ b3B1cE1lbnVQcm94eUd0ayA6IHB1YmxpYyBXZWJQb3B1cE1lbnVQcm94eSB7CiBwdWJsaWM6Ci0g ICAgc3RhdGljIFJlZjxXZWJQb3B1cE1lbnVQcm94eUd0az4gY3JlYXRlKEd0a1dpZGdldCogd2Vi VmlldywgV2ViUG9wdXBNZW51UHJveHk6OkNsaWVudCogY2xpZW50KQorICAgIHN0YXRpYyBSZWY8 V2ViUG9wdXBNZW51UHJveHlHdGs+IGNyZWF0ZShHdGtXaWRnZXQqIHdlYlZpZXcsIFdlYlBvcHVw TWVudVByb3h5OjpDbGllbnQmIGNsaWVudCkKICAgICB7CiAgICAgICAgIHJldHVybiBhZG9wdFJl ZigqbmV3IFdlYlBvcHVwTWVudVByb3h5R3RrKHdlYlZpZXcsIGNsaWVudCkpOwogICAgIH0KQEAg LTQ4LDcgKzQ4LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBjYW5jZWxUcmFja2luZygp IG92ZXJyaWRlOwogCiBwcml2YXRlOgotICAgIFdlYlBvcHVwTWVudVByb3h5R3RrKEd0a1dpZGdl dCosIFdlYlBvcHVwTWVudVByb3h5OjpDbGllbnQqKTsKKyAgICBXZWJQb3B1cE1lbnVQcm94eUd0 ayhHdGtXaWRnZXQqLCBXZWJQb3B1cE1lbnVQcm94eTo6Q2xpZW50Jik7CiAKICAgICB2b2lkIHNl dEN1cnJlbnRseVNlbGVjdGVkTWVudUl0ZW0oR3RrV2lkZ2V0KiBpdGVtKSB7IG1fY3VycmVudGx5 U2VsZWN0ZWRNZW51SXRlbSA9IGl0ZW07IH0KICAgICBHdGtBY3Rpb24qIGNyZWF0ZUd0a0FjdGlv bkZvck1lbnVJdGVtKGNvbnN0IFdlYlBvcHVwSXRlbSYsIGludCBpdGVtSW5kZXgpOwo=