41969 2010-07-09 11:15:56 -0700 Pass a clip rect to the plugin and call NPP_SetWindow 2010-07-09 11:44:17 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca webkit.review.bot oldest_to_newest 249122 0 andersca 2010-07-09 11:15:56 -0700 Pass a clip rect to the plugin and call NPP_SetWindow 249127 1 61064 andersca 2010-07-09 11:20:12 -0700 Created attachment 61064 Patch 249131 2 webkit.review.bot 2010-07-09 11:21:25 -0700 Attachment 61064 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebKit2/WebProcess/Plugins/PluginView.h:35: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 249148 3 andersca 2010-07-09 11:44:17 -0700 Committed r62973: <http://trac.webkit.org/changeset/62973> 61064 2010-07-09 11:20:12 -0700 2010-07-09 11:21:45 -0700 Patch bug-41969-20100709112011.patch text/plain 12079 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg NmU0NDI1ZWIyZTllNDBkMjhiMmM1NjYyNjBhZjIzNjU2NTBkY2Q1Ny4uNmU3ZDY4ZmRlMjEwMTE4 Nzc0Njg3ZWUxMTY5MDI3ZmI0N2E5MWI5NSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSw1MSBAQAogMjAxMC0wNy0wOSAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBhc3MgYSBjbGlwIHJlY3QgdG8gdGhlIHBsdWdp biBhbmQgY2FsbCBOUFBfU2V0V2luZG93CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD00MTk2OQorCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL0R1 bW15UGx1Z2luLmNwcDoKKyAgICAgICAgKFdlYktpdDo6RHVtbXlQbHVnaW46Omdlb21ldHJ5RGlk Q2hhbmdlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvRHVtbXlQbHVnaW4uaDoKKyAg ICAgICAgQWRkIGNsaXAgcmVjdCBwYXJhbWV0ZXIuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1Bs dWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXRz Y2FwZVBsdWdpbjo6TmV0c2NhcGVQbHVnaW4pOgorICAgICAgICBJbml0aWFsaXplIG1fbnBXaW5k b3cuCisKKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW46OmNhbGxTZXRXaW5kb3cpOgor ICAgICAgICBDYWxsIE5QUF9TZXRXaW5kb3cuCisKKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQ bHVnaW46OmluaXRpYWxpemUpOgorICAgICAgICBTZXQgdGhlIHdpbmRvdyB0eXBlIHRvIE5QV2lu ZG93VHlwZURyYXdhYmxlIGZvciBub3cuCisKKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVn aW46Omdlb21ldHJ5RGlkQ2hhbmdlKToKKyAgICAgICAgVXBkYXRlIHRoZSBmcmFtZSBhbmQgY2xp cCByZWN0cyBhbmQgY2FsbCBOUFBfU2V0V2luZG93LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9Q bHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmg6CisgICAgICAgIEFkZCBhbiBOUFdpbmRv dyBtZW1iZXIgdmFyaWFibGUuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2lu Lmg6CisgICAgICAgIEFkZCBhIGNsaXBSZWN0IHBhcmFtZXRlciB0byBnZW9tZXRyeURpZENoYW5n ZS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6UGx1Z2luVmlldzo6UGx1Z2luVmlldyk6CisgICAgICAgIEFkZCB0aGUgcGx1 Zy1pbiBlbGVtZW50IHRvIHRoZSBjb25zdHJ1Y3Rvci4KKyAgICAgICAgCisgICAgICAgIChXZWJL aXQ6OlBsdWdpblZpZXc6OnZpZXdHZW9tZXRyeURpZENoYW5nZSk6CisgICAgICAgIENvbXB1dGUg dGhlIGNsaXAgcmVjdCBhbmQgcGFzcyBpdCB0byB0aGUgcGx1Zy1pbi4KKworICAgICAgICAqIFdl YlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3Lmg6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpblZp ZXc6OmNyZWF0ZSk6CisgICAgICAgIFBhc3MgdGhlIHBsdWctaW4gZWxlbWVudCB0byB0aGUgY29u c3RydWN0b3IuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1l TG9hZGVyQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6 OmNyZWF0ZVBsdWdpbik6CisgICAgICAgIFBhc3MgdGhlIHBsdWctaW4gZWxlbWVudCB0byBQbHVn aW5WaWV3OjpjcmVhdGUuCisKKzIwMTAtMDctMDkgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2Nh QGFwcGxlLmNvbT4KKwogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCiAKICAgICAg ICAgSW5zdGFudGlhdGUgTmV0c2NhcGUgcGx1Zy1pbnMsIHBhc3MgZ2VvbWV0cnkgaW5mb3JtYXRp b24gdG8gUGx1Z2luCmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9EdW1t eVBsdWdpbi5jcHAgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9EdW1teVBsdWdpbi5jcHAK aW5kZXggMGFhOWM2MWU3ZjczNThlNGUzYWRjYmMxNjNhNDNiZjVmZjkyNWVkZC4uNjQzMzA0M2Nl OWU0YTgyYWI1MWI0YTMxYTRmN2JlZmVlNTI3OTllMyAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQ cm9jZXNzL1BsdWdpbnMvRHVtbXlQbHVnaW4uY3BwCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9Q bHVnaW5zL0R1bW15UGx1Z2luLmNwcApAQCAtNTcsNyArNTcsNyBAQCB2b2lkIER1bW15UGx1Z2lu OjpwYWludChHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEludFJlY3QmIGRpcnR5UmVj dCkKICNlbmRpZiAgICAKIH0KICAgICAKLXZvaWQgRHVtbXlQbHVnaW46Omdlb21ldHJ5RGlkQ2hh bmdlKGNvbnN0IEludFJlY3QmIGZyYW1lUmVjdCkKK3ZvaWQgRHVtbXlQbHVnaW46Omdlb21ldHJ5 RGlkQ2hhbmdlKGNvbnN0IEludFJlY3QmIGZyYW1lUmVjdCwgY29uc3QgSW50UmVjdCYgY2xpcFJl Y3QpCiB7CiB9CiAKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL0R1bW15 UGx1Z2luLmggYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9EdW1teVBsdWdpbi5oCmluZGV4 IDRkMzc0ZDk4OWE0ZGRkM2NmZjMyNGUzNWQ5NjZhYzRjZmEzZTQxOWQuLmRlNzhjMGFlOGM2ZTUy Yzk2NzI4OTE1MWU3NWFmZGIzM2QwMjVmNGYgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vz cy9QbHVnaW5zL0R1bW15UGx1Z2luLmgKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMv RHVtbXlQbHVnaW4uaApAQCAtNDUsNyArNDUsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgYm9v bCBpbml0aWFsaXplKGNvbnN0IFdlYkNvcmU6OktVUkwmLCBjb25zdCBWZWN0b3I8V2ViQ29yZTo6 U3RyaW5nPiYgcGFyYW1OYW1lcywgY29uc3QgVmVjdG9yPFdlYkNvcmU6OlN0cmluZz4mIHBhcmFt VmFsdWVzLCBjb25zdCBXZWJDb3JlOjpTdHJpbmcmIG1pbWVUeXBlLCBib29sIGxvYWRNYW51YWxs eSk7CiAgICAgdmlydHVhbCB2b2lkIGRlc3Ryb3koKTsKICAgICB2aXJ0dWFsIHZvaWQgcGFpbnQo V2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0KiwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgZGlydHlS ZWN0KTsKLSAgICB2aXJ0dWFsIHZvaWQgZ2VvbWV0cnlEaWRDaGFuZ2UoY29uc3QgV2ViQ29yZTo6 SW50UmVjdCYgZnJhbWVSZWN0KTsKKyAgICB2aXJ0dWFsIHZvaWQgZ2VvbWV0cnlEaWRDaGFuZ2Uo Y29uc3QgV2ViQ29yZTo6SW50UmVjdCYgZnJhbWVSZWN0LCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0 JiBjbGlwUmVjdCk7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1dl YktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmNwcCBiL1dl YktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmNwcAppbmRl eCBjOTNkMDkwZDhjMTk2MzYwNmUyY2U2YjE4NmY5MGRjOTc5MDcxYjJhLi4wMjNhNWI2M2VmOWZm ZGY5OTk2YzA2MjZlNzVlMDBmMWIxODI2MWYyIDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nl c3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5jcHAKKysrIGIvV2ViS2l0Mi9XZWJQ cm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3BwCkBAIC0zMyw2ICszMyw3 IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogCiBOZXRzY2FwZVBsdWdpbjo6TmV0c2NhcGVQbHVnaW4o UGFzc1JlZlB0cjxOZXRzY2FwZVBsdWdpbk1vZHVsZT4gcGx1Z2luTW9kdWxlKQogICAgIDogbV9w bHVnaW5Nb2R1bGUocGx1Z2luTW9kdWxlKQorICAgICwgbV9ucFdpbmRvdygpCiB7CiAgICAgbV9u cHAubmRhdGEgPSB0aGlzOwogICAgIG1fbnBwLnBkYXRhID0gMDsKQEAgLTQyLDYgKzQzLDIwIEBA IE5ldHNjYXBlUGx1Z2luOjp+TmV0c2NhcGVQbHVnaW4oKQogewogfQogCit2b2lkIE5ldHNjYXBl UGx1Z2luOjpjYWxsU2V0V2luZG93KCkKK3sKKyAgICBtX25wV2luZG93LnggPSBtX2ZyYW1lUmVj dC54KCk7CisgICAgbV9ucFdpbmRvdy55ID0gbV9mcmFtZVJlY3QueSgpOworICAgIG1fbnBXaW5k b3cud2lkdGggPSBtX2ZyYW1lUmVjdC53aWR0aCgpOworICAgIG1fbnBXaW5kb3cuaGVpZ2h0ID0g bV9mcmFtZVJlY3QuaGVpZ2h0KCk7CisgICAgbV9ucFdpbmRvdy5jbGlwUmVjdC50b3AgPSBtX2Ns aXBSZWN0LnkoKTsKKyAgICBtX25wV2luZG93LmNsaXBSZWN0LmxlZnQgPSBtX2NsaXBSZWN0Lngo KTsKKyAgICBtX25wV2luZG93LmNsaXBSZWN0LmJvdHRvbSA9IG1fY2xpcFJlY3QuYm90dG9tKCk7 CisgICAgbV9ucFdpbmRvdy5jbGlwUmVjdC5yaWdodCA9IG1fY2xpcFJlY3QucmlnaHQoKTsKKwor ICAgIG1fcGx1Z2luTW9kdWxlLT5wbHVnaW5GdW5jcygpLnNldHdpbmRvdygmbV9ucHAsICZtX25w V2luZG93KTsKK30KKwogYm9vbCBOZXRzY2FwZVBsdWdpbjo6aW5pdGlhbGl6ZShjb25zdCBLVVJM JiwgY29uc3QgVmVjdG9yPFN0cmluZz4mIHBhcmFtTmFtZXMsIGNvbnN0IFZlY3RvcjxTdHJpbmc+ JiBwYXJhbVZhbHVlcywgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBsb2FkTWFudWFsbHkp CiB7CiAgICAgdWludDE2X3QgbW9kZSA9IGxvYWRNYW51YWxseSA/IE5QX0ZVTEwgOiBOUF9FTUJF RDsKQEAgLTUxLDYgKzY2LDkgQEAgYm9vbCBOZXRzY2FwZVBsdWdpbjo6aW5pdGlhbGl6ZShjb25z dCBLVVJMJiwgY29uc3QgVmVjdG9yPFN0cmluZz4mIHBhcmFtTmFtZXMsIGMKICAgICBpZiAoZXJy b3IgIT0gTlBFUlJfTk9fRVJST1IpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAorICAgIC8vIEZJ WE1FOiBUaGlzIGlzIG5vdCBjb3JyZWN0IGluIGFsbCBjYXNlcy4KKyAgICBtX25wV2luZG93LnR5 cGUgPSBOUFdpbmRvd1R5cGVEcmF3YWJsZTsKKwogICAgIHJldHVybiB0cnVlOwogfQogICAgIApA QCAtNjIsOCArODAsMTcgQEAgdm9pZCBOZXRzY2FwZVBsdWdpbjo6cGFpbnQoR3JhcGhpY3NDb250 ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiBkaXJ0eVJlY3QpCiB7CiB9CiAKLXZvaWQgTmV0 c2NhcGVQbHVnaW46Omdlb21ldHJ5RGlkQ2hhbmdlKGNvbnN0IEludFJlY3QmIGZyYW1lUmVjdCkK K3ZvaWQgTmV0c2NhcGVQbHVnaW46Omdlb21ldHJ5RGlkQ2hhbmdlKGNvbnN0IEludFJlY3QmIGZy YW1lUmVjdCwgY29uc3QgSW50UmVjdCYgY2xpcFJlY3QpCiB7CisgICAgaWYgKG1fZnJhbWVSZWN0 ID09IGZyYW1lUmVjdCAmJiBtX2NsaXBSZWN0ID09IGNsaXBSZWN0KSB7CisgICAgICAgIC8vIE5v dGhpbmcgdG8gZG8uCisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBtX2ZyYW1lUmVjdCA9 IGZyYW1lUmVjdDsKKyAgICBtX2NsaXBSZWN0ID0gY2xpcFJlY3Q7CisKKyAgICBjYWxsU2V0V2lu ZG93KCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9X ZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaCBiL1dlYktpdDIvV2Vi UHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmgKaW5kZXggMjkxM2ZjZmI3 NTg3MTE5N2ZmZmU5NmRmYjRiNTViZWJhZGNmMzcyNi4uOTdjNTMyNDg4YTUzN2Y4MjJmM2M0ZTAz ZDk3ZDlmNDViNTU0N2I5MiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMv TmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lu cy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5oCkBAIC0yOCw2ICsyOCw3IEBACiAKICNpbmNsdWRl ICJOZXRzY2FwZVBsdWdpbk1vZHVsZS5oIgogI2luY2x1ZGUgIlBsdWdpbi5oIgorI2luY2x1ZGUg PFdlYkNvcmUvSW50UmVjdC5oPgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIApAQCAtNDIsMTQgKzQz LDIwIEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgTmV0c2NhcGVQbHVnaW4oUGFzc1JlZlB0cjxO ZXRzY2FwZVBsdWdpbk1vZHVsZT4gcGx1Z2luTW9kdWxlKTsKIAorICAgIHZvaWQgY2FsbFNldFdp bmRvdygpOworCiAgICAgLy8gUGx1Z2luCiAgICAgdmlydHVhbCBib29sIGluaXRpYWxpemUoY29u c3QgV2ViQ29yZTo6S1VSTCYsIGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpTdHJpbmc+JiBwYXJhbU5h bWVzLCBjb25zdCBWZWN0b3I8V2ViQ29yZTo6U3RyaW5nPiYgcGFyYW1WYWx1ZXMsIGNvbnN0IFdl YkNvcmU6OlN0cmluZyYgbWltZVR5cGUsIGJvb2wgbG9hZE1hbnVhbGx5KTsKICAgICB2aXJ0dWFs IHZvaWQgZGVzdHJveSgpOwogICAgIHZpcnR1YWwgdm9pZCBwYWludChXZWJDb3JlOjpHcmFwaGlj c0NvbnRleHQqLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBkaXJ0eVJlY3QpOwotICAgIHZpcnR1 YWwgdm9pZCBnZW9tZXRyeURpZENoYW5nZShjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBmcmFtZVJl Y3QpOworICAgIHZpcnR1YWwgdm9pZCBnZW9tZXRyeURpZENoYW5nZShjb25zdCBXZWJDb3JlOjpJ bnRSZWN0JiBmcmFtZVJlY3QsIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIGNsaXBSZWN0KTsKICAg ICAKICAgICBSZWZQdHI8TmV0c2NhcGVQbHVnaW5Nb2R1bGU+IG1fcGx1Z2luTW9kdWxlOwogICAg IE5QUF90IG1fbnBwOworICAgIE5QV2luZG93IG1fbnBXaW5kb3c7CisgICAgCisgICAgV2ViQ29y ZTo6SW50UmVjdCBtX2ZyYW1lUmVjdDsKKyAgICBXZWJDb3JlOjpJbnRSZWN0IG1fY2xpcFJlY3Q7 CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJv Y2Vzcy9QbHVnaW5zL1BsdWdpbi5oIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2lu LmgKaW5kZXggNWQ4MTM3M2RkMTNiZDU3NDg2Yjg5Y2QyZTcwM2ZjMDIwMWE3YTRiNS4uMWNiMzAy MGJjMTY1YzA2N2ZhMjM5ZDAxZWVkYzAzYTFmNTM2ZjdiNSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9X ZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luLmgKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdp bnMvUGx1Z2luLmgKQEAgLTQ1LDcgKzQ1LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBp bml0aWFsaXplKGNvbnN0IFdlYkNvcmU6OktVUkwmLCBjb25zdCBWZWN0b3I8V2ViQ29yZTo6U3Ry aW5nPiYgcGFyYW1OYW1lcywgY29uc3QgVmVjdG9yPFdlYkNvcmU6OlN0cmluZz4mIHBhcmFtVmFs dWVzLCBjb25zdCBXZWJDb3JlOjpTdHJpbmcmIG1pbWVUeXBlLCBib29sIGxvYWRNYW51YWxseSkg PSAwOwogICAgIHZpcnR1YWwgdm9pZCBkZXN0cm95KCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBw YWludChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQqLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBk aXJ0eVJlY3QpID0gMDsKLSAgICB2aXJ0dWFsIHZvaWQgZ2VvbWV0cnlEaWRDaGFuZ2UoY29uc3Qg V2ViQ29yZTo6SW50UmVjdCYgZnJhbWVSZWN0KSA9IDA7CisgICAgdmlydHVhbCB2b2lkIGdlb21l dHJ5RGlkQ2hhbmdlKGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIGZyYW1lUmVjdCwgY29uc3QgV2Vi Q29yZTo6SW50UmVjdCYgY2xpcFJlY3QpID0gMDsKIAogcHJvdGVjdGVkOgogICAgIFBsdWdpbigp OwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAg Yi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcAppbmRleCAyYWRiMGM0 YTVkOTllYWE2ODJjMDlkNDRjODY3Nzc0YmIzNjA2NmMxLi5hMTEzYTMxZjcyNjM0YmI3MjU5YTkw ZTBhYmEyMDJkNTc1MzU3NGRhIDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lu cy9QbHVnaW5WaWV3LmNwcAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5W aWV3LmNwcApAQCAtMjYsMTUgKzI2LDE5IEBACiAjaW5jbHVkZSAiUGx1Z2luVmlldy5oIgogCiAj aW5jbHVkZSAiUGx1Z2luLmgiCisjaW5jbHVkZSA8V2ViQ29yZS9GcmFtZVZpZXcuaD4KICNpbmNs dWRlIDxXZWJDb3JlL0dyYXBoaWNzQ29udGV4dC5oPgorI2luY2x1ZGUgPFdlYkNvcmUvSFRNTFBs dWdJbkVsZW1lbnQuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL1JlbmRlckxheWVyLmg+CiAjaW5jbHVk ZSA8V2ViQ29yZS9TY3JvbGxWaWV3Lmg+CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBu YW1lc3BhY2UgV2ViS2l0IHsKIAotUGx1Z2luVmlldzo6UGx1Z2luVmlldyhQYXNzUmVmUHRyPFBs dWdpbj4gcGx1Z2luKQorUGx1Z2luVmlldzo6UGx1Z2luVmlldyhQYXNzUmVmUHRyPFBsdWdpbj4g cGx1Z2luLCBIVE1MUGx1Z0luRWxlbWVudCogcGx1Z2luRWxlbWVudCkKICAgICA6IG1fcGx1Z2lu KHBsdWdpbikKKyAgICAsIG1fcGx1Z2luRWxlbWVudChwbHVnaW5FbGVtZW50KQogewogfQogCkBA IC02MSw3ICs2NSw2IEBAIHZvaWQgUGx1Z2luVmlldzo6cGFpbnQoR3JhcGhpY3NDb250ZXh0KiBj b250ZXh0LCBjb25zdCBJbnRSZWN0JiBkaXJ0eVJlY3QpCiAgICAgbV9wbHVnaW4tPnBhaW50KGNv bnRleHQsIHBhaW50UmVjdCk7CiB9CiAKLQogdm9pZCBQbHVnaW5WaWV3OjpmcmFtZVJlY3RzQ2hh bmdlZCgpCiB7CiAgICAgV2lkZ2V0OjpmcmFtZVJlY3RzQ2hhbmdlZCgpOwpAQCAtNzksOSArODIs MTggQEAgdm9pZCBQbHVnaW5WaWV3Ojp2aWV3R2VvbWV0cnlEaWRDaGFuZ2UoKQogICAgIGlmICgh cGFyZW50KCkpCiAgICAgICAgIHJldHVybjsKIAorICAgIC8vIEdldCB0aGUgZnJhbWUgcmVjdCBp biB3aW5kb3cgY29vcmRpbmF0ZXMuCiAgICAgSW50UmVjdCBmcmFtZVJlY3RJbldpbmRvd0Nvb3Jk aW5hdGVzID0gcGFyZW50KCktPmNvbnRlbnRzVG9XaW5kb3coZnJhbWVSZWN0KCkpOwotICAgIAot ICAgIG1fcGx1Z2luLT5nZW9tZXRyeURpZENoYW5nZShmcmFtZVJlY3RJbldpbmRvd0Nvb3JkaW5h dGVzKTsKKworICAgIC8vIEdldCB0aGUgd2luZG93IGNsaXAgcmVjdCBmb3IgdGhlIGVuY2xvc2lu ZyBsYXllciAoaW4gd2luZG93IGNvb3JkaW5hdGVzKS4KKyAgICBSZW5kZXJMYXllciogbGF5ZXIg PSBtX3BsdWdpbkVsZW1lbnQtPnJlbmRlcmVyKCktPmVuY2xvc2luZ0xheWVyKCk7CisgICAgRnJh bWVWaWV3KiBwYXJlbnRWaWV3ID0gbV9wbHVnaW5FbGVtZW50LT5kb2N1bWVudCgpLT5mcmFtZSgp LT52aWV3KCk7CisgICAgSW50UmVjdCB3aW5kb3dDbGlwUmVjdCA9IHBhcmVudFZpZXctPndpbmRv d0NsaXBSZWN0Rm9yTGF5ZXIobGF5ZXIsIHRydWUpOworCisgICAgLy8gSW50ZXJzZWN0IHRoZSB0 d28gcmVjdHMgdG8gZ2V0IHRoZSB2aWV3IGNsaXAgcmVjdCBpbiB3aW5kb3cgY29vcmRpbmF0ZXMu CisgICAgSW50UmVjdCBjbGlwUmVjdEluV2luZG93Q29vcmRpbmF0ZXMgPSBpbnRlcnNlY3Rpb24o ZnJhbWVSZWN0SW5XaW5kb3dDb29yZGluYXRlcywgd2luZG93Q2xpcFJlY3QpOworCisgICAgbV9w bHVnaW4tPmdlb21ldHJ5RGlkQ2hhbmdlKGZyYW1lUmVjdEluV2luZG93Q29vcmRpbmF0ZXMsIGNs aXBSZWN0SW5XaW5kb3dDb29yZGluYXRlcyk7CiB9CiAKIHZvaWQgUGx1Z2luVmlldzo6aW52YWxp ZGF0ZVJlY3QoY29uc3QgSW50UmVjdCYpCmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3Mv UGx1Z2lucy9QbHVnaW5WaWV3LmggYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5W aWV3LmgKaW5kZXggM2Y3NzZmZjQ1YzU0ZGMyNGYyZTkxNTIyMDQ0MGY4MTFhZWJhZTVhOS4uZTM0 ODYwYzY1OWUxOTNmMjQ0YWI0ZTI1YjcyMmE0MTA5YjM0MGUzOCAxMDA2NDQKLS0tIGEvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5oCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vz cy9QbHVnaW5zL1BsdWdpblZpZXcuaApAQCAtMzEsMTcgKzMxLDIxIEBACiAKIC8vIEZJWE1FOiBF dmVudHVhbGx5IHRoaXMgc2hvdWxkIG1vdmUgdG8gV2ViQ29yZS4KIAorbmFtZXNwYWNlIFdlYkNv cmUgeworICAgIGNsYXNzIEhUTUxQbHVnSW5FbGVtZW50OworfQorCiBuYW1lc3BhY2UgV2ViS2l0 IHsKIAogY2xhc3MgUGx1Z2luVmlldyA6IHB1YmxpYyBXZWJDb3JlOjpXaWRnZXQgewogcHVibGlj OgotICAgIHN0YXRpYyBQYXNzUmVmUHRyPFBsdWdpblZpZXc+IGNyZWF0ZShQYXNzUmVmUHRyPFBs dWdpbj4gcGx1Z2luKQorICAgIHN0YXRpYyBQYXNzUmVmUHRyPFBsdWdpblZpZXc+IGNyZWF0ZShQ YXNzUmVmUHRyPFBsdWdpbj4gcGx1Z2luLCBXZWJDb3JlOjpIVE1MUGx1Z0luRWxlbWVudCogcGx1 Z2luRWxlbWVudCkKICAgICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgUGx1Z2luVmll dyhwbHVnaW4pKTsKKyAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBQbHVnaW5WaWV3KHBsdWdp biwgcGx1Z2luRWxlbWVudCkpOwogICAgIH0KIAogcHJpdmF0ZToKLSAgICBQbHVnaW5WaWV3KFBh c3NSZWZQdHI8UGx1Z2luPik7CisgICAgUGx1Z2luVmlldyhQYXNzUmVmUHRyPFBsdWdpbj4sIFdl YkNvcmU6OkhUTUxQbHVnSW5FbGVtZW50Kik7CiAgICAgdmlydHVhbCB+UGx1Z2luVmlldygpOwog CiAgICAgdm9pZCB2aWV3R2VvbWV0cnlEaWRDaGFuZ2UoKTsKQEAgLTU0LDYgKzU4LDcgQEAgcHJp dmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgc2V0UGFyZW50KFdlYkNvcmU6OlNjcm9sbFZpZXcqKTsK IAogICAgIFJlZlB0cjxQbHVnaW4+IG1fcGx1Z2luOworICAgIFdlYkNvcmU6OkhUTUxQbHVnSW5F bGVtZW50KiBtX3BsdWdpbkVsZW1lbnQ7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlm ZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRl ckNsaWVudC5jcHAgYi9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVM b2FkZXJDbGllbnQuY3BwCmluZGV4IDdkMDZkMWYzMTE3MTg4MDRmMjY4YTZlYjE3MTU2NDg5ZmM0 YTRhMDkuLjY1NjAxM2E1Mjg5NWQ3YjFjYTA3MTM0MTZiZGQzMmRkNzBiNzNiZjYgMTAwNjQ0Ci0t LSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVu dC5jcHAKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9h ZGVyQ2xpZW50LmNwcApAQCAtNzcwLDcgKzc3MCw3IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGll bnQ6OmRpZFRyYW5zZmVyQ2hpbGRGcmFtZVRvTmV3RG9jdW1lbnQoKQogICAgIG5vdEltcGxlbWVu dGVkKCk7CiB9ICAgIAogCi1QYXNzUmVmUHRyPFdpZGdldD4gV2ViRnJhbWVMb2FkZXJDbGllbnQ6 OmNyZWF0ZVBsdWdpbihjb25zdCBJbnRTaXplJiwgSFRNTFBsdWdJbkVsZW1lbnQqLCBjb25zdCBL VVJMJiB1cmwsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbU5hbWVzLCBjb25zdCBWZWN0b3I8 U3RyaW5nPiYgcGFyYW1WYWx1ZXMsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgbG9hZE1h bnVhbGx5KQorUGFzc1JlZlB0cjxXaWRnZXQ+IFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpjcmVhdGVQ bHVnaW4oY29uc3QgSW50U2l6ZSYsIEhUTUxQbHVnSW5FbGVtZW50KiBwbHVnaW5FbGVtZW50LCBj b25zdCBLVVJMJiB1cmwsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbU5hbWVzLCBjb25zdCBW ZWN0b3I8U3RyaW5nPiYgcGFyYW1WYWx1ZXMsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wg bG9hZE1hbnVhbGx5KQogewogICAgIFN0cmluZyBwbHVnaW5QYXRoOwogCkBAIC03OTUsNyArNzk1 LDcgQEAgUGFzc1JlZlB0cjxXaWRnZXQ+IFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpjcmVhdGVQbHVn aW4oY29uc3QgSW50U2l6ZSYsIEhUTUxQbHVnSW4KICAgICBpZiAoIXBsdWdpbi0+aW5pdGlhbGl6 ZSh1cmwsIHBhcmFtTmFtZXMsIHBhcmFtVmFsdWVzLCBtaW1lVHlwZSwgbG9hZE1hbnVhbGx5KSkK ICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICByZXR1cm4gUGx1Z2luVmlldzo6Y3JlYXRlKHBsdWdp bi5yZWxlYXNlKCkpOworICAgIHJldHVybiBQbHVnaW5WaWV3OjpjcmVhdGUocGx1Z2luLnJlbGVh c2UoKSwgcGx1Z2luRWxlbWVudCk7CiAjZWxzZQogICAgIHJldHVybiAwOwogI2VuZGlmCg==