105071 2012-12-14 16:58:45 -0800 [chromium] Move ownership of WebLayerTreeView to WebWidgetClient 2012-12-17 10:45:53 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jamesr jamesr abarth dglazkov enne fishd tkent+wkapi webkit.review.bot oldest_to_newest 791976 0 jamesr 2012-12-14 16:58:45 -0800 [chromium] Move creation of WebLayerTreeView to WebWidgetClient 792003 1 179568 jamesr 2012-12-14 17:57:15 -0800 Created attachment 179568 Patch 792004 2 jamesr 2012-12-14 17:58:50 -0800 This leaves ownership on the WebViewImpl side, which is a bit weird. In practice we never delete this thing until we destroy the WVI. I'll look at moving the ownership over. 792005 3 webkit.review.bot 2012-12-14 18:01:39 -0800 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 792011 4 179568 jamesr 2012-12-14 18:16:24 -0800 Comment on attachment 179568 Patch Hmm, I think it's probably going to be easier to move ownership while doing this change which implies some changes to the API. 792023 5 179573 jamesr 2012-12-14 18:47:53 -0800 Created attachment 179573 Patch 792053 6 jamesr 2012-12-14 22:41:57 -0800 Looks like it'd be fairly easy to move the settings to the other side of the world, since it's just pulling values that come out of WebPreferences. 792815 7 179573 enne 2012-12-17 10:11:20 -0800 Comment on attachment 179573 Patch R=me. It's definitely messy, but that's how the two-sided patches have to roll. 792839 8 179573 webkit.review.bot 2012-12-17 10:45:49 -0800 Comment on attachment 179573 Patch Clearing flags on attachment: 179573 Committed r137921: <http://trac.webkit.org/changeset/137921> 792840 9 webkit.review.bot 2012-12-17 10:45:53 -0800 All reviewed patches have been landed. Closing bug. 179568 2012-12-14 17:57:15 -0800 2012-12-14 18:47:51 -0800 Patch bug-105071-20121214175435.patch text/plain 4812 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3NzY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDU3YzYwNmI3ODUwNTJhMDUzNGVjYzI4Y2NlNTRmZWI2YmMxY2FkZjUuLmQ4YmY3ZWQyZTEzN2I3 OWQ4NDg1YjhjMmUxNjk5MzFlYTE3NTlmOTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTggQEAKKzIwMTItMTItMTQgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9t aXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIE1vdmUgY3JlYXRpb24gb2YgV2ViTGF5ZXJU cmVlVmlldyB0byBXZWJXaWRnZXRDbGllbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEwNTA3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoaXMgbW92ZXMgcmVzcG9uc2liaWxpdHkgZm9yIGNyZWF0aW5n IHRoZSBXZWJMYXllclRyZWVWaWV3IG91dCB0byB0aGUgZW1iZWRkZXIncyBzaWRlLgorCisgICAg ICAgICogcHVibGljL1dlYldpZGdldENsaWVudC5oOgorICAgICAgICAoV2ViV2lkZ2V0Q2xpZW50 KToKKyAgICAgICAgKFdlYktpdDo6V2ViV2lkZ2V0Q2xpZW50OjpjcmVhdGVMYXllclRyZWVWaWV3 KToKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJW aWV3SW1wbDo6c2V0SXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKToKKwogMjAxMi0xMi0x NCAgWXVzdWYgT3p1eXNhbCAgPHl1c3Vmb0Bnb29nbGUuY29tPgogCiAgICAgICAgIFNlbmQgYSBt ZXNzYWdlIGZyb20gV2ViVmlld0ltcGwgdG8gdGhlIGNvbXBvc2l0b3IgdG8gaW5mb3JtIGFib3V0 IGVuZCBvZiBmbGluZ3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYldpZGdldENsaWVudC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViV2lk Z2V0Q2xpZW50LmgKaW5kZXggODk0NTdjZTM4MjBjNDY3MTI4MThiYzhmMWQ4MWU2ZTE2MGNlNjMx Ny4uZDRlNmJiNmVkN2JlYTM1ZDZmMjA2ZDg2YjM5MzE4MGFiNzUwY2I2MCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViV2lkZ2V0Q2xpZW50LmgKKysrIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViV2lkZ2V0Q2xpZW50LmgKQEAgLTM1LDYgKzM1 LDcgQEAKICNpbmNsdWRlICJXZWJTY3JlZW5JbmZvLmgiCiAjaW5jbHVkZSAicGxhdGZvcm0vV2Vi Q29tbW9uLmgiCiAjaW5jbHVkZSAicGxhdGZvcm0vV2ViUmVjdC5oIgorI2luY2x1ZGUgPHB1Ymxp Yy9XZWJMYXllclRyZWVWaWV3Lmg+CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCkBAIC02NCw2ICs2 NSw5IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgZGlkQWN0aXZhdGVDb21wb3NpdG9yKGlu dCBpbnB1dEhhbmRsZXJJZGVudGlmaWVyKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgZGlkRGVhY3Rp dmF0ZUNvbXBvc2l0b3IoKSB7IH0KIAorICAgIC8vIENyZWF0ZSBhIHZpZXcgc3VpdGFibGUgZm9y IGNvbXBvc2l0aW5nIHRoaXMgd2lkZ2V0LgorICAgIHZpcnR1YWwgV2ViTGF5ZXJUcmVlVmlldyog Y3JlYXRlTGF5ZXJUcmVlVmlldyhXZWJMYXllclRyZWVWaWV3Q2xpZW50KiwgY29uc3QgV2ViTGF5 ZXImIHJvb3RMYXllciwgY29uc3QgV2ViTGF5ZXJUcmVlVmlldzo6U2V0dGluZ3MmKSB7IHJldHVy biAwOyB9CisKICAgICAvLyBJbmRpY2F0ZXMgdG8gdGhlIGVtYmVkZGVyIHRoYXQgdGhlIGNvbXBv c2l0b3IgaXMgYWJvdXQgdG8gYmVnaW4gYQogICAgIC8vIGZyYW1lLiBUaGlzIGlzIHByaW1hcmls eSB0byBzaWduYWwgdG8gZmxvdyBjb250cm9sIG1lY2hhbmlzbXMgdGhhdCBhCiAgICAgLy8gZnJh bWUgaXMgYmVnaW5uaW5nLCBub3QgdG8gcGVyZm9ybSBhY3R1YWwgcGFpbnRpbmcgd29yay4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcCBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAppbmRleCA4ZmZkZjUzYmE3 ZDcwZWVkMzY2NWRmMjNmYmY1YTExNWYxNWZmYWEzLi40ODU3MTc0ZDc1NDY4ZDc3NWYzYjVhNzhl YzkyMzNjNDQyY2VhMzg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9X ZWJWaWV3SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0lt cGwuY3BwCkBAIC00MDIzLDcgKzQwMjMsOSBAQCB2b2lkIFdlYlZpZXdJbXBsOjpzZXRJc0FjY2Vs ZXJhdGVkQ29tcG9zaXRpbmdBY3RpdmUoYm9vbCBhY3RpdmUpCiAgICAgICAgIG1fbm9uQ29tcG9z aXRlZENvbnRlbnRIb3N0LT5zZXRTaG93RGVidWdCb3JkZXJzKHBhZ2UoKS0+c2V0dGluZ3MoKS0+ c2hvd0RlYnVnQm9yZGVycygpKTsKICAgICAgICAgbV9ub25Db21wb3NpdGVkQ29udGVudEhvc3Qt PnNldE9wYXF1ZSghaXNUcmFuc3BhcmVudCgpKTsKIAotICAgICAgICBtX2xheWVyVHJlZVZpZXcg PSBhZG9wdFB0cihQbGF0Zm9ybTo6Y3VycmVudCgpLT5jb21wb3NpdG9yU3VwcG9ydCgpLT5jcmVh dGVMYXllclRyZWVWaWV3KHRoaXMsICptX3Jvb3RMYXllciwgbGF5ZXJUcmVlVmlld1NldHRpbmdz KSk7CisgICAgICAgIG1fbGF5ZXJUcmVlVmlldyA9IGFkb3B0UHRyKG1fY2xpZW50LT5jcmVhdGVM YXllclRyZWVWaWV3KHRoaXMsICptX3Jvb3RMYXllciwgbGF5ZXJUcmVlVmlld1NldHRpbmdzKSk7 CisgICAgICAgIGlmICghbV9sYXllclRyZWVWaWV3KQorICAgICAgICAgICAgbV9sYXllclRyZWVW aWV3ID0gYWRvcHRQdHIoUGxhdGZvcm06OmN1cnJlbnQoKS0+Y29tcG9zaXRvclN1cHBvcnQoKS0+ Y3JlYXRlTGF5ZXJUcmVlVmlldyh0aGlzLCAqbV9yb290TGF5ZXIsIGxheWVyVHJlZVZpZXdTZXR0 aW5ncykpOwogICAgICAgICBpZiAobV9sYXllclRyZWVWaWV3KSB7CiAgICAgICAgICAgICBpZiAo bV93ZWJTZXR0aW5ncy0+YXBwbHlEZXZpY2VTY2FsZUZhY3RvckluQ29tcG9zaXRvcigpICYmIHBh Z2UoKS0+ZGV2aWNlU2NhbGVGYWN0b3IoKSAhPSAxKSB7CiAgICAgICAgICAgICAgICAgQVNTRVJU KHBhZ2UoKS0+ZGV2aWNlU2NhbGVGYWN0b3IoKSk7CmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVu ZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9j aHJvbWl1bS9XZWJWaWV3SG9zdC5jcHAKaW5kZXggOGZlOGEzZWZhNWI3Zjg4ZGY0YjcxZDIyODYx ZGZiY2VkOTgwNDhiNS4uNzVkZWFiNmMxMDk5NDU1ZGQ5NzhhMTIxZGRiMDVjZWNkY2Q1OTcyYyAx MDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuY3Bw CisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmNwcApAQCAt Njg5LDYgKzY4OSwxMSBAQCB2b2lkIFdlYlZpZXdIb3N0OjpkaWRBdXRvUmVzaXplKGNvbnN0IFdl YlNpemUmIG5ld1NpemUpCiAgICAgc2V0V2luZG93UmVjdChXZWJSZWN0KDAsIDAsIG5ld1NpemUu d2lkdGgsIG5ld1NpemUuaGVpZ2h0KSk7CiB9CiAKK1dlYkxheWVyVHJlZVZpZXcqIFdlYlZpZXdI b3N0OjpjcmVhdGVMYXllclRyZWVWaWV3KFdlYkxheWVyVHJlZVZpZXdDbGllbnQqIGNsaWVudCwg Y29uc3QgV2ViTGF5ZXImIHJvb3RMYXllciwgY29uc3QgV2ViTGF5ZXJUcmVlVmlldzo6U2V0dGlu Z3MmIHNldHRpbmdzKQoreworICAgIHJldHVybiBQbGF0Zm9ybTo6Y3VycmVudCgpLT5jb21wb3Np dG9yU3VwcG9ydCgpLT5jcmVhdGVMYXllclRyZWVWaWV3KGNsaWVudCwgcm9vdExheWVyLCBzZXR0 aW5ncyk7Cit9CisKIHZvaWQgV2ViVmlld0hvc3Q6OnNjaGVkdWxlQW5pbWF0aW9uKCkKIHsKICAg ICBpZiAod2ViVmlldygpLT5zZXR0aW5ncygpLT5zY3JvbGxBbmltYXRvckVuYWJsZWQoKSkKZGlm ZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmggYi9U b29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5oCmluZGV4IDgwMGQwYWZm MTEyMDUxNGVlMDI3OWIzNThkZWFhYzFlMWU0MmJhODAuLmVlMzM1MjI0MzBjOTNhNzY2ZWViZTYx OWQ5NDk3NDQ5MDIxOGIzZjUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9t aXVtL1dlYlZpZXdIb3N0LmgKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2Vi Vmlld0hvc3QuaApAQCAtMjExLDYgKzIxMSw3IEBAIGNsYXNzIFdlYlZpZXdIb3N0IDogcHVibGlj IFdlYktpdDo6V2ViVmlld0NsaWVudCwgcHVibGljIFdlYktpdDo6V2ViRnJhbWVDbGllbnQsCiAK ICAgICAvLyBXZWJLaXQ6OldlYldpZGdldENsaWVudAogICAgIHZpcnR1YWwgdm9pZCBkaWRBdXRv UmVzaXplKGNvbnN0IFdlYktpdDo6V2ViU2l6ZSYgbmV3U2l6ZSk7CisgICAgdmlydHVhbCBXZWJL aXQ6OldlYkxheWVyVHJlZVZpZXcqIGNyZWF0ZUxheWVyVHJlZVZpZXcoV2ViS2l0OjpXZWJMYXll clRyZWVWaWV3Q2xpZW50KiwgY29uc3QgV2ViS2l0OjpXZWJMYXllciYgcm9vdExheWVyLCBjb25z dCBXZWJLaXQ6OldlYkxheWVyVHJlZVZpZXc6OlNldHRpbmdzJik7CiAgICAgdmlydHVhbCB2b2lk IHNjaGVkdWxlQW5pbWF0aW9uKCk7CiAgICAgdmlydHVhbCB2b2lkIGRpZEZvY3VzKCk7CiAgICAg dmlydHVhbCB2b2lkIGRpZEJsdXIoKTsK 179573 2012-12-14 18:47:53 -0800 2012-12-17 10:45:49 -0800 Patch bug-105071-20121214184512.patch text/plain 8586 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3NzkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGQyMmE2OTkyMjBiZWZhZTBlMDk5NTBlMDY4ZTBjOWYzZTA5MTJkN2EuLjE4NzI5ZGUzM2UzZmRh NmYwODFkZjQzYWVkOTJkM2M2ODk4ODJiOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjUgQEAKKzIwMTItMTItMTQgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9t aXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIE1vdmUgb3duZXJzaGlwIG9mIFdlYkxheWVy VHJlZVZpZXcgdG8gV2ViV2lkZ2V0Q2xpZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMDUwNzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGlzIG1vdmVzIG93bmVyc2hpcCBvZiBhIGdpdmVuIFdlYldp ZGdldCdzIFdlYkxheWVyVHJlZVZpZXcgZnJvbSBXZWJWaWV3SW1wbCBvdXQgdG8gdGhlIGVtYmVk ZGVyIGJ5IHdheSBvZgorICAgICAgICBXZWJXaWRnZXRDbGllbnQuIFRvIGRlYWwgd2l0aCB0aGUg dHdvLXNpZGVkIG5hdHVyZSBvZiB0aGUgcGF0Y2gsIGlmIGNvbnN0cnVjdGlvbiBieSB0aGUgbmV3 IHBhdGggZmFpbHMKKyAgICAgICAgV2ViVmlld0ltcGwgY29uc3RydWN0cyBhIFdlYkxheWVyVHJl ZVZpZXcgYnkgdGhlIG9sZCBwYXRoLCB3aGljaCBtZWFucyBpdCBrZWVwcyBvd25lcnNoaXAuCisK KyAgICAgICAgKiBwdWJsaWMvV2ViV2lkZ2V0Q2xpZW50Lmg6CisgICAgICAgIChXZWJXaWRnZXRD bGllbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJXaWRnZXRDbGllbnQ6OmluaXRpYWxpemVMYXll clRyZWVWaWV3KToKKyAgICAgICAgKFdlYktpdDo6V2ViV2lkZ2V0Q2xpZW50OjpsYXllclRyZWVW aWV3KToKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJWaWV3SW1wbDo6V2ViVmlld0ltcGwpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6 fldlYlZpZXdJbXBsKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OndlYkxheWVyVHJl ZVZpZXcpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6c2V0SXNBY2NlbGVyYXRlZENv bXBvc2l0aW5nQWN0aXZlKToKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuaDoKKwogMjAxMi0x Mi0xNCAgRGFuIEFsY2FudGFyYSAgPGRmYWxjYW50YXJhQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBXZWJWaWV3SW1wbDo6cmVzZXRTY3JvbGxBbmRTY2FsZVN0YXRlKCkgY2F1c2VzIHRoZSBwYWdl IHRvIHJlbmRlciBpbmNvcnJlY3RseQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViV2lkZ2V0Q2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJXaWRnZXRDbGllbnQuaAppbmRleCA4OTQ1N2NlMzgyMGM0NjcxMjgxOGJjOGYxZDgxZTZl MTYwY2U2MzE3Li5hNGM4YzRlNTEwN2E3YTE1ZDhmMzY4MjlkODhjY2ExNTcxMmFjMTQ5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJXaWRnZXRDbGllbnQuaAor KysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJXaWRnZXRDbGllbnQuaApAQCAt MzUsNiArMzUsNyBAQAogI2luY2x1ZGUgIldlYlNjcmVlbkluZm8uaCIKICNpbmNsdWRlICJwbGF0 Zm9ybS9XZWJDb21tb24uaCIKICNpbmNsdWRlICJwbGF0Zm9ybS9XZWJSZWN0LmgiCisjaW5jbHVk ZSA8cHVibGljL1dlYkxheWVyVHJlZVZpZXcuaD4KIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKQEAg LTY0LDYgKzY1LDE1IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgZGlkQWN0aXZhdGVDb21w b3NpdG9yKGludCBpbnB1dEhhbmRsZXJJZGVudGlmaWVyKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQg ZGlkRGVhY3RpdmF0ZUNvbXBvc2l0b3IoKSB7IH0KIAorICAgIC8vIEF0dGVtcHQgdG8gaW5pdGlh bGl6ZSBjb21wb3NpdGluZyBmb3IgdGhpcyB3aWRnZXQgdXNpbmcgdGhlIGdpdmVuCisgICAgLy8g cGFyYW1ldGVycy4gSWYgdGhpcyBpcyBzdWNjZXNzZnVsLCBsYXllclRyZWVWaWV3KCkgd2lsbCBy ZXR1cm4gYSB2YWxpZAorICAgIC8vIFdlYkxheWVyVHJlZVZpZXcuIElmIG5vdCwgbm90aGluZyBo YXBwZW5zLgorICAgIHZpcnR1YWwgdm9pZCBpbml0aWFsaXplTGF5ZXJUcmVlVmlldyhXZWJMYXll clRyZWVWaWV3Q2xpZW50KiwgY29uc3QgV2ViTGF5ZXImIHJvb3RMYXllciwgY29uc3QgV2ViTGF5 ZXJUcmVlVmlldzo6U2V0dGluZ3MmKSB7IH0KKworICAgIC8vIFJldHVybiBhIGNvbXBvc2l0aW5n IHZpZXcgdXNlZCBmb3IgdGhpcyB3aWRnZXQuIFRoaXMgaXMgb3duZWQgYnkgdGhlCisgICAgLy8g V2ViV2lkZ2V0Q2xpZW50LgorICAgIHZpcnR1YWwgV2ViTGF5ZXJUcmVlVmlldyogbGF5ZXJUcmVl VmlldygpIHsgcmV0dXJuIDA7IH0KKwogICAgIC8vIEluZGljYXRlcyB0byB0aGUgZW1iZWRkZXIg dGhhdCB0aGUgY29tcG9zaXRvciBpcyBhYm91dCB0byBiZWdpbiBhCiAgICAgLy8gZnJhbWUuIFRo aXMgaXMgcHJpbWFyaWx5IHRvIHNpZ25hbCB0byBmbG93IGNvbnRyb2wgbWVjaGFuaXNtcyB0aGF0 IGEKICAgICAvLyBmcmFtZSBpcyBiZWdpbm5pbmcsIG5vdCB0byBwZXJmb3JtIGFjdHVhbCBwYWlu dGluZyB3b3JrLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmll d0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCmlu ZGV4IDY1MDY1YmY1ODJiOWFhOTczNjk2YTFkMTY2Y2IwMTgzZDU5NTkxZmIuLjk2ZjI5MDBlZTU0 NTU4YWVmODY3NTVhMGUyZWUzYjgzNDc0ZjE5ZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTQxOCw2ICs0MTgsOCBAQCBXZWJWaWV3SW1wbDo6V2Vi Vmlld0ltcGwoV2ViVmlld0NsaWVudCogY2xpZW50KQogICAgICwgbV9pc0NhbmNlbGluZ0Z1bGxT Y3JlZW4oZmFsc2UpCiAgICAgLCBtX2JlbmNobWFya1N1cHBvcnQodGhpcykKICNpZiBVU0UoQUND RUxFUkFURURfQ09NUE9TSVRJTkcpCisgICAgLCBtX2xheWVyVHJlZVZpZXcoMCkKKyAgICAsIG1f b3duc0xheWVyVHJlZVZpZXcoZmFsc2UpCiAgICAgLCBtX3Jvb3RMYXllcigwKQogICAgICwgbV9y b290R3JhcGhpY3NMYXllcigwKQogICAgICwgbV9pc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdBY3Rp dmUoZmFsc2UpCkBAIC01MDksNiArNTExLDggQEAgV2ViVmlld0ltcGw6OldlYlZpZXdJbXBsKFdl YlZpZXdDbGllbnQqIGNsaWVudCkKIAogV2ViVmlld0ltcGw6On5XZWJWaWV3SW1wbCgpCiB7Cisg ICAgaWYgKG1fb3duc0xheWVyVHJlZVZpZXcpCisgICAgICAgIGRlbGV0ZSBtX2xheWVyVHJlZVZp ZXc7CiAgICAgQVNTRVJUKCFtX3BhZ2UpOwogfQogCkBAIC0xNzMxLDcgKzE3MzUsNyBAQCB2b2lk IFdlYlZpZXdJbXBsOjpzZXRDb21wb3NpdG9yU3VyZmFjZVJlYWR5KCkKIAogV2ViTGF5ZXJUcmVl VmlldyogV2ViVmlld0ltcGw6OndlYkxheWVyVHJlZVZpZXcoKQogewotICAgIHJldHVybiBtX2xh eWVyVHJlZVZpZXcuZ2V0KCk7CisgICAgcmV0dXJuIG1fbGF5ZXJUcmVlVmlldzsKIH0KIAogdm9p ZCBXZWJWaWV3SW1wbDo6YW5pbWF0ZShkb3VibGUpCkBAIC00MDI3LDcgKzQwMzEsMTIgQEAgdm9p ZCBXZWJWaWV3SW1wbDo6c2V0SXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKGJvb2wgYWN0 aXZlKQogICAgICAgICBtX25vbkNvbXBvc2l0ZWRDb250ZW50SG9zdC0+c2V0U2hvd0RlYnVnQm9y ZGVycyhwYWdlKCktPnNldHRpbmdzKCktPnNob3dEZWJ1Z0JvcmRlcnMoKSk7CiAgICAgICAgIG1f bm9uQ29tcG9zaXRlZENvbnRlbnRIb3N0LT5zZXRPcGFxdWUoIWlzVHJhbnNwYXJlbnQoKSk7CiAK LSAgICAgICAgbV9sYXllclRyZWVWaWV3ID0gYWRvcHRQdHIoUGxhdGZvcm06OmN1cnJlbnQoKS0+ Y29tcG9zaXRvclN1cHBvcnQoKS0+Y3JlYXRlTGF5ZXJUcmVlVmlldyh0aGlzLCAqbV9yb290TGF5 ZXIsIGxheWVyVHJlZVZpZXdTZXR0aW5ncykpOworICAgICAgICBtX2NsaWVudC0+aW5pdGlhbGl6 ZUxheWVyVHJlZVZpZXcodGhpcywgKm1fcm9vdExheWVyLCBsYXllclRyZWVWaWV3U2V0dGluZ3Mp OworICAgICAgICBtX2xheWVyVHJlZVZpZXcgPSBtX2NsaWVudC0+bGF5ZXJUcmVlVmlldygpOwor ICAgICAgICBpZiAoIW1fbGF5ZXJUcmVlVmlldykgeworICAgICAgICAgICAgbV9sYXllclRyZWVW aWV3ID0gUGxhdGZvcm06OmN1cnJlbnQoKS0+Y29tcG9zaXRvclN1cHBvcnQoKS0+Y3JlYXRlTGF5 ZXJUcmVlVmlldyh0aGlzLCAqbV9yb290TGF5ZXIsIGxheWVyVHJlZVZpZXdTZXR0aW5ncyk7Cisg ICAgICAgICAgICBtX293bnNMYXllclRyZWVWaWV3ID0gdHJ1ZTsKKyAgICAgICAgfQogICAgICAg ICBpZiAobV9sYXllclRyZWVWaWV3KSB7CiAgICAgICAgICAgICBpZiAobV93ZWJTZXR0aW5ncy0+ YXBwbHlEZXZpY2VTY2FsZUZhY3RvckluQ29tcG9zaXRvcigpICYmIHBhZ2UoKS0+ZGV2aWNlU2Nh bGVGYWN0b3IoKSAhPSAxKSB7CiAgICAgICAgICAgICAgICAgQVNTRVJUKHBhZ2UoKS0+ZGV2aWNl U2NhbGVGYWN0b3IoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9X ZWJWaWV3SW1wbC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaApp bmRleCBlZDRhNDk4MTdmMGIyYTY2NGM4ZTE5NDNkMTA5NzVjOGQzMTAxOWViLi40MjU5NTljMTg1 YWMyYjY4M2UyMjZiZDRiYzUyZDYyODI5MmFjODA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYlZpZXdJbXBsLmgKQEAgLTgzNyw3ICs4MzcsOCBAQCBwcml2YXRlOgogI2lmIFVTRShB Q0NFTEVSQVRFRF9DT01QT1NJVElORykKICAgICBXZWJDb3JlOjpJbnRSZWN0IG1fcm9vdExheWVy U2Nyb2xsRGFtYWdlOwogICAgIE93blB0cjxOb25Db21wb3NpdGVkQ29udGVudEhvc3Q+IG1fbm9u Q29tcG9zaXRlZENvbnRlbnRIb3N0OwotICAgIE93blB0cjxXZWJMYXllclRyZWVWaWV3PiBtX2xh eWVyVHJlZVZpZXc7CisgICAgV2ViTGF5ZXJUcmVlVmlldyogbV9sYXllclRyZWVWaWV3OworICAg IGJvb2wgbV9vd25zTGF5ZXJUcmVlVmlldzsKICAgICBXZWJMYXllciogbV9yb290TGF5ZXI7CiAg ICAgV2ViQ29yZTo6R3JhcGhpY3NMYXllciogbV9yb290R3JhcGhpY3NMYXllcjsKICAgICBib29s IG1faXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hh bmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGNiZTg3YjBkNDFmZDIxMzY2Zjk0Nzc5ZGEz YWFmZDA0NDk3YWJjNzguLjVhZTg1MmFiZGEzZTI0M2IwY2Q3NDYxZjdlODNhNTM4M2JmNDQzNWYg MTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAxMi0xMi0xNCAgSmFtZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0u b3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gTW92ZSBjcmVhdGlvbiBvZiBXZWJMYXllclRyZWVW aWV3IHRvIFdlYldpZGdldENsaWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTA1MDcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVXBkYXRlIFdlYlZpZXdIb3N0IGZvciB0aGUgbmV3IFdlYldpZGdldENs aWVudCBpbnRlcmZhY2UuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJW aWV3SG9zdC5jcHA6CisgICAgICAgIChXZWJWaWV3SG9zdDo6aW5pdGlhbGl6ZUxheWVyVHJlZVZp ZXcpOgorICAgICAgICAoV2ViVmlld0hvc3Q6OmxheWVyVHJlZVZpZXcpOgorICAgICAgICAoV2Vi Vmlld0hvc3Q6On5XZWJWaWV3SG9zdCk6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21p dW0vV2ViVmlld0hvc3QuaDoKKyAgICAgICAgKFdlYlZpZXdIb3N0KToKKwogMjAxMi0xMi0xNCAg RGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4KIAogICAgICAgICB3ZWJraXRweTog bWFrZSBwb3J0X25hbWUgYSByZXF1aXJlZCBwYXJhbWV0ZXIgdG8gdGhlIG5vbi10ZXN0IHBvcnRz CmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5j cHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5jcHAKaW5kZXgg OGZlOGEzZWZhNWI3Zjg4ZGY0YjcxZDIyODYxZGZiY2VkOTgwNDhiNS4uMWU4OGY3ZTNkZjQyZjY3 ODJkNDVkNTAwNDY2ZmMyMmY3NTFhODM5ZiAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRy ZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2No cm9taXVtL1dlYlZpZXdIb3N0LmNwcApAQCAtNjg5LDYgKzY4OSwxNiBAQCB2b2lkIFdlYlZpZXdI b3N0OjpkaWRBdXRvUmVzaXplKGNvbnN0IFdlYlNpemUmIG5ld1NpemUpCiAgICAgc2V0V2luZG93 UmVjdChXZWJSZWN0KDAsIDAsIG5ld1NpemUud2lkdGgsIG5ld1NpemUuaGVpZ2h0KSk7CiB9CiAK K3ZvaWQgV2ViVmlld0hvc3Q6OmluaXRpYWxpemVMYXllclRyZWVWaWV3KFdlYkxheWVyVHJlZVZp ZXdDbGllbnQqIGNsaWVudCwgY29uc3QgV2ViTGF5ZXImIHJvb3RMYXllciwgY29uc3QgV2ViTGF5 ZXJUcmVlVmlldzo6U2V0dGluZ3MmIHNldHRpbmdzKQoreworICAgIG1fbGF5ZXJUcmVlVmlldyA9 IGFkb3B0UHRyKFBsYXRmb3JtOjpjdXJyZW50KCktPmNvbXBvc2l0b3JTdXBwb3J0KCktPmNyZWF0 ZUxheWVyVHJlZVZpZXcoY2xpZW50LCByb290TGF5ZXIsIHNldHRpbmdzKSk7Cit9CisKK1dlYkxh eWVyVHJlZVZpZXcqIFdlYlZpZXdIb3N0OjpsYXllclRyZWVWaWV3KCkKK3sKKyAgICByZXR1cm4g bV9sYXllclRyZWVWaWV3LmdldCgpOworfQorCiB2b2lkIFdlYlZpZXdIb3N0OjpzY2hlZHVsZUFu aW1hdGlvbigpCiB7CiAgICAgaWYgKHdlYlZpZXcoKS0+c2V0dGluZ3MoKS0+c2Nyb2xsQW5pbWF0 b3JFbmFibGVkKCkpCkBAIC0xNDM3LDYgKzE0NDcsNyBAQCBXZWJWaWV3SG9zdDo6fldlYlZpZXdI b3N0KCkKICAgICAgICAgIGl0IDwgbV9wb3B1cG1lbnVzLmVuZCgpOyArK2l0KQogICAgICAgICAo Kml0KS0+Y2xvc2UoKTsKIAorICAgIG1fbGF5ZXJUcmVlVmlldy5jbGVhcigpOwogICAgIHdlYldp ZGdldCgpLT5jbG9zZSgpOwogICAgIGlmIChtX2luTW9kYWxMb29wKQogICAgICAgICB3ZWJraXRf c3VwcG9ydDo6UXVpdE1lc3NhZ2VMb29wKCk7CmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVy VHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5oIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21p dW0vV2ViVmlld0hvc3QuaAppbmRleCA4MDBkMGFmZjExMjA1MTRlZTAyNzliMzU4ZGVhYWMxZTFl NDJiYTgwLi4xNjJkMWE0MmVkNTM2OGNmNjU0NGVmODVmNWQwNWQwMDdlMjhlODg0IDEwMDY0NAot LS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5oCisrKyBiL1Rv b2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmgKQEAgLTIxMSw2ICsyMTEs OCBAQCBjbGFzcyBXZWJWaWV3SG9zdCA6IHB1YmxpYyBXZWJLaXQ6OldlYlZpZXdDbGllbnQsIHB1 YmxpYyBXZWJLaXQ6OldlYkZyYW1lQ2xpZW50LAogCiAgICAgLy8gV2ViS2l0OjpXZWJXaWRnZXRD bGllbnQKICAgICB2aXJ0dWFsIHZvaWQgZGlkQXV0b1Jlc2l6ZShjb25zdCBXZWJLaXQ6OldlYlNp emUmIG5ld1NpemUpOworICAgIHZpcnR1YWwgdm9pZCBpbml0aWFsaXplTGF5ZXJUcmVlVmlldyhX ZWJLaXQ6OldlYkxheWVyVHJlZVZpZXdDbGllbnQqLCBjb25zdCBXZWJLaXQ6OldlYkxheWVyJiBy b290TGF5ZXIsIGNvbnN0IFdlYktpdDo6V2ViTGF5ZXJUcmVlVmlldzo6U2V0dGluZ3MmKTsKKyAg ICB2aXJ0dWFsIFdlYktpdDo6V2ViTGF5ZXJUcmVlVmlldyogbGF5ZXJUcmVlVmlldygpOwogICAg IHZpcnR1YWwgdm9pZCBzY2hlZHVsZUFuaW1hdGlvbigpOwogICAgIHZpcnR1YWwgdm9pZCBkaWRG b2N1cygpOwogICAgIHZpcnR1YWwgdm9pZCBkaWRCbHVyKCk7CkBAIC00NjMsNiArNDY1LDggQEAg cHJpdmF0ZToKIAogICAgIC8vIEZvciB3ZWIgaW50ZW50czogaG9sZHMgdGhlIGN1cnJlbnQgcmVx dWVzdCwgaWYgYW55LgogICAgIFdlYktpdDo6V2ViSW50ZW50UmVxdWVzdCBtX2N1cnJlbnRSZXF1 ZXN0OworCisgICAgT3duUHRyPFdlYktpdDo6V2ViTGF5ZXJUcmVlVmlldz4gbV9sYXllclRyZWVW aWV3OwogfTsKIAogI2VuZGlmIC8vIFdlYlZpZXdIb3N0X2gK