80057 2012-03-01 15:19:45 -0800 [chromium] Pass WebNavigationPolicy to WebViewClient::createView 2012-03-05 11:50:28 -0800 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 creis creis abarth fishd tkent webkit.review.bot oldest_to_newest 568971 0 creis 2012-03-01 15:19:45 -0800 For the Chromium port, we would like to know the window disposition (e.g., background/foreground tab/window) inside WebViewClient::createView. Chromium's WebNavigationPolicy enum tracks the window disposition, and it is currently stored as a member of FrameLoaderClientImpl from dispatchDecidePolicyForNewWindowAction until dispatchCreatePage, where it gets passed to WebViewImpl for use in show. To make it available to createView, we also need to change dispatchCreatePage to give it to ChromeClientImpl. This is useful for opening new window navigations in a new process, as part of http://crbug.com/69267. 568977 1 129757 creis 2012-03-01 15:25:01 -0800 Created attachment 129757 Patch 568995 2 129757 buildbot 2012-03-01 15:43:28 -0800 Comment on attachment 129757 Patch Attachment 129757 did not pass win-ews (win): Output: http://queues.webkit.org/results/11767628 569003 3 creis 2012-03-01 15:50:11 -0800 Note: the current patch isn't quite right yet, but it shows the general intent. There are some paths we can take to ChromeClientImpl::createWindow without going through FrameLoaderClientImpl::dispatchCreatePage, in which case we don't set the WebNavigationPolicy first. As a result, we fail the assert. 569974 4 129757 fishd 2012-03-02 15:07:05 -0800 Comment on attachment 129757 Patch This is what I was expecting... 569991 5 129966 creis 2012-03-02 15:34:32 -0800 Created attachment 129966 Patch 569993 6 webkit.review.bot 2012-03-02 15:36:44 -0800 Please wait for approval from fishd@chromium.org before submitting because this patch contains changes to the Chromium public API. 569995 7 129966 fishd 2012-03-02 15:38:14 -0800 Comment on attachment 129966 Patch That makes sense. R=me 570903 8 129966 webkit.review.bot 2012-03-05 11:50:23 -0800 Comment on attachment 129966 Patch Clearing flags on attachment: 129966 Committed r109778: <http://trac.webkit.org/changeset/109778> 570904 9 webkit.review.bot 2012-03-05 11:50:28 -0800 All reviewed patches have been landed. Closing bug. 129757 2012-03-01 15:25:01 -0800 2012-03-02 15:34:30 -0800 Patch bug-80057-20120301152500.patch text/plain 6975 creis U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5NDM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDExZDEwMDBhMzk3ZWFiYzVmZTI5NzEyODc3MDI2MjIxNWJlMmE1YzAuLmZmZjQwOWI5MzQzOWE0 NmVjYmIxYTZmMGNkNDE5ZDMzNjgyYTRhMjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTItMDMtMDEgIENoYXJsaWUgUmVpcyAgPGNyZWlzQGNocm9taXVt Lm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIFBhc3MgV2ViTmF2aWdhdGlvblBvbGljeSB0byBX ZWJWaWV3Q2xpZW50OjpjcmVhdGVWaWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04MDA1NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogcHVibGljL1dlYlZpZXdDbGllbnQuaDoKKyAgICAgICAgKFdlYlZp ZXdDbGllbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3Q2xpZW50OjpjcmVhdGVWaWV3KToK KyAgICAgICAgKiBzcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkNo cm9tZUNsaWVudEltcGw6OkNocm9tZUNsaWVudEltcGwpOgorICAgICAgICAoV2ViS2l0OjpDaHJv bWVDbGllbnRJbXBsOjpjcmVhdGVXaW5kb3cpOgorICAgICAgICAoV2ViS2l0OjpDaHJvbWVDbGll bnRJbXBsOjpzZXROZXdXaW5kb3dOYXZpZ2F0aW9uUG9saWN5KToKKyAgICAgICAgKFdlYktpdCk6 CisgICAgICAgICogc3JjL0Nocm9tZUNsaWVudEltcGwuaDoKKyAgICAgICAgKENocm9tZUNsaWVu dEltcGwpOgorICAgICAgICAqIHNyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuY3BwOgorICAgICAg ICAoV2ViS2l0OjpGcmFtZUxvYWRlckNsaWVudEltcGw6OmRpc3BhdGNoQ3JlYXRlUGFnZSk6CisK IDIwMTItMDItMjkgIE5hdCBEdWNhICA8bmR1Y2FAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtj aHJvbWl1bV0gTW92ZSBjb250ZXh0IGxvc3QgY29udHJvbCBjb2RlIGZyb20gQ0NTaW5nbGVUaHJl YWRQcm94eSB0byBDQ0xheWVyVHJlZUhvc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vcHVibGljL1dlYlZpZXdDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVi bGljL1dlYlZpZXdDbGllbnQuaAppbmRleCBiNjU2ZmQ1YWRlNjhhNzU3ZGE0OTUxNTA4M2VjMDQx ZDQ3ZDZhODBkLi44MmU5NGI3YzhkMDNmMDBlM2UyYTdjMjBiY2Q0OGQ3ZjgyODU0NTJmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3Q2xpZW50LmgKKysr IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlld0NsaWVudC5oCkBAIC05Mywx MCArOTMsMTMgQEAgcHVibGljOgogICAgIC8vIFdlYlN0b3JhZ2Ugc3BlY2lmaWNhdGlvbi4KICAg ICAvLyBUaGUgcmVxdWVzdCBwYXJhbWV0ZXIgaXMgb25seSBmb3IgdGhlIGNsaWVudCB0byBjaGVj ayBpZiB0aGUgcmVxdWVzdAogICAgIC8vIGNvdWxkIGJlIGZ1bGZpbGxlZC4gIFRoZSBjbGllbnQg c2hvdWxkIG5vdCBsb2FkIHRoZSByZXF1ZXN0LgorICAgIC8vIFRoZSBwb2xpY3kgcGFyYW1ldGVy IGluZGljYXRlcyBob3cgdGhlIG5ldyB2aWV3IHdpbGwgYmUgZGlzcGxheWVkIGluCisgICAgLy8g V2ViV2lkZ2V0Q2xpZW50OjpzaG93LgogICAgIHZpcnR1YWwgV2ViVmlldyogY3JlYXRlVmlldyhX ZWJGcmFtZSogY3JlYXRvciwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3Qg V2ViVVJMUmVxdWVzdCYgcmVxdWVzdCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29uc3QgV2ViV2luZG93RmVhdHVyZXMmIGZlYXR1cmVzLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBjb25zdCBXZWJTdHJpbmcmIG5hbWUpIHsKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgY29uc3QgV2ViU3RyaW5nJiBuYW1lLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBXZWJOYXZpZ2F0aW9uUG9saWN5IHBvbGljeSkgewogICAgICAgICByZXR1cm4g MDsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9t ZUNsaWVudEltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50 SW1wbC5jcHAKaW5kZXggZTA4YzA3NDUwYzA3ZWYxMDdjN2U5NjY1YzRhMDUwNTM3NWE0MWZhZi4u MzI5ODk2MDFkM2Y4OWFmYmE2YzMwYmI3ZTkwYjJkYjFkZWM5ZmMzMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHAKKysrIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHAKQEAgLTEzNiw2ICsxMzYs NyBAQCBDaHJvbWVDbGllbnRJbXBsOjpDaHJvbWVDbGllbnRJbXBsKFdlYlZpZXdJbXBsKiB3ZWJW aWV3KQogICAgICwgbV9zY3JvbGxiYXJzVmlzaWJsZSh0cnVlKQogICAgICwgbV9tZW51YmFyVmlz aWJsZSh0cnVlKQogICAgICwgbV9yZXNpemFibGUodHJ1ZSkKKyAgICAsIG1fbmV4dE5ld1dpbmRv d05hdmlnYXRpb25Qb2xpY3koV2ViTmF2aWdhdGlvblBvbGljeUlnbm9yZSkKIHsKIH0KIApAQCAt MjM4LDEzICsyMzksMTcgQEAgUGFnZSogQ2hyb21lQ2xpZW50SW1wbDo6Y3JlYXRlV2luZG93KAog ICAgIGlmICghbV93ZWJWaWV3LT5jbGllbnQoKSkKICAgICAgICAgcmV0dXJuIDA7CiAKKyAgICBB U1NFUlQobV9uZXh0TmV3V2luZG93TmF2aWdhdGlvblBvbGljeSAhPSBXZWJOYXZpZ2F0aW9uUG9s aWN5SWdub3JlKTsKKyAgICBXZWJOYXZpZ2F0aW9uUG9saWN5IHBvbGljeSA9IG1fbmV4dE5ld1dp bmRvd05hdmlnYXRpb25Qb2xpY3k7CisgICAgbV9uZXh0TmV3V2luZG93TmF2aWdhdGlvblBvbGlj eSA9IFdlYk5hdmlnYXRpb25Qb2xpY3lJZ25vcmU7CisKICAgICBXcmFwcGVkUmVzb3VyY2VSZXF1 ZXN0IHJlcXVlc3Q7CiAgICAgaWYgKCFyLnJlc291cmNlUmVxdWVzdCgpLmlzRW1wdHkoKSkKICAg ICAgICAgcmVxdWVzdC5iaW5kKHIucmVzb3VyY2VSZXF1ZXN0KCkpOwogICAgIGVsc2UgaWYgKCFh Y3Rpb24ucmVzb3VyY2VSZXF1ZXN0KCkuaXNFbXB0eSgpKQogICAgICAgICByZXF1ZXN0LmJpbmQo YWN0aW9uLnJlc291cmNlUmVxdWVzdCgpKTsKICAgICBXZWJWaWV3SW1wbCogbmV3VmlldyA9IHN0 YXRpY19jYXN0PFdlYlZpZXdJbXBsKj4oCi0gICAgICAgIG1fd2ViVmlldy0+Y2xpZW50KCktPmNy ZWF0ZVZpZXcoV2ViRnJhbWVJbXBsOjpmcm9tRnJhbWUoZnJhbWUpLCByZXF1ZXN0LCBmZWF0dXJl cywgci5mcmFtZU5hbWUoKSkpOworICAgICAgICBtX3dlYlZpZXctPmNsaWVudCgpLT5jcmVhdGVW aWV3KFdlYkZyYW1lSW1wbDo6ZnJvbUZyYW1lKGZyYW1lKSwgcmVxdWVzdCwgZmVhdHVyZXMsIHIu ZnJhbWVOYW1lKCksIHBvbGljeSkpOwogICAgIGlmICghbmV3VmlldykKICAgICAgICAgcmV0dXJu IDA7CiAKQEAgLTgwMiw2ICs4MDcsMTEgQEAgdm9pZCBDaHJvbWVDbGllbnRJbXBsOjpzZXRDdXJz b3JGb3JQbHVnaW4oY29uc3QgV2ViQ3Vyc29ySW5mbyYgY3Vyc29yKQogICAgIHNldEN1cnNvcihj dXJzb3IpOwogfQogCit2b2lkIENocm9tZUNsaWVudEltcGw6OnNldE5ld1dpbmRvd05hdmlnYXRp b25Qb2xpY3koV2ViTmF2aWdhdGlvblBvbGljeSBwb2xpY3kpCit7CisgICAgbV9uZXh0TmV3V2lu ZG93TmF2aWdhdGlvblBvbGljeSA9IHBvbGljeTsKK30KKwogdm9pZCBDaHJvbWVDbGllbnRJbXBs Ojpmb3JtU3RhdGVEaWRDaGFuZ2UoY29uc3QgTm9kZSogbm9kZSkKIHsKICAgICAvLyBUaGUgY3Vy cmVudCBoaXN0b3J5IGl0ZW0gaXMgbm90IHVwZGF0ZWQgeWV0LiAgVGhhdCBoYXBwZW5zIGxhemls eSB3aGVuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGll bnRJbXBsLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmgK aW5kZXggMDNhNzg4MDA5MTMzMTljYjJmMTRjYWI1OWVhNjc1NzhiMzZkZTQ4NS4uMzljNjVlYjQ5 ZjcyNGQwZmQxYzg4ZDY4OTZkZDg3NGUyMjc4MTdjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuaApAQCAtMzUsNiArMzUsNyBAQAogI2luY2x1ZGUg IkNocm9tZUNsaWVudENocm9taXVtLmgiCiAjaW5jbHVkZSAiUG9wdXBNZW51LmgiCiAjaW5jbHVk ZSAiU2VhcmNoUG9wdXBNZW51LmgiCisjaW5jbHVkZSAiV2ViTmF2aWdhdGlvblBvbGljeS5oIgog CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBjbGFzcyBBY2Nlc3NpYmlsaXR5T2JqZWN0OwpAQCAtMTg5 LDYgKzE5MCw3IEBAIHB1YmxpYzoKIAogICAgIC8vIENocm9tZUNsaWVudEltcGw6CiAgICAgdm9p ZCBzZXRDdXJzb3JGb3JQbHVnaW4oY29uc3QgV2ViQ3Vyc29ySW5mbyYpOworICAgIHZvaWQgc2V0 TmV3V2luZG93TmF2aWdhdGlvblBvbGljeShXZWJOYXZpZ2F0aW9uUG9saWN5KTsKIAogICAgIHZp cnR1YWwgYm9vbCBzZWxlY3RJdGVtV3JpdGluZ0RpcmVjdGlvbklzTmF0dXJhbCgpOwogICAgIHZp cnR1YWwgYm9vbCBzZWxlY3RJdGVtQWxpZ25tZW50Rm9sbG93c01lbnVXcml0aW5nRGlyZWN0aW9u KCk7CkBAIC0yMTgsNiArMjIwLDkgQEAgcHJpdmF0ZToKICAgICBib29sIG1fc2Nyb2xsYmFyc1Zp c2libGU7CiAgICAgYm9vbCBtX21lbnViYXJWaXNpYmxlOwogICAgIGJvb2wgbV9yZXNpemFibGU7 CisKKyAgICAvLyBUaGUgcG9saWN5IGZvciBob3cgdGhlIG5leHQgd2VidmlldyB0byBiZSBjcmVh dGVkIHdpbGwgYmUgc2hvd24uCisgICAgV2ViTmF2aWdhdGlvblBvbGljeSBtX25leHROZXdXaW5k b3dOYXZpZ2F0aW9uUG9saWN5OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuY3Bw IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcApp bmRleCA3Y2U3NzgxYmIwMGFiZjA1NmU3YmU4MmI5YzZjMmQ2OTRhNTVmNzRhLi41NWM3N2ZlZDMw NTYyMjdiNjdiOTA0YWNlMTEzMmEyNjkwMTRmZGYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAKQEAgLTg3MywyMSArODcz LDI3IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRJbXBsOjpkaXNwYXRjaERpZEZpcnN0VmlzdWFs bHlOb25FbXB0eUxheW91dCgpCiAKIEZyYW1lKiBGcmFtZUxvYWRlckNsaWVudEltcGw6OmRpc3Bh dGNoQ3JlYXRlUGFnZShjb25zdCBOYXZpZ2F0aW9uQWN0aW9uJiBhY3Rpb24pCiB7Ci0gICAgc3Ry dWN0IFdpbmRvd0ZlYXR1cmVzIGZlYXR1cmVzOwotICAgIFBhZ2UqIG5ld1BhZ2UgPSBtX3dlYkZy YW1lLT5mcmFtZSgpLT5wYWdlKCktPmNocm9tZSgpLT5jcmVhdGVXaW5kb3coCi0gICAgICAgIG1f d2ViRnJhbWUtPmZyYW1lKCksIEZyYW1lTG9hZFJlcXVlc3QobV93ZWJGcmFtZS0+ZnJhbWUoKS0+ ZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKSksCi0gICAgICAgIGZlYXR1cmVzLCBhY3Rpb24p OwotCiAgICAgLy8gTWFrZSBzdXJlIHRoYXQgd2UgaGF2ZSBhIHZhbGlkIGRpc3Bvc2l0aW9uLiAg VGhpcyBzaG91bGQgaGF2ZSBiZWVuIHNldCBpbgogICAgIC8vIHRoZSBwcmVjZWVkaW5nIGNhbGwg dG8gZGlzcGF0Y2hEZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb24uCiAgICAgQVNTRVJUKG1f bmV4dE5hdmlnYXRpb25Qb2xpY3kgIT0gV2ViTmF2aWdhdGlvblBvbGljeUlnbm9yZSk7CiAgICAg V2ViTmF2aWdhdGlvblBvbGljeSBwb2xpY3kgPSBtX25leHROYXZpZ2F0aW9uUG9saWN5OwogICAg IG1fbmV4dE5hdmlnYXRpb25Qb2xpY3kgPSBXZWJOYXZpZ2F0aW9uUG9saWN5SWdub3JlOwogCisg ICAgLy8gU3RvcmUgdGhlIGRpc3Bvc2l0aW9uIG9uIHRoZSBvcGVuZXIgQ2hyb21lQ2xpZW50SW1w bCBzbyB0aGF0IHdlIGNhbiBwYXNzCisgICAgLy8gaXQgdG8gV2ViVmlld0NsaWVudDo6Y3JlYXRl Vmlldy4KKyAgICBDaHJvbWVDbGllbnRJbXBsKiBjaHJvbWVDbGllbnQgPSBzdGF0aWNfY2FzdDxD aHJvbWVDbGllbnRJbXBsKj4obV93ZWJGcmFtZS0+ZnJhbWUoKS0+cGFnZSgpLT5jaHJvbWUoKS0+ Y2xpZW50KCkpOworICAgIGNocm9tZUNsaWVudC0+c2V0TmV3V2luZG93TmF2aWdhdGlvblBvbGlj eShwb2xpY3kpOworCisgICAgc3RydWN0IFdpbmRvd0ZlYXR1cmVzIGZlYXR1cmVzOworICAgIFBh Z2UqIG5ld1BhZ2UgPSBtX3dlYkZyYW1lLT5mcmFtZSgpLT5wYWdlKCktPmNocm9tZSgpLT5jcmVh dGVXaW5kb3coCisgICAgICAgIG1fd2ViRnJhbWUtPmZyYW1lKCksIEZyYW1lTG9hZFJlcXVlc3Qo bV93ZWJGcmFtZS0+ZnJhbWUoKS0+ZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKSksCisgICAg ICAgIGZlYXR1cmVzLCBhY3Rpb24pOworCiAgICAgLy8gY3JlYXRlV2luZG93IGNhbiByZXR1cm4g bnVsbCAoZS5nLiwgcG9wdXAgYmxvY2tlciBkZW5pZXMgdGhlIHdpbmRvdykuCiAgICAgaWYgKCFu ZXdQYWdlKQogICAgICAgICByZXR1cm4gMDsKIAorICAgIC8vIEFsc28gZ2l2ZSB0aGUgZGlzcG9z aXRpb24gdG8gdGhlIG5ldyB3aW5kb3cuCiAgICAgV2ViVmlld0ltcGw6OmZyb21QYWdlKG5ld1Bh Z2UpLT5zZXRJbml0aWFsTmF2aWdhdGlvblBvbGljeShwb2xpY3kpOwogICAgIHJldHVybiBuZXdQ YWdlLT5tYWluRnJhbWUoKTsKIH0K 129966 2012-03-02 15:34:32 -0800 2012-03-05 11:50:23 -0800 Patch bug-80057-20120302153431.patch text/plain 11857 creis U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5NjIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDNiOWUwYmQ1MDljOTQzZTE2NTA5YzEwNDAzYjhjOGZlOTQwYWIzZmQuLmM4MmQzZGRhMDMzMTI0 MmI3ODU2ODQ3ODA3Njg5ODY0M2E0NTcwNTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjYgQEAKKzIwMTItMDMtMDIgIENoYXJsaWUgUmVpcyAgPGNyZWlzQGNocm9taXVt Lm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIFBhc3MgV2ViTmF2aWdhdGlvblBvbGljeSB0byBX ZWJWaWV3Q2xpZW50OjpjcmVhdGVWaWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04MDA1NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogcHVibGljL1dlYlZpZXdDbGllbnQuaDoKKyAgICAgICAgKFdlYlZp ZXdDbGllbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3Q2xpZW50OjpjcmVhdGVWaWV3KToK KyAgICAgICAgKiBzcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkNo cm9tZUNsaWVudEltcGw6OkNocm9tZUNsaWVudEltcGwpOgorICAgICAgICAoV2ViS2l0OjpDaHJv bWVDbGllbnRJbXBsOjpjcmVhdGVXaW5kb3cpOgorICAgICAgICAoV2ViS2l0OjpDaHJvbWVDbGll bnRJbXBsOjpnZXROYXZpZ2F0aW9uUG9saWN5KToKKyAgICAgICAgKFdlYktpdCk6CisgICAgICAg IChXZWJLaXQ6OkNocm9tZUNsaWVudEltcGw6OnNob3cpOgorICAgICAgICAoV2ViS2l0OjpDaHJv bWVDbGllbnRJbXBsOjpzZXROZXdXaW5kb3dOYXZpZ2F0aW9uUG9saWN5KToKKyAgICAgICAgKiBz cmMvQ2hyb21lQ2xpZW50SW1wbC5oOgorICAgICAgICAoQ2hyb21lQ2xpZW50SW1wbCk6CisgICAg ICAgICogc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkZy YW1lTG9hZGVyQ2xpZW50SW1wbDo6ZGlzcGF0Y2hDcmVhdGVQYWdlKToKKyAgICAgICAgKFdlYktp dDo6RnJhbWVMb2FkZXJDbGllbnRJbXBsOjpkaXNwYXRjaERlY2lkZVBvbGljeUZvck5ld1dpbmRv d0FjdGlvbik6CisKIDIwMTItMDMtMDIgIERhbmEgSmFuc2VucyAgPGRhbmFrakBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgW0Nocm9taXVtXSBBbGxvdyBwbHVnaW5zIHRvIHNldCBvcGFxdWUoKSBv biB0aGVpciBwbGF0Zm9ybSBsYXllcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViVmlld0NsaWVudC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv V2ViVmlld0NsaWVudC5oCmluZGV4IGI2NTZmZDVhZGU2OGE3NTdkYTQ5NTE1MDgzZWMwNDFkNDdk NmE4MGQuLjgyZTk0YjdjOGQwM2YwMGUzZTJhN2MyMGJjZDQ4ZDdmODI4NTQ1MmYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXdDbGllbnQuaAorKysgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3Q2xpZW50LmgKQEAgLTkzLDEwICs5 MywxMyBAQCBwdWJsaWM6CiAgICAgLy8gV2ViU3RvcmFnZSBzcGVjaWZpY2F0aW9uLgogICAgIC8v IFRoZSByZXF1ZXN0IHBhcmFtZXRlciBpcyBvbmx5IGZvciB0aGUgY2xpZW50IHRvIGNoZWNrIGlm IHRoZSByZXF1ZXN0CiAgICAgLy8gY291bGQgYmUgZnVsZmlsbGVkLiAgVGhlIGNsaWVudCBzaG91 bGQgbm90IGxvYWQgdGhlIHJlcXVlc3QuCisgICAgLy8gVGhlIHBvbGljeSBwYXJhbWV0ZXIgaW5k aWNhdGVzIGhvdyB0aGUgbmV3IHZpZXcgd2lsbCBiZSBkaXNwbGF5ZWQgaW4KKyAgICAvLyBXZWJX aWRnZXRDbGllbnQ6OnNob3cuCiAgICAgdmlydHVhbCBXZWJWaWV3KiBjcmVhdGVWaWV3KFdlYkZy YW1lKiBjcmVhdG9yLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBXZWJV UkxSZXF1ZXN0JiByZXF1ZXN0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25z dCBXZWJXaW5kb3dGZWF0dXJlcyYgZmVhdHVyZXMsCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGNvbnN0IFdlYlN0cmluZyYgbmFtZSkgeworICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBjb25zdCBXZWJTdHJpbmcmIG5hbWUsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFdlYk5hdmlnYXRpb25Qb2xpY3kgcG9saWN5KSB7CiAgICAgICAgIHJldHVybiAwOwog ICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xp ZW50SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBs LmNwcAppbmRleCBlMDhjMDc0NTBjMDdlZjEwN2M3ZTk2NjVjNGEwNTA1Mzc1YTQxZmFmLi42M2Uy YWU5YThlNWZhYzM0ZmFmYWU0MWFiYjYyZmMxNjdhNWIyMTIwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmNwcApAQCAtMTM2LDYgKzEzNiw3IEBA IENocm9tZUNsaWVudEltcGw6OkNocm9tZUNsaWVudEltcGwoV2ViVmlld0ltcGwqIHdlYlZpZXcp CiAgICAgLCBtX3Njcm9sbGJhcnNWaXNpYmxlKHRydWUpCiAgICAgLCBtX21lbnViYXJWaXNpYmxl KHRydWUpCiAgICAgLCBtX3Jlc2l6YWJsZSh0cnVlKQorICAgICwgbV9uZXh0TmV3V2luZG93TmF2 aWdhdGlvblBvbGljeShXZWJOYXZpZ2F0aW9uUG9saWN5SWdub3JlKQogewogfQogCkBAIC0yMzgs MTMgKzIzOSwyMyBAQCBQYWdlKiBDaHJvbWVDbGllbnRJbXBsOjpjcmVhdGVXaW5kb3coCiAgICAg aWYgKCFtX3dlYlZpZXctPmNsaWVudCgpKQogICAgICAgICByZXR1cm4gMDsKIAorICAgIC8vIEZy YW1lTG9hZGVyQ2xpZW50SW1wbCBtYXkgaGF2ZSBnaXZlbiB1cyBhIHBvbGljeSB0byB1c2UgZm9y IHRoZSBuZXh0IG5ldworICAgIC8vIHdpbmRvdyBuYXZpZ2F0aW9uLiBJZiBub3QsIGRldGVybWlu ZSB0aGUgcG9saWN5IHVzaW5nIHRoZSBzYW1lIGxvZ2ljIGFzCisgICAgLy8gc2hvdygpLgorICAg IFdlYk5hdmlnYXRpb25Qb2xpY3kgcG9saWN5OworICAgIGlmIChtX25leHROZXdXaW5kb3dOYXZp Z2F0aW9uUG9saWN5ICE9IFdlYk5hdmlnYXRpb25Qb2xpY3lJZ25vcmUpIHsKKyAgICAgICAgcG9s aWN5ID0gbV9uZXh0TmV3V2luZG93TmF2aWdhdGlvblBvbGljeTsKKyAgICAgICAgbV9uZXh0TmV3 V2luZG93TmF2aWdhdGlvblBvbGljeSA9IFdlYk5hdmlnYXRpb25Qb2xpY3lJZ25vcmU7CisgICAg fSBlbHNlCisgICAgICAgIHBvbGljeSA9IGdldE5hdmlnYXRpb25Qb2xpY3koKTsKKwogICAgIFdy YXBwZWRSZXNvdXJjZVJlcXVlc3QgcmVxdWVzdDsKICAgICBpZiAoIXIucmVzb3VyY2VSZXF1ZXN0 KCkuaXNFbXB0eSgpKQogICAgICAgICByZXF1ZXN0LmJpbmQoci5yZXNvdXJjZVJlcXVlc3QoKSk7 CiAgICAgZWxzZSBpZiAoIWFjdGlvbi5yZXNvdXJjZVJlcXVlc3QoKS5pc0VtcHR5KCkpCiAgICAg ICAgIHJlcXVlc3QuYmluZChhY3Rpb24ucmVzb3VyY2VSZXF1ZXN0KCkpOwogICAgIFdlYlZpZXdJ bXBsKiBuZXdWaWV3ID0gc3RhdGljX2Nhc3Q8V2ViVmlld0ltcGwqPigKLSAgICAgICAgbV93ZWJW aWV3LT5jbGllbnQoKS0+Y3JlYXRlVmlldyhXZWJGcmFtZUltcGw6OmZyb21GcmFtZShmcmFtZSks IHJlcXVlc3QsIGZlYXR1cmVzLCByLmZyYW1lTmFtZSgpKSk7CisgICAgICAgIG1fd2ViVmlldy0+ Y2xpZW50KCktPmNyZWF0ZVZpZXcoV2ViRnJhbWVJbXBsOjpmcm9tRnJhbWUoZnJhbWUpLCByZXF1 ZXN0LCBmZWF0dXJlcywgci5mcmFtZU5hbWUoKSwgcG9saWN5KSk7CiAgICAgaWYgKCFuZXdWaWV3 KQogICAgICAgICByZXR1cm4gMDsKIApAQCAtMjg3LDExICsyOTgsOCBAQCBzdGF0aWMgaW5saW5l IGJvb2wgY3VycmVudEV2ZW50U2hvdWxkQ2F1c2VCYWNrZ3JvdW5kVGFiKGNvbnN0IFdlYklucHV0 RXZlbnQqIGlucAogICAgIHJldHVybiBwb2xpY3kgPT0gV2ViTmF2aWdhdGlvblBvbGljeU5ld0Jh Y2tncm91bmRUYWI7CiB9CiAKLXZvaWQgQ2hyb21lQ2xpZW50SW1wbDo6c2hvdygpCitXZWJOYXZp Z2F0aW9uUG9saWN5IENocm9tZUNsaWVudEltcGw6OmdldE5hdmlnYXRpb25Qb2xpY3koKQogewot ICAgIGlmICghbV93ZWJWaWV3LT5jbGllbnQoKSkKLSAgICAgICAgcmV0dXJuOwotCiAgICAgLy8g SWYgb3VyIGRlZmF1bHQgY29uZmlndXJhdGlvbiB3YXMgbW9kaWZpZWQgYnkgYSBzY3JpcHQgb3Ig d2Fzbid0CiAgICAgLy8gY3JlYXRlZCBieSBhIHVzZXIgZ2VzdHVyZSwgdGhlbiBzaG93IGFzIGEg cG9wdXAuIEVsc2UsIGxldCB0aGlzCiAgICAgLy8gbmV3IHdpbmRvdyBiZSBvcGVuZWQgYXMgYSB0 b3BsZXZlbCB3aW5kb3cuCkBAIC0zMDYsOCArMzE0LDE1IEBAIHZvaWQgQ2hyb21lQ2xpZW50SW1w bDo6c2hvdygpCiAgICAgICAgIHBvbGljeSA9IFdlYk5hdmlnYXRpb25Qb2xpY3lOZXdQb3B1cDsK ICAgICBpZiAoY3VycmVudEV2ZW50U2hvdWxkQ2F1c2VCYWNrZ3JvdW5kVGFiKFdlYlZpZXdJbXBs OjpjdXJyZW50SW5wdXRFdmVudCgpKSkKICAgICAgICAgcG9saWN5ID0gV2ViTmF2aWdhdGlvblBv bGljeU5ld0JhY2tncm91bmRUYWI7CisgICAgcmV0dXJuIHBvbGljeTsKK30KKyAKK3ZvaWQgQ2hy b21lQ2xpZW50SW1wbDo6c2hvdygpCit7CisgICAgaWYgKCFtX3dlYlZpZXctPmNsaWVudCgpKQor ICAgICAgICByZXR1cm47CiAKLSAgICBtX3dlYlZpZXctPmNsaWVudCgpLT5zaG93KHBvbGljeSk7 CisgICAgbV93ZWJWaWV3LT5jbGllbnQoKS0+c2hvdyhnZXROYXZpZ2F0aW9uUG9saWN5KCkpOwog fQogCiBib29sIENocm9tZUNsaWVudEltcGw6OmNhblJ1bk1vZGFsKCkKQEAgLTgwMiw2ICs4MTcs MTEgQEAgdm9pZCBDaHJvbWVDbGllbnRJbXBsOjpzZXRDdXJzb3JGb3JQbHVnaW4oY29uc3QgV2Vi Q3Vyc29ySW5mbyYgY3Vyc29yKQogICAgIHNldEN1cnNvcihjdXJzb3IpOwogfQogCit2b2lkIENo cm9tZUNsaWVudEltcGw6OnNldE5ld1dpbmRvd05hdmlnYXRpb25Qb2xpY3koV2ViTmF2aWdhdGlv blBvbGljeSBwb2xpY3kpCit7CisgICAgbV9uZXh0TmV3V2luZG93TmF2aWdhdGlvblBvbGljeSA9 IHBvbGljeTsKK30KKwogdm9pZCBDaHJvbWVDbGllbnRJbXBsOjpmb3JtU3RhdGVEaWRDaGFuZ2Uo Y29uc3QgTm9kZSogbm9kZSkKIHsKICAgICAvLyBUaGUgY3VycmVudCBoaXN0b3J5IGl0ZW0gaXMg bm90IHVwZGF0ZWQgeWV0LiAgVGhhdCBoYXBwZW5zIGxhemlseSB3aGVuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmggYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmgKaW5kZXggMDNhNzg4MDA5MTMzMTlj YjJmMTRjYWI1OWVhNjc1NzhiMzZkZTQ4NS4uYzM0OTQ1NDA0NWJiOThjNDBlZTkwNmJmYzMyNzcy MzlmOWM3ZTE2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21l Q2xpZW50SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVu dEltcGwuaApAQCAtMzUsNiArMzUsNyBAQAogI2luY2x1ZGUgIkNocm9tZUNsaWVudENocm9taXVt LmgiCiAjaW5jbHVkZSAiUG9wdXBNZW51LmgiCiAjaW5jbHVkZSAiU2VhcmNoUG9wdXBNZW51Lmgi CisjaW5jbHVkZSAiV2ViTmF2aWdhdGlvblBvbGljeS5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7 CiBjbGFzcyBBY2Nlc3NpYmlsaXR5T2JqZWN0OwpAQCAtMTg5LDYgKzE5MCw3IEBAIHB1YmxpYzoK IAogICAgIC8vIENocm9tZUNsaWVudEltcGw6CiAgICAgdm9pZCBzZXRDdXJzb3JGb3JQbHVnaW4o Y29uc3QgV2ViQ3Vyc29ySW5mbyYpOworICAgIHZvaWQgc2V0TmV3V2luZG93TmF2aWdhdGlvblBv bGljeShXZWJOYXZpZ2F0aW9uUG9saWN5KTsKIAogICAgIHZpcnR1YWwgYm9vbCBzZWxlY3RJdGVt V3JpdGluZ0RpcmVjdGlvbklzTmF0dXJhbCgpOwogICAgIHZpcnR1YWwgYm9vbCBzZWxlY3RJdGVt QWxpZ25tZW50Rm9sbG93c01lbnVXcml0aW5nRGlyZWN0aW9uKCk7CkBAIC0yMDksNiArMjExLDcg QEAgcHVibGljOgogI2VuZGlmCiAKIHByaXZhdGU6CisgICAgV2ViTmF2aWdhdGlvblBvbGljeSBn ZXROYXZpZ2F0aW9uUG9saWN5KCk7CiAgICAgdm9pZCBnZXRQb3B1cE1lbnVJbmZvKFdlYkNvcmU6 OlBvcHVwQ29udGFpbmVyKiwgV2ViUG9wdXBNZW51SW5mbyopOwogICAgIHZvaWQgc2V0Q3Vyc29y KGNvbnN0IFdlYkN1cnNvckluZm8mKTsKIApAQCAtMjE4LDYgKzIyMSw5IEBAIHByaXZhdGU6CiAg ICAgYm9vbCBtX3Njcm9sbGJhcnNWaXNpYmxlOwogICAgIGJvb2wgbV9tZW51YmFyVmlzaWJsZTsK ICAgICBib29sIG1fcmVzaXphYmxlOworCisgICAgLy8gVGhlIHBvbGljeSBmb3IgaG93IHRoZSBu ZXh0IHdlYnZpZXcgdG8gYmUgY3JlYXRlZCB3aWxsIGJlIHNob3duLgorICAgIFdlYk5hdmlnYXRp b25Qb2xpY3kgbV9uZXh0TmV3V2luZG93TmF2aWdhdGlvblBvbGljeTsKIH07CiAKIH0gLy8gbmFt ZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvRnJh bWVMb2FkZXJDbGllbnRJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1l TG9hZGVyQ2xpZW50SW1wbC5jcHAKaW5kZXggN2NlNzc4MWJiMDBhYmYwNTZlN2JlODJiOWM2YzJk Njk0YTU1Zjc0YS4uZDk5ZWVkNDAyNGVkNDJjNTMyMTcxODIzZmNjNTJlOWVmZjJiNWI4NCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBs LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVudElt cGwuY3BwCkBAIC04NzMsMjEgKzg3MywyNyBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50SW1wbDo6 ZGlzcGF0Y2hEaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQoKQogCiBGcmFtZSogRnJhbWVM b2FkZXJDbGllbnRJbXBsOjpkaXNwYXRjaENyZWF0ZVBhZ2UoY29uc3QgTmF2aWdhdGlvbkFjdGlv biYgYWN0aW9uKQogewotICAgIHN0cnVjdCBXaW5kb3dGZWF0dXJlcyBmZWF0dXJlczsKLSAgICBQ YWdlKiBuZXdQYWdlID0gbV93ZWJGcmFtZS0+ZnJhbWUoKS0+cGFnZSgpLT5jaHJvbWUoKS0+Y3Jl YXRlV2luZG93KAotICAgICAgICBtX3dlYkZyYW1lLT5mcmFtZSgpLCBGcmFtZUxvYWRSZXF1ZXN0 KG1fd2ViRnJhbWUtPmZyYW1lKCktPmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCkpLAotICAg ICAgICBmZWF0dXJlcywgYWN0aW9uKTsKLQogICAgIC8vIE1ha2Ugc3VyZSB0aGF0IHdlIGhhdmUg YSB2YWxpZCBkaXNwb3NpdGlvbi4gIFRoaXMgc2hvdWxkIGhhdmUgYmVlbiBzZXQgaW4KICAgICAv LyB0aGUgcHJlY2VlZGluZyBjYWxsIHRvIGRpc3BhdGNoRGVjaWRlUG9saWN5Rm9yTmV3V2luZG93 QWN0aW9uLgogICAgIEFTU0VSVChtX25leHROYXZpZ2F0aW9uUG9saWN5ICE9IFdlYk5hdmlnYXRp b25Qb2xpY3lJZ25vcmUpOwogICAgIFdlYk5hdmlnYXRpb25Qb2xpY3kgcG9saWN5ID0gbV9uZXh0 TmF2aWdhdGlvblBvbGljeTsKICAgICBtX25leHROYXZpZ2F0aW9uUG9saWN5ID0gV2ViTmF2aWdh dGlvblBvbGljeUlnbm9yZTsKIAorICAgIC8vIFN0b3JlIHRoZSBkaXNwb3NpdGlvbiBvbiB0aGUg b3BlbmVyIENocm9tZUNsaWVudEltcGwgc28gdGhhdCB3ZSBjYW4gcGFzcworICAgIC8vIGl0IHRv IFdlYlZpZXdDbGllbnQ6OmNyZWF0ZVZpZXcuCisgICAgQ2hyb21lQ2xpZW50SW1wbCogY2hyb21l Q2xpZW50ID0gc3RhdGljX2Nhc3Q8Q2hyb21lQ2xpZW50SW1wbCo+KG1fd2ViRnJhbWUtPmZyYW1l KCktPnBhZ2UoKS0+Y2hyb21lKCktPmNsaWVudCgpKTsKKyAgICBjaHJvbWVDbGllbnQtPnNldE5l d1dpbmRvd05hdmlnYXRpb25Qb2xpY3kocG9saWN5KTsKKworICAgIHN0cnVjdCBXaW5kb3dGZWF0 dXJlcyBmZWF0dXJlczsKKyAgICBQYWdlKiBuZXdQYWdlID0gbV93ZWJGcmFtZS0+ZnJhbWUoKS0+ cGFnZSgpLT5jaHJvbWUoKS0+Y3JlYXRlV2luZG93KAorICAgICAgICBtX3dlYkZyYW1lLT5mcmFt ZSgpLCBGcmFtZUxvYWRSZXF1ZXN0KG1fd2ViRnJhbWUtPmZyYW1lKCktPmRvY3VtZW50KCktPnNl Y3VyaXR5T3JpZ2luKCkpLAorICAgICAgICBmZWF0dXJlcywgYWN0aW9uKTsKKwogICAgIC8vIGNy ZWF0ZVdpbmRvdyBjYW4gcmV0dXJuIG51bGwgKGUuZy4sIHBvcHVwIGJsb2NrZXIgZGVuaWVzIHRo ZSB3aW5kb3cpLgogICAgIGlmICghbmV3UGFnZSkKICAgICAgICAgcmV0dXJuIDA7CiAKKyAgICAv LyBBbHNvIGdpdmUgdGhlIGRpc3Bvc2l0aW9uIHRvIHRoZSBuZXcgd2luZG93LgogICAgIFdlYlZp ZXdJbXBsOjpmcm9tUGFnZShuZXdQYWdlKS0+c2V0SW5pdGlhbE5hdmlnYXRpb25Qb2xpY3kocG9s aWN5KTsKICAgICByZXR1cm4gbmV3UGFnZS0+bWFpbkZyYW1lKCk7CiB9CkBAIC05NDksNiArOTU1 LDExIEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRJbXBsOjpkaXNwYXRjaERlY2lkZVBvbGljeUZv ck5ld1dpbmRvd0FjdGlvbigKICAgICAgICAgLy8gY3JlYXRpbmcgb3Igc2hvd2luZyB0aGUgbmV3 IHdpbmRvdyB0aGF0IHdvdWxkIGFsbG93IHVzIHRvIGF2b2lkIGhhdmluZwogICAgICAgICAvLyB0 byBrZWVwIHRoaXMgc3RhdGUuCiAgICAgICAgIG1fbmV4dE5hdmlnYXRpb25Qb2xpY3kgPSBuYXZp Z2F0aW9uUG9saWN5OworCisgICAgICAgIC8vIFN0b3JlIHRoZSBkaXNwb3NpdGlvbiBvbiB0aGUg b3BlbmVyIENocm9tZUNsaWVudEltcGwgc28gdGhhdCB3ZSBjYW4gcGFzcworICAgICAgICAvLyBp dCB0byBXZWJWaWV3Q2xpZW50OjpjcmVhdGVWaWV3LgorICAgICAgICBDaHJvbWVDbGllbnRJbXBs KiBjaHJvbWVDbGllbnQgPSBzdGF0aWNfY2FzdDxDaHJvbWVDbGllbnRJbXBsKj4obV93ZWJGcmFt ZS0+ZnJhbWUoKS0+cGFnZSgpLT5jaHJvbWUoKS0+Y2xpZW50KCkpOworICAgICAgICBjaHJvbWVD bGllbnQtPnNldE5ld1dpbmRvd05hdmlnYXRpb25Qb2xpY3kobmF2aWdhdGlvblBvbGljeSk7CiAg ICAgfQogICAgIChtX3dlYkZyYW1lLT5mcmFtZSgpLT5sb2FkZXIoKS0+cG9saWN5Q2hlY2tlcigp LT4qZnVuY3Rpb24pKHBvbGljeUFjdGlvbik7CiB9CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VM b2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzAxNzU4ZTZjNzMyOWYxMzJhYjI3NDlkMDgxMTRm NTEzZTNjMWM1ZC4uNjFmYjhiMWQ3Y2QzYTg0M2Y4NzNhMjJhYjM5ODhlYzdlNmFiMDlhYiAxMDA2 NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE1IEBACisyMDEyLTAzLTAyICBDaGFybGllIFJlaXMgIDxjcmVpc0BjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgW2Nocm9taXVtXSBQYXNzIFdlYk5hdmlnYXRpb25Qb2xpY3kgdG8gV2ViVmlld0Ns aWVudDo6Y3JlYXRlVmlldworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9ODAwNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmNwcDoKKyAgICAg ICAgKFdlYlZpZXdIb3N0OjpjcmVhdGVWaWV3KToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9j aHJvbWl1bS9XZWJWaWV3SG9zdC5oOgorICAgICAgICAoV2ViVmlld0hvc3QpOgorCiAyMDEyLTAz LTAyICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQWRkIHRoZSBD aHJvbWl1bSBMaW9uIGNhbmFyeSBib3QgdG8gdGhlIGZsYWtpbmVzcyBkYXNoYm9hcmQuCmRpZmYg LS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5jcHAgYi9U b29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5jcHAKaW5kZXggNmQyM2Nm OWQ0ZDVmMmY1N2Q0MjAyMTg1NjFjN2ZkMGIyNjFlMjQ2OS4uNzI2NjdlNDFiYTcyMzU3YmNmNWE1 OTNiMzhjZThmMzMyZmYwYjYwZCAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hy b21pdW0vV2ViVmlld0hvc3QuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVt L1dlYlZpZXdIb3N0LmNwcApAQCAtMjQyLDcgKzI0Miw3IEBAIHN0YXRpYyBzdHJpbmcgdGV4dEFm ZmluaXR5RGVzY3JpcHRpb24oV2ViVGV4dEFmZmluaXR5IGFmZmluaXR5KQogCiAvLyBXZWJWaWV3 Q2xpZW50IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0KIAotV2ViVmlldyogV2ViVmlld0hvc3Q6OmNyZWF0ZVZpZXcoV2ViRnJhbWUq LCBjb25zdCBXZWJVUkxSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBXZWJXaW5kb3dGZWF0dXJlcyYs IGNvbnN0IFdlYlN0cmluZyYpCitXZWJWaWV3KiBXZWJWaWV3SG9zdDo6Y3JlYXRlVmlldyhXZWJG cmFtZSosIGNvbnN0IFdlYlVSTFJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFdlYldpbmRvd0ZlYXR1 cmVzJiwgY29uc3QgV2ViU3RyaW5nJiwgV2ViTmF2aWdhdGlvblBvbGljeSkKIHsKICAgICBpZiAo IWxheW91dFRlc3RDb250cm9sbGVyKCktPmNhbk9wZW5XaW5kb3dzKCkpCiAgICAgICAgIHJldHVy biAwOwpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hv c3QuaCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmgKaW5kZXgg Zjg2YjExZjUwOTQ4NjgzM2M3YTAyZTYwMzM4ZTJiYjRjZjhlZWQxNC4uZWQ2NTY5MjUyZWI4MDQw MTczNmZmZWVmYzg0YzVlZmE2MmE2NTYyYSAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRy ZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuaAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJv bWl1bS9XZWJWaWV3SG9zdC5oCkBAIC0xMjYsNyArMTI2LDcgQEAgY2xhc3MgV2ViVmlld0hvc3Qg OiBwdWJsaWMgV2ViS2l0OjpXZWJTcGVsbENoZWNrQ2xpZW50LCBwdWJsaWMgV2ViS2l0OjpXZWJW aWV3Q2wKICAgICB2aXJ0dWFsIFdlYktpdDo6V2ViU3RyaW5nIGF1dG9Db3JyZWN0V29yZChjb25z dCBXZWJLaXQ6OldlYlN0cmluZyYpOwogCiAgICAgLy8gV2ViS2l0OjpXZWJWaWV3Q2xpZW50Ci0g ICAgdmlydHVhbCBXZWJLaXQ6OldlYlZpZXcqIGNyZWF0ZVZpZXcoV2ViS2l0OjpXZWJGcmFtZSos IGNvbnN0IFdlYktpdDo6V2ViVVJMUmVxdWVzdCYsIGNvbnN0IFdlYktpdDo6V2ViV2luZG93RmVh dHVyZXMmLCBjb25zdCBXZWJLaXQ6OldlYlN0cmluZyYpOworICAgIHZpcnR1YWwgV2ViS2l0OjpX ZWJWaWV3KiBjcmVhdGVWaWV3KFdlYktpdDo6V2ViRnJhbWUqLCBjb25zdCBXZWJLaXQ6OldlYlVS TFJlcXVlc3QmLCBjb25zdCBXZWJLaXQ6OldlYldpbmRvd0ZlYXR1cmVzJiwgY29uc3QgV2ViS2l0 OjpXZWJTdHJpbmcmLCBXZWJLaXQ6OldlYk5hdmlnYXRpb25Qb2xpY3kpOwogICAgIHZpcnR1YWwg V2ViS2l0OjpXZWJXaWRnZXQqIGNyZWF0ZVBvcHVwTWVudShXZWJLaXQ6OldlYlBvcHVwVHlwZSk7 CiAgICAgdmlydHVhbCBXZWJLaXQ6OldlYldpZGdldCogY3JlYXRlUG9wdXBNZW51KGNvbnN0IFdl YktpdDo6V2ViUG9wdXBNZW51SW5mbyYpOwogICAgIHZpcnR1YWwgV2ViS2l0OjpXZWJTdG9yYWdl TmFtZXNwYWNlKiBjcmVhdGVTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSh1bnNpZ25lZCBxdW90YSk7 Cg==