148570 2015-08-28 03:37:42 -0700 [GTK] Simplify the internal API to create a WebView 2015-08-28 04:16:32 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Local Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned berto commit-queue gustavo mcatanzaro mrobinson zan oldest_to_newest 1121658 0 cgarcia 2015-08-28 03:37:42 -0700 Now that all the information required to create a WebView is in API::PageConfiguration, we can simplify the internal API to receive only the configuration instead of receiving a long list of parameters that we use to build a new API::PageConfiguration. 1121659 1 260145 cgarcia 2015-08-28 03:40:44 -0700 Created attachment 260145 Patch 1121660 2 commit-queue 2015-08-28 03:41:23 -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 1121661 3 260145 zan 2015-08-28 03:55:23 -0700 Comment on attachment 260145 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=260145&action=review > Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp:1050 > + Ref<API::PageConfiguration> copiedConfiguration = configuration.copy(); > + webkitWebViewBaseCreateWebPage(webkitWebViewBase, WTF::move(copiedConfiguration)); Can be just: webkitWebViewBaseCreateWebPage(webkitWebViewBase, configuration.copy()); 1121662 4 cgarcia 2015-08-28 04:16:32 -0700 Committed r189094: <http://trac.webkit.org/changeset/189094> 260145 2015-08-28 03:40:44 -0700 2015-08-28 03:55:23 -0700 Patch wk2-create-webview.diff text/plain 13385 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkZDFkNmNlLi42ZWJiNTRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcg QEAKKzIwMTUtMDgtMjggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIFNpbXBsaWZ5IHRoZSBpbnRlcm5hbCBBUEkgdG8gY3JlYXRlIGEg V2ViVmlldworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTQ4NTcwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Tm93IHRoYXQgYWxsIHRoZSBpbmZvcm1hdGlvbiByZXF1aXJlZCB0byBjcmVhdGUgYSBXZWJWaWV3 IGlzIGluCisgICAgICAgIEFQSTo6UGFnZUNvbmZpZ3VyYXRpb24sIHdlIGNhbiBzaW1wbGlmeSB0 aGUgaW50ZXJuYWwgQVBJIHRvCisgICAgICAgIHJlY2VpdmUgb25seSB0aGUgY29uZmlndXJhdGlv biBpbnN0ZWFkIG9mIHJlY2VpdmluZyBhIGxvbmcgbGlzdCBvZgorICAgICAgICBwYXJhbWV0ZXJz IHRoYXQgd2UgdXNlIHRvIGJ1aWxkIGEgbmV3IEFQSTo6UGFnZUNvbmZpZ3VyYXRpb24uCisKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvZ3RrL1dLVmlldy5jcHA6CisgICAgICAgIChXS1ZpZXdD cmVhdGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9ndGsvV0tWaWV3Lmg6CisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHA6CisgICAgICAgICh3ZWJr aXRXZWJDb250ZXh0Q3JlYXRlUGFnZUZvcldlYlZpZXcpOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcDoKKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNl Q3JlYXRlKToKKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlQ3JlYXRlV2ViUGFnZSk6CisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlLmg6CisgICAg ICAgICogVUlQcm9jZXNzL2d0ay9XZWJJbnNwZWN0b3JQcm94eUd0ay5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYkluc3BlY3RvclByb3h5OjpwbGF0Zm9ybUNyZWF0ZUluc3BlY3RvclBhZ2UpOgor CiAyMDE1LTA4LTI3ICBUaW1vdGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4K IAogICAgICAgICBWaWRlbyBmdWxsLXNjcmVlbiBzaG91bGRuJ3QgdXNlIHRoZSBEeW5hbWljU2l6 ZVdpdGhNaW5pbXVtVmlld1NpemUgbGF5b3V0IG1vZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQy9ndGsvV0tWaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvQy9ndGsvV0tWaWV3LmNwcAppbmRleCAwNTExZjEzLi40OGM0MWFjIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvZ3RrL1dLVmlldy5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL2d0ay9XS1ZpZXcuY3BwCkBAIC0zMSwxNSAr MzEsMTIgQEAKICNpbmNsdWRlICJXS0FQSUNhc3QuaCIKICNpbmNsdWRlICJXS1ZpZXdQcml2YXRl LmgiCiAjaW5jbHVkZSAiV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlLmgiCi0jaW5jbHVkZSAiV2Vi UGFnZUdyb3VwLmgiCi0jaW5jbHVkZSAiV2ViUHJvY2Vzc1Bvb2wuaCIKIAogdXNpbmcgbmFtZXNw YWNlIFdlYktpdDsKLXVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCi1XS1ZpZXdSZWYgV0tWaWV3 Q3JlYXRlKFdLQ29udGV4dFJlZiBjb250ZXh0UmVmLCBXS1BhZ2VHcm91cFJlZiBwYWdlR3JvdXBS ZWYsIFdLUGFnZVJlZiByZWxhdGVkUGFnZSkKK1dLVmlld1JlZiBXS1ZpZXdDcmVhdGUoV0tQYWdl Q29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uKQogewotICAgIHJldHVybiB0b0FQSSh3ZWJr aXRXZWJWaWV3QmFzZUNyZWF0ZSh0b0ltcGwoY29udGV4dFJlZiksIG51bGxwdHIsIHRvSW1wbChw YWdlR3JvdXBSZWYpLCBudWxscHRyLCB0b0ltcGwocmVsYXRlZFBhZ2UpKSk7CisgICAgcmV0dXJu IHRvQVBJKHdlYmtpdFdlYlZpZXdCYXNlQ3JlYXRlKCp0b0ltcGwoY29uZmlndXJhdGlvbikpKTsK IH0KIAogV0tQYWdlUmVmIFdLVmlld0dldFBhZ2UoV0tWaWV3UmVmIHZpZXdSZWYpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvZ3RrL1dLVmlldy5oIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL2d0ay9XS1ZpZXcuaAppbmRleCA2ZjRlZDcwLi45ODlh YjY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvZ3RrL1dLVmll dy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9ndGsvV0tWaWV3LmgKQEAg LTM0LDcgKzM0LDcgQEAKIGV4dGVybiAiQyIgewogI2VuZGlmCiAKLVdLX0VYUE9SVCBXS1ZpZXdS ZWYgV0tWaWV3Q3JlYXRlKFdLQ29udGV4dFJlZiBjb250ZXh0LCBXS1BhZ2VHcm91cFJlZiBwYWdl R3JvdXAsIFdLUGFnZVJlZiByZWxhdGVkUGFnZSk7CitXS19FWFBPUlQgV0tWaWV3UmVmIFdLVmll d0NyZWF0ZShXS1BhZ2VDb25maWd1cmF0aW9uUmVmIGNvbmZpZ3VyYXRpb24pOwogCiBXS19FWFBP UlQgV0tQYWdlUmVmIFdLVmlld0dldFBhZ2UoV0tWaWV3UmVmIHZpZXcpOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmNwcCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuY3BwCmlu ZGV4IDllOGQ4YTYuLjlmYmM1MTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuY3BwCkBAIC0xMzE4LDEyICsxMzE4LDEzIEBA IHZvaWQgd2Via2l0V2ViQ29udGV4dENyZWF0ZVBhZ2VGb3JXZWJWaWV3KFdlYktpdFdlYkNvbnRl eHQqIGNvbnRleHQsIFdlYktpdFdlYlZpCiAgICAgV2ViS2l0V2ViVmlld0Jhc2UqIHdlYlZpZXdC YXNlID0gV0VCS0lUX1dFQl9WSUVXX0JBU0Uod2ViVmlldyk7CiAKICAgICBhdXRvIHBhZ2VDb25m aWd1cmF0aW9uID0gQVBJOjpQYWdlQ29uZmlndXJhdGlvbjo6Y3JlYXRlKCk7CisgICAgcGFnZUNv bmZpZ3VyYXRpb24tPnNldFByb2Nlc3NQb29sKGNvbnRleHQtPnByaXYtPmNvbnRleHQuZ2V0KCkp OwogICAgIHBhZ2VDb25maWd1cmF0aW9uLT5zZXRQcmVmZXJlbmNlcyh3ZWJraXRTZXR0aW5nc0dl dFByZWZlcmVuY2VzKHdlYmtpdF93ZWJfdmlld19nZXRfc2V0dGluZ3Mod2ViVmlldykpKTsKICAg ICBwYWdlQ29uZmlndXJhdGlvbi0+c2V0UmVsYXRlZFBhZ2UocmVsYXRlZFZpZXcgPyB3ZWJraXRX ZWJWaWV3QmFzZUdldFBhZ2UoV0VCS0lUX1dFQl9WSUVXX0JBU0UocmVsYXRlZFZpZXcpKSA6IG51 bGxwdHIpOwogICAgIHBhZ2VDb25maWd1cmF0aW9uLT5zZXRVc2VyQ29udGVudENvbnRyb2xsZXIo dXNlckNvbnRlbnRNYW5hZ2VyID8gd2Via2l0VXNlckNvbnRlbnRNYW5hZ2VyR2V0VXNlckNvbnRl bnRDb250cm9sbGVyUHJveHkodXNlckNvbnRlbnRNYW5hZ2VyKSA6IG51bGxwdHIpOwogICAgIHBh Z2VDb25maWd1cmF0aW9uLT5zZXRXZWJzaXRlRGF0YVN0b3JlKCZ3ZWJraXRXZWJzaXRlRGF0YU1h bmFnZXJHZXREYXRhU3RvcmUoY29udGV4dC0+cHJpdi0+d2Vic2l0ZURhdGFNYW5hZ2VyLmdldCgp KSk7CiAgICAgcGFnZUNvbmZpZ3VyYXRpb24tPnNldFNlc3Npb25JRChwYWdlQ29uZmlndXJhdGlv bi0+d2Vic2l0ZURhdGFTdG9yZSgpLT53ZWJzaXRlRGF0YVN0b3JlKCkuc2Vzc2lvbklEKCkpOwot ICAgIHdlYmtpdFdlYlZpZXdCYXNlQ3JlYXRlV2ViUGFnZSh3ZWJWaWV3QmFzZSwgY29udGV4dC0+ cHJpdi0+Y29udGV4dC5nZXQoKSwgV1RGOjptb3ZlKHBhZ2VDb25maWd1cmF0aW9uKSk7CisgICAg d2Via2l0V2ViVmlld0Jhc2VDcmVhdGVXZWJQYWdlKHdlYlZpZXdCYXNlLCBXVEY6Om1vdmUocGFn ZUNvbmZpZ3VyYXRpb24pKTsKIAogICAgIFdlYlBhZ2VQcm94eSogcGFnZSA9IHdlYmtpdFdlYlZp ZXdCYXNlR2V0UGFnZSh3ZWJWaWV3QmFzZSk7CiAgICAgY29udGV4dC0+cHJpdi0+d2ViVmlld3Mu c2V0KHBhZ2UtPnBhZ2VJRCgpLCB3ZWJWaWV3KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcAppbmRleCA4MDk1ZGY1Li45 MGUyMGM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJL aXRXZWJWaWV3QmFzZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsv V2ViS2l0V2ViVmlld0Jhc2UuY3BwCkBAIC0xMDQzLDE3ICsxMDQzLDExIEBAIHN0YXRpYyB2b2lk IHdlYmtpdF93ZWJfdmlld19iYXNlX2NsYXNzX2luaXQoV2ViS2l0V2ViVmlld0Jhc2VDbGFzcyog d2Via2l0V2ViVmllCiAgICAgY29udGFpbmVyQ2xhc3MtPmZvcmFsbCA9IHdlYmtpdFdlYlZpZXdC YXNlQ29udGFpbmVyRm9yYWxsOwogfQogCi1XZWJLaXRXZWJWaWV3QmFzZSogd2Via2l0V2ViVmll d0Jhc2VDcmVhdGUoV2ViUHJvY2Vzc1Bvb2wqIGNvbnRleHQsIFdlYlByZWZlcmVuY2VzKiBwcmVm ZXJlbmNlcywgV2ViUGFnZUdyb3VwKiBwYWdlR3JvdXAsIFdlYlVzZXJDb250ZW50Q29udHJvbGxl clByb3h5KiB1c2VyQ29udGVudENvbnRyb2xsZXIsIFdlYlBhZ2VQcm94eSogcmVsYXRlZFBhZ2Up CitXZWJLaXRXZWJWaWV3QmFzZSogd2Via2l0V2ViVmlld0Jhc2VDcmVhdGUoY29uc3QgQVBJOjpQ YWdlQ29uZmlndXJhdGlvbiYgY29uZmlndXJhdGlvbikKIHsKICAgICBXZWJLaXRXZWJWaWV3QmFz ZSogd2Via2l0V2ViVmlld0Jhc2UgPSBXRUJLSVRfV0VCX1ZJRVdfQkFTRShnX29iamVjdF9uZXco V0VCS0lUX1RZUEVfV0VCX1ZJRVdfQkFTRSwgbnVsbHB0cikpOwotCi0gICAgYXV0byBwYWdlQ29u ZmlndXJhdGlvbiA9IEFQSTo6UGFnZUNvbmZpZ3VyYXRpb246OmNyZWF0ZSgpOwotICAgIHBhZ2VD b25maWd1cmF0aW9uLT5zZXRQcm9jZXNzUG9vbChjb250ZXh0KTsKLSAgICBwYWdlQ29uZmlndXJh dGlvbi0+c2V0UHJlZmVyZW5jZXMocHJlZmVyZW5jZXMpOwotICAgIHBhZ2VDb25maWd1cmF0aW9u LT5zZXRQYWdlR3JvdXAocGFnZUdyb3VwKTsKLSAgICBwYWdlQ29uZmlndXJhdGlvbi0+c2V0UmVs YXRlZFBhZ2UocmVsYXRlZFBhZ2UpOwotICAgIHBhZ2VDb25maWd1cmF0aW9uLT5zZXRVc2VyQ29u dGVudENvbnRyb2xsZXIodXNlckNvbnRlbnRDb250cm9sbGVyKTsKLSAgICB3ZWJraXRXZWJWaWV3 QmFzZUNyZWF0ZVdlYlBhZ2Uod2Via2l0V2ViVmlld0Jhc2UsIGNvbnRleHQsIFdURjo6bW92ZShw YWdlQ29uZmlndXJhdGlvbikpOworICAgIFJlZjxBUEk6OlBhZ2VDb25maWd1cmF0aW9uPiBjb3Bp ZWRDb25maWd1cmF0aW9uID0gY29uZmlndXJhdGlvbi5jb3B5KCk7CisgICAgd2Via2l0V2ViVmll d0Jhc2VDcmVhdGVXZWJQYWdlKHdlYmtpdFdlYlZpZXdCYXNlLCBXVEY6Om1vdmUoY29waWVkQ29u ZmlndXJhdGlvbikpOwogICAgIHJldHVybiB3ZWJraXRXZWJWaWV3QmFzZTsKIH0KIApAQCAtMTA3 NCw5ICsxMDY4LDEwIEBAIHN0YXRpYyB2b2lkIGRldmljZVNjYWxlRmFjdG9yQ2hhbmdlZChXZWJL aXRXZWJWaWV3QmFzZSogd2Via2l0V2ViVmlld0Jhc2UpCiB9CiAjZW5kaWYgLy8gSEFWRShHVEtf U0NBTEVfRkFDVE9SKQogCi12b2lkIHdlYmtpdFdlYlZpZXdCYXNlQ3JlYXRlV2ViUGFnZShXZWJL aXRXZWJWaWV3QmFzZSogd2Via2l0V2ViVmlld0Jhc2UsIFdlYlByb2Nlc3NQb29sKiBjb250ZXh0 LCBSZWY8QVBJOjpQYWdlQ29uZmlndXJhdGlvbj4mJiBjb25maWd1cmF0aW9uKQordm9pZCB3ZWJr aXRXZWJWaWV3QmFzZUNyZWF0ZVdlYlBhZ2UoV2ViS2l0V2ViVmlld0Jhc2UqIHdlYmtpdFdlYlZp ZXdCYXNlLCBSZWY8QVBJOjpQYWdlQ29uZmlndXJhdGlvbj4mJiBjb25maWd1cmF0aW9uKQogewog ICAgIFdlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZSogcHJpdiA9IHdlYmtpdFdlYlZpZXdCYXNlLT5w cml2OworICAgIFdlYlByb2Nlc3NQb29sKiBjb250ZXh0ID0gY29uZmlndXJhdGlvbi0+cHJvY2Vz c1Bvb2woKTsKICAgICBwcml2LT5wYWdlUHJveHkgPSBjb250ZXh0LT5jcmVhdGVXZWJQYWdlKCpw cml2LT5wYWdlQ2xpZW50LCBXVEY6Om1vdmUoY29uZmlndXJhdGlvbikpOwogICAgIHByaXYtPnBh Z2VQcm94eS0+aW5pdGlhbGl6ZVdlYlBhZ2UoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlLmggYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUuaAppbmRl eCBjYTBiMjVlLi4yYjAyNWY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUuaApAQCAtMjgsNiArMjgs NyBAQAogI2lmbmRlZiBXZWJLaXRXZWJWaWV3QmFzZVByaXZhdGVfaAogI2RlZmluZSBXZWJLaXRX ZWJWaWV3QmFzZVByaXZhdGVfaAogCisjaW5jbHVkZSAiQVBJUGFnZUNvbmZpZ3VyYXRpb24uaCIK ICNpbmNsdWRlICJEcmFnQW5kRHJvcEhhbmRsZXIuaCIKICNpbmNsdWRlICJHZXN0dXJlQ29udHJv bGxlci5oIgogI2luY2x1ZGUgIldlYkNvbnRleHRNZW51UHJveHlHdGsuaCIKQEAgLTM2LDEwICsz NywxMCBAQAogI2luY2x1ZGUgIldlYktpdFdlYlZpZXdCYXNlLmgiCiAjaW5jbHVkZSAiV2ViUGFn ZVByb3h5LmgiCiAKLVdlYktpdFdlYlZpZXdCYXNlKiB3ZWJraXRXZWJWaWV3QmFzZUNyZWF0ZShX ZWJLaXQ6OldlYlByb2Nlc3NQb29sKiwgV2ViS2l0OjpXZWJQcmVmZXJlbmNlcyosIFdlYktpdDo6 V2ViUGFnZUdyb3VwKiwgV2ViS2l0OjpXZWJVc2VyQ29udGVudENvbnRyb2xsZXJQcm94eSosIFdl YktpdDo6V2ViUGFnZVByb3h5Kik7CitXZWJLaXRXZWJWaWV3QmFzZSogd2Via2l0V2ViVmlld0Jh c2VDcmVhdGUoY29uc3QgQVBJOjpQYWdlQ29uZmlndXJhdGlvbiYpOwogR3RrSU1Db250ZXh0KiB3 ZWJraXRXZWJWaWV3QmFzZUdldElNQ29udGV4dChXZWJLaXRXZWJWaWV3QmFzZSopOwogV2ViS2l0 OjpXZWJQYWdlUHJveHkqIHdlYmtpdFdlYlZpZXdCYXNlR2V0UGFnZShXZWJLaXRXZWJWaWV3QmFz ZSopOwotdm9pZCB3ZWJraXRXZWJWaWV3QmFzZUNyZWF0ZVdlYlBhZ2UoV2ViS2l0V2ViVmlld0Jh c2UqLCBXZWJLaXQ6OldlYlByb2Nlc3NQb29sKiwgUmVmPEFQSTo6UGFnZUNvbmZpZ3VyYXRpb24+ JiYpOwordm9pZCB3ZWJraXRXZWJWaWV3QmFzZUNyZWF0ZVdlYlBhZ2UoV2ViS2l0V2ViVmlld0Jh c2UqLCBSZWY8QVBJOjpQYWdlQ29uZmlndXJhdGlvbj4mJik7CiB2b2lkIHdlYmtpdFdlYlZpZXdC YXNlU2V0VG9vbHRpcFRleHQoV2ViS2l0V2ViVmlld0Jhc2UqLCBjb25zdCBjaGFyKik7CiB2b2lk IHdlYmtpdFdlYlZpZXdCYXNlU2V0VG9vbHRpcEFyZWEoV2ViS2l0V2ViVmlld0Jhc2UqLCBjb25z dCBXZWJDb3JlOjpJbnRSZWN0Jik7CiB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlRm9yd2FyZE5leHRL ZXlFdmVudChXZWJLaXRXZWJWaWV3QmFzZSopOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL2d0ay9XZWJJbnNwZWN0b3JQcm94eUd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvZ3RrL1dlYkluc3BlY3RvclByb3h5R3RrLmNwcAppbmRleCAzNzVmZjFlLi42MDZk NTc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYkluc3BlY3Rv clByb3h5R3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYkluc3Bl Y3RvclByb3h5R3RrLmNwcApAQCAtNzcsNyArNzcsMTIgQEAgV2ViUGFnZVByb3h5KiBXZWJJbnNw ZWN0b3JQcm94eTo6cGxhdGZvcm1DcmVhdGVJbnNwZWN0b3JQYWdlKCkKICAgICBwcmVmZXJlbmNl cy0+c2V0SmF2YVNjcmlwdFJ1bnRpbWVGbGFncyh7CiAgICAgfSk7CiAgICAgUmVmUHRyPFdlYlBh Z2VHcm91cD4gcGFnZUdyb3VwID0gV2ViUGFnZUdyb3VwOjpjcmVhdGUoaW5zcGVjdG9yUGFnZUdy b3VwSWRlbnRpZmllcigpLCBmYWxzZSwgZmFsc2UpOwotICAgIG1faW5zcGVjdG9yVmlldyA9IEdU S19XSURHRVQod2Via2l0V2ViVmlld0Jhc2VDcmVhdGUoJmluc3BlY3RvclByb2Nlc3NQb29sKCks IHByZWZlcmVuY2VzLmdldCgpLCBwYWdlR3JvdXAuZ2V0KCksIG51bGxwdHIsIG51bGxwdHIpKTsK KworICAgIGF1dG8gcGFnZUNvbmZpZ3VyYXRpb24gPSBBUEk6OlBhZ2VDb25maWd1cmF0aW9uOjpj cmVhdGUoKTsKKyAgICBwYWdlQ29uZmlndXJhdGlvbi0+c2V0UHJvY2Vzc1Bvb2woJmluc3BlY3Rv clByb2Nlc3NQb29sKCkpOworICAgIHBhZ2VDb25maWd1cmF0aW9uLT5zZXRQcmVmZXJlbmNlcyhw cmVmZXJlbmNlcy5nZXQoKSk7CisgICAgcGFnZUNvbmZpZ3VyYXRpb24tPnNldFBhZ2VHcm91cChw YWdlR3JvdXAuZ2V0KCkpOworICAgIG1faW5zcGVjdG9yVmlldyA9IEdUS19XSURHRVQod2Via2l0 V2ViVmlld0Jhc2VDcmVhdGUoKnBhZ2VDb25maWd1cmF0aW9uLnB0cigpKSk7CiAgICAgZ19vYmpl Y3RfYWRkX3dlYWtfcG9pbnRlcihHX09CSkVDVChtX2luc3BlY3RvclZpZXcpLCByZWludGVycHJl dF9jYXN0PHZvaWQqKj4oJm1faW5zcGVjdG9yVmlldykpOwogCiAgICAgV0tQYWdlVUlDbGllbnRW MiB1aUNsaWVudCA9IHsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5n ZUxvZwppbmRleCA4MWM0ODYzLi42Y2UwZWI4IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cK KysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTUtMDgtMjggIENhcmxv cyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIFNp bXBsaWZ5IHRoZSBpbnRlcm5hbCBBUEkgdG8gY3JlYXRlIGEgV2ViVmlldworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4NTcwCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1BsYXRm b3JtV2ViVmlldy5oOiBBZGQgaW5pdGlhbGl6ZSBtZXRob2QgZm9yIEdUSysgdG9vLgorICAgICAg ICAqIFRlc3RXZWJLaXRBUEkvZ3RrL1BsYXRmb3JtV2ViVmlld0d0ay5jcHA6CisgICAgICAgIChU ZXN0V2ViS2l0QVBJOjpQbGF0Zm9ybVdlYlZpZXc6OlBsYXRmb3JtV2ViVmlldyk6IEltcGxlbWVu dCBhbGwKKyAgICAgICAgUGxhdGZvcm1XZWJWaWV3IGNvbnN0cnVjdG9ycyB0aGF0IGVuZCB1cCBj YWxsaW5nIGluaXRpYWxpemUgd2l0aCBhIFBhZ2VDb25maWd1cmF0aW9uLgorICAgICAgICAoVGVz dFdlYktpdEFQSTo6UGxhdGZvcm1XZWJWaWV3Ojppbml0aWFsaXplKTogQ3JlYXRlIHRoZSBXZWJW aWV3CisgICAgICAgIHBhc3NpbmcgdGhlIHJlY2VpdmVkIFBhZ2VDb25maWd1cmF0aW9uLgorICAg ICAgICAqIFdlYktpdFRlc3RSdW5uZXIvZ3RrL1BsYXRmb3JtV2ViVmlld0d0ay5jcHA6CisgICAg ICAgIChXVFI6OlBsYXRmb3JtV2ViVmlldzo6UGxhdGZvcm1XZWJWaWV3KTogQ3JlYXRlIHRoZSBX ZWJWaWV3CisgICAgICAgIHBhc3NpbmcgdGhlIHJlY2VpdmVkIFBhZ2VDb25maWd1cmF0aW9uLgor CiAyMDE1LTA4LTI3ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNvbT4KIAogICAg ICAgICBpT1MgU2ltdWxhdG9yIEFQSSB0ZXN0cyBmYWlscyBhcyBTaW11bGF0b3IgaXMgbm90IHJ1 bm5pbmcKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvUGxhdGZvcm1XZWJWaWV3Lmgg Yi9Ub29scy9UZXN0V2ViS2l0QVBJL1BsYXRmb3JtV2ViVmlldy5oCmluZGV4IDJlMTFjZjcuLmVi NjMyZTIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvUGxhdGZvcm1XZWJWaWV3LmgK KysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9QbGF0Zm9ybVdlYlZpZXcuaApAQCAtODAsNiArODAs OCBAQCBwdWJsaWM6CiBwcml2YXRlOgogI2lmIFBMQVRGT1JNKE1BQykKICAgICB2b2lkIGluaXRp YWxpemUoV0tQYWdlQ29uZmlndXJhdGlvblJlZiwgQ2xhc3Mgd2tWaWV3U3ViY2xhc3MpOworI2Vs aWYgUExBVEZPUk0oR1RLKQorICAgIHZvaWQgaW5pdGlhbGl6ZShXS1BhZ2VDb25maWd1cmF0aW9u UmVmKTsKICNlbmRpZgogCiAgICAgUGxhdGZvcm1XS1ZpZXcgbV92aWV3OwpkaWZmIC0tZ2l0IGEv VG9vbHMvVGVzdFdlYktpdEFQSS9ndGsvUGxhdGZvcm1XZWJWaWV3R3RrLmNwcCBiL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvZ3RrL1BsYXRmb3JtV2ViVmlld0d0ay5jcHAKaW5kZXggNWYwZWI0MC4uZjJm NmExYiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9ndGsvUGxhdGZvcm1XZWJWaWV3 R3RrLmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL2d0ay9QbGF0Zm9ybVdlYlZpZXdHdGsu Y3BwCkBAIC0yNyw2ICsyNyw3IEBACiAjaW5jbHVkZSAiUGxhdGZvcm1XZWJWaWV3LmgiCiAKICNp bmNsdWRlIDxXZWJDb3JlL0dVbmlxdWVQdHJHdGsuaD4KKyNpbmNsdWRlIDxXZWJLaXQvV0tSZXRh aW5QdHIuaD4KICNpbmNsdWRlIDxndGsvZ3RrLmg+CiAjaW5jbHVkZSA8d3RmL2dsaWIvR1VuaXF1 ZVB0ci5oPgogCkBAIC0zNCwxMSArMzUsMjYgQEAgbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkgewog CiBQbGF0Zm9ybVdlYlZpZXc6OlBsYXRmb3JtV2ViVmlldyhXS0NvbnRleHRSZWYgY29udGV4dFJl ZiwgV0tQYWdlR3JvdXBSZWYgcGFnZUdyb3VwUmVmKQogewotICAgIG1fd2luZG93ID0gZ3RrX3dp bmRvd19uZXcoR1RLX1dJTkRPV19UT1BMRVZFTCk7Ci0gICAgbV92aWV3ID0gV0tWaWV3Q3JlYXRl KGNvbnRleHRSZWYsIHBhZ2VHcm91cFJlZiwgbnVsbHB0cik7Ci0gICAgZ3RrX2NvbnRhaW5lcl9h ZGQoR1RLX0NPTlRBSU5FUihtX3dpbmRvdyksIEdUS19XSURHRVQobV92aWV3KSk7Ci0gICAgZ3Rr X3dpZGdldF9zaG93KEdUS19XSURHRVQobV92aWV3KSk7Ci0gICAgZ3RrX3dpZGdldF9zaG93KG1f d2luZG93KTsKKyAgICBXS1JldGFpblB0cjxXS1BhZ2VDb25maWd1cmF0aW9uUmVmPiBjb25maWd1 cmF0aW9uID0gYWRvcHRXSyhXS1BhZ2VDb25maWd1cmF0aW9uQ3JlYXRlKCkpOworICAgIFdLUGFn ZUNvbmZpZ3VyYXRpb25TZXRDb250ZXh0KGNvbmZpZ3VyYXRpb24uZ2V0KCksIGNvbnRleHRSZWYp OworICAgIFdLUGFnZUNvbmZpZ3VyYXRpb25TZXRQYWdlR3JvdXAoY29uZmlndXJhdGlvbi5nZXQo KSwgcGFnZUdyb3VwUmVmKTsKKworICAgIGluaXRpYWxpemUoY29uZmlndXJhdGlvbi5nZXQoKSk7 Cit9CisKK1BsYXRmb3JtV2ViVmlldzo6UGxhdGZvcm1XZWJWaWV3KFdLUGFnZUNvbmZpZ3VyYXRp b25SZWYgY29uZmlndXJhdGlvbikKK3sKKyAgICBpbml0aWFsaXplKGNvbmZpZ3VyYXRpb24pOwor fQorCitQbGF0Zm9ybVdlYlZpZXc6OlBsYXRmb3JtV2ViVmlldyhXS1BhZ2VSZWYgcmVsYXRlZFBh Z2UpCit7CisgICAgV0tSZXRhaW5QdHI8V0tQYWdlQ29uZmlndXJhdGlvblJlZj4gY29uZmlndXJh dGlvbiA9IGFkb3B0V0soV0tQYWdlQ29uZmlndXJhdGlvbkNyZWF0ZSgpKTsKKyAgICBXS1BhZ2VD b25maWd1cmF0aW9uU2V0Q29udGV4dChjb25maWd1cmF0aW9uLmdldCgpLCBXS1BhZ2VHZXRDb250 ZXh0KHJlbGF0ZWRQYWdlKSk7CisgICAgV0tQYWdlQ29uZmlndXJhdGlvblNldFBhZ2VHcm91cChj b25maWd1cmF0aW9uLmdldCgpLCBXS1BhZ2VHZXRQYWdlR3JvdXAocmVsYXRlZFBhZ2UpKTsKKyAg ICBXS1BhZ2VDb25maWd1cmF0aW9uU2V0UmVsYXRlZFBhZ2UoY29uZmlndXJhdGlvbi5nZXQoKSwg cmVsYXRlZFBhZ2UpOworCisgICAgaW5pdGlhbGl6ZShjb25maWd1cmF0aW9uLmdldCgpKTsKIH0K IAogUGxhdGZvcm1XZWJWaWV3Ojp+UGxhdGZvcm1XZWJWaWV3KCkKQEAgLTQ2LDYgKzYyLDE1IEBA IFBsYXRmb3JtV2ViVmlldzo6flBsYXRmb3JtV2ViVmlldygpCiAgICAgZ3RrX3dpZGdldF9kZXN0 cm95KG1fd2luZG93KTsKIH0KIAordm9pZCBQbGF0Zm9ybVdlYlZpZXc6OmluaXRpYWxpemUoV0tQ YWdlQ29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uKQoreworICAgIG1fd2luZG93ID0gZ3Rr X3dpbmRvd19uZXcoR1RLX1dJTkRPV19UT1BMRVZFTCk7CisgICAgbV92aWV3ID0gV0tWaWV3Q3Jl YXRlKGNvbmZpZ3VyYXRpb24pOworICAgIGd0a19jb250YWluZXJfYWRkKEdUS19DT05UQUlORVIo bV93aW5kb3cpLCBHVEtfV0lER0VUKG1fdmlldykpOworICAgIGd0a193aWRnZXRfc2hvdyhHVEtf V0lER0VUKG1fdmlldykpOworICAgIGd0a193aWRnZXRfc2hvdyhtX3dpbmRvdyk7Cit9CisKIFdL UGFnZVJlZiBQbGF0Zm9ybVdlYlZpZXc6OnBhZ2UoKSBjb25zdAogewogICAgIHJldHVybiBXS1Zp ZXdHZXRQYWdlKG1fdmlldyk7CmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2d0 ay9QbGF0Zm9ybVdlYlZpZXdHdGsuY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9ndGsvUGxh dGZvcm1XZWJWaWV3R3RrLmNwcAppbmRleCA5MjBmNmY4Li5hMmU2MjY1IDEwMDY0NAotLS0gYS9U b29scy9XZWJLaXRUZXN0UnVubmVyL2d0ay9QbGF0Zm9ybVdlYlZpZXdHdGsuY3BwCisrKyBiL1Rv b2xzL1dlYktpdFRlc3RSdW5uZXIvZ3RrL1BsYXRmb3JtV2ViVmlld0d0ay5jcHAKQEAgLTM3LDcg KzM3LDcgQEAKIG5hbWVzcGFjZSBXVFIgewogCiBQbGF0Zm9ybVdlYlZpZXc6OlBsYXRmb3JtV2Vi VmlldyhXS1BhZ2VDb25maWd1cmF0aW9uUmVmIGNvbmZpZ3VyYXRpb24sIGNvbnN0IFZpZXdPcHRp b25zJiBvcHRpb25zKQotICAgIDogbV92aWV3KFdLVmlld0NyZWF0ZShXS1BhZ2VDb25maWd1cmF0 aW9uR2V0Q29udGV4dChjb25maWd1cmF0aW9uKSwgV0tQYWdlQ29uZmlndXJhdGlvbkdldFBhZ2VH cm91cChjb25maWd1cmF0aW9uKSwgV0tQYWdlQ29uZmlndXJhdGlvbkdldFJlbGF0ZWRQYWdlKGNv bmZpZ3VyYXRpb24pKSkKKyAgICA6IG1fdmlldyhXS1ZpZXdDcmVhdGUoY29uZmlndXJhdGlvbikp CiAgICAgLCBtX3dpbmRvdyhndGtfd2luZG93X25ldyhHVEtfV0lORE9XX1BPUFVQKSkKICAgICAs IG1fd2luZG93SXNLZXkodHJ1ZSkKICAgICAsIG1fb3B0aW9ucyhvcHRpb25zKQo=