74525 2011-12-14 11:17:42 -0800 [Qt] [WK2] Move QWebPreferences out of QtWebPageProxy 2011-12-14 12:02:30 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 72943 1 cmarcelo cmarcelo webkit.review.bot zoltan oldest_to_newest 521112 0 cmarcelo 2011-12-14 11:17:42 -0800 [Qt] [WK2] Move QWebPreferences out of QtWebPageProxy 521116 1 119260 cmarcelo 2011-12-14 11:19:48 -0800 Created attachment 119260 Patch 521159 2 cmarcelo 2011-12-14 12:02:30 -0800 Committed r102809: <http://trac.webkit.org/changeset/102809> 119260 2011-12-14 11:19:48 -0800 2011-12-14 11:49:08 -0800 Patch bug-74525-20111214162048.patch text/plain 13926 cmarcelo U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyODAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOTVmMGUxNzIyMjAwZTgw YzUzMWU3MTU3N2MyOWMxZWUwMWFjZmVhNC4uNTU5ZmYyMzEwMmI3NmVhYzdjNzU3ZjAwMDZkNGFh NjBjNWQ4N2NkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM3IEBACiAyMDExLTEyLTE0ICBDYWlv IE1hcmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8gIDxjYWlvLm9saXZlaXJhQG9wZW5ib3NzYS5vcmc+ CiAKKyAgICAgICAgW1F0XSBbV0syXSBNb3ZlIFFXZWJQcmVmZXJlbmNlcyBvdXQgb2YgUXRXZWJQ YWdlUHJveHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTc0NTI1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VGhpcyBwYXRjaCBhbHNvIHVzZXMgaW50ZXJuYWwgV2ViS2l0IEFQSSB0byBzZXQgdGhlIEFjY2Vs ZXJhdGUgQ29tcG9zaXRpbmcKKyAgICAgICAgZGlyZWN0bHkgaW5zdGVhZCBvZiBnb2luZyB0aHJ1 IFFXZWJQcmVmZXJlbmNlc1ByaXZhdGUuIFRoZSBwcmV2aW91cyBhcHByb2FjaCB3YXMKKyAgICAg ICAgYWx3YXlzIGNhdXNpbmcgdGhlIFFXZWJQcmVmZXJlbmNlcyB0byBiZSBjcmVhdGVkIG1ha2lu ZyB0aGUgImxhenkgaW5pdGlhbGl6YXRpb24iCisgICAgICAgIHVzZWxlc3MuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwOgorICAgICAgICAoUVF1aWNrV2Vi Vmlld1ByaXZhdGU6OlFRdWlja1dlYlZpZXdQcml2YXRlKToKKyAgICAgICAgKFFRdWlja1dlYlZp ZXdQcml2YXRlOjppbml0aWFsaXplKToKKyAgICAgICAgKFFRdWlja1dlYlZpZXdQcml2YXRlOjpu YXZpZ2F0b3JRdE9iamVjdEVuYWJsZWQpOgorICAgICAgICAoUVF1aWNrV2ViVmlld1ByaXZhdGU6 OnNldE5hdmlnYXRvclF0T2JqZWN0RW5hYmxlZCk6CisgICAgICAgIChRUXVpY2tXZWJWaWV3RXhw ZXJpbWVudGFsOjpwb3N0TWVzc2FnZSk6CisgICAgICAgIChRUXVpY2tXZWJWaWV3OjpwcmVmZXJl bmNlcyk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3BfcC5oOgor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXdlYnByZWZlcmVuY2VzLmNwcDoKKyAgICAgICAg KFFXZWJQcmVmZXJlbmNlc1ByaXZhdGU6OmNyZWF0ZVByZWZlcmVuY2VzKToKKyAgICAgICAgKFFX ZWJQcmVmZXJlbmNlc1ByaXZhdGU6OnRlc3RBdHRyaWJ1dGUpOgorICAgICAgICAoUVdlYlByZWZl cmVuY2VzUHJpdmF0ZTo6c2V0QXR0cmlidXRlKToKKyAgICAgICAgKFFXZWJQcmVmZXJlbmNlczo6 bmF2aWdhdG9yUXRPYmplY3RFbmFibGVkKToKKyAgICAgICAgKFFXZWJQcmVmZXJlbmNlczo6c2V0 TmF2aWdhdG9yUXRPYmplY3RFbmFibGVkKToKKyAgICAgICAgKFFXZWJQcmVmZXJlbmNlc1ByaXZh dGU6OnByZWZlcmVuY2VzUmVmKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F3ZWJwcmVm ZXJlbmNlc19wX3AuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3Bw OgorICAgICAgICAoUXRXZWJQYWdlUHJveHk6OlF0V2ViUGFnZVByb3h5KToKKyAgICAgICAgKiBV SVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuaDoKKworMjAxMS0xMi0xNCAgQ2FpbyBNYXJjZWxv IGRlIE9saXZlaXJhIEZpbGhvICA8Y2Fpby5vbGl2ZWlyYUBvcGVuYm9zc2Eub3JnPgorCiAgICAg ICAgIFtRdF0gW1dLMl0gTW92ZSBkb3dubG9hZCBoYW5kbGluZyBvdXQgb2YgUXRXZWJQYWdlUHJv eHkKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc0NTA2 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vi dmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcu Y3BwCmluZGV4IDA0NmZmYTA5YmZjOGE4NWE5Mjc3Mzc3Y2U1NGIxZjM3OGQxYjI2N2QuLjI5ZGIz ZWVkYzUxYjI3MDdhNDc0NjdmODg3MGU1M2E2NTM2NjlkYzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcApAQCAtMzgsNiArMzgsNyBA QAogI2luY2x1ZGUgInF3ZWJkb3dubG9hZGl0ZW1fcF9wLmgiCiAjaW5jbHVkZSAicXdlYm5hdmln YXRpb25oaXN0b3J5X3AuaCIKICNpbmNsdWRlICJxd2VibmF2aWdhdGlvbmhpc3RvcnlfcF9wLmgi CisjaW5jbHVkZSAicXdlYnByZWZlcmVuY2VzX3AuaCIKICNpbmNsdWRlICJxd2VicHJlZmVyZW5j ZXNfcF9wLmgiCiAKICNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9Jbml0aWFsaXplVGhyZWFkaW5n Lmg+CkBAIC01NSw2ICs1Niw3IEBAIFFRdWlja1dlYlZpZXdQcml2YXRlOjpRUXVpY2tXZWJWaWV3 UHJpdmF0ZShRUXVpY2tXZWJWaWV3KiB2aWV3cG9ydCkKICAgICAsIHBvc3RUcmFuc2l0aW9uU3Rh dGUoYWRvcHRQdHIobmV3IFBvc3RUcmFuc2l0aW9uU3RhdGUodGhpcykpKQogICAgICwgaXNUcmFu c2l0aW9uaW5nVG9OZXdQYWdlKGZhbHNlKQogICAgICwgcGFnZUlzU3VzcGVuZGVkKGZhbHNlKQor ICAgICwgbV9uYXZpZ2F0b3JRdE9iamVjdEVuYWJsZWQoZmFsc2UpCiB7CiAgICAgdmlld3BvcnQt PnNldEZsYWdzKFFRdWlja0l0ZW06Okl0ZW1DbGlwc0NoaWxkcmVuVG9TaGFwZSk7CiAgICAgUU9i amVjdDo6Y29ubmVjdCh2aWV3cG9ydCwgU0lHTkFMKHZpc2libGVDaGFuZ2VkKCkpLCB2aWV3cG9y dCwgU0xPVChfcV9vblZpc2libGVDaGFuZ2VkKCkpKTsKQEAgLTgyLDcgKzg0LDcgQEAgdm9pZCBR UXVpY2tXZWJWaWV3UHJpdmF0ZTo6aW5pdGlhbGl6ZShXS0NvbnRleHRSZWYgY29udGV4dFJlZiwg V0tQYWdlR3JvdXBSZWYgcGEKIAogICAgIC8vIEFueSBwYWdlIHNldHRpbmcgc2hvdWxkIHByZWZl cnJhYmxlIGJlIHNldCBiZWZvcmUgY3JlYXRpbmcgdGhlIHBhZ2UsIHNvIHNldCB0aGVtIGhlcmU6 CiAgICAgc2V0VXNlVHJhZGl0aW9uYWxEZXNrdG9wQmVoYXZpb3VyKGZhbHNlKTsKLSAgICBRV2Vi UHJlZmVyZW5jZXNQcml2YXRlOjpnZXQocGFnZVByb3h5LT5wcmVmZXJlbmNlcygpKS0+c2V0QXR0 cmlidXRlKFFXZWJQcmVmZXJlbmNlc1ByaXZhdGU6OkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFi bGVkLCB0cnVlKTsKKyAgICB3ZWJQYWdlUHJveHkoKS0+cGFnZUdyb3VwKCktPnByZWZlcmVuY2Vz KCktPnNldEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkKHRydWUpOwogCiAgICAgcGFnZUNs aWVudC5pbml0aWFsaXplKHFfcHRyLCBwYWdlUHJveHkuZGF0YSgpLCBwYWdlVmlld1ByaXZhdGUt PmV2ZW50SGFuZGxlci5kYXRhKCksICZ1bmRvQ29udHJvbGxlcik7CiAKQEAgLTQ3MCw2ICs0NzIs MTkgQEAgdm9pZCBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6c2V0Vmlld0luQXR0YWNoZWRQcm9wZXJ0 aWVzKFFPYmplY3QqIG9iamVjdCkKICAgICBhdHRhY2hlZC0+c2V0VmlldyhxKTsKIH0KIAorYm9v bCBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6bmF2aWdhdG9yUXRPYmplY3RFbmFibGVkKCkgY29uc3QK K3sKKyAgICByZXR1cm4gbV9uYXZpZ2F0b3JRdE9iamVjdEVuYWJsZWQ7Cit9CisKK3ZvaWQgUVF1 aWNrV2ViVmlld1ByaXZhdGU6OnNldE5hdmlnYXRvclF0T2JqZWN0RW5hYmxlZChib29sIGVuYWJs ZWQpCit7CisgICAgQVNTRVJUKGVuYWJsZWQgIT0gbV9uYXZpZ2F0b3JRdE9iamVjdEVuYWJsZWQp OworICAgIC8vIEZJWE1FOiBDdXJyZW50bHkgd2UgaGF2ZSB0byBrZWVwIHRoaXMgaW5mb3JtYXRp b24gaW4gYm90aCBwcm9jZXNzZXMgYW5kIHRoZSBzZXR0aW5nIGlzIGFzeW5jaHJvbm91cy4KKyAg ICBtX25hdmlnYXRvclF0T2JqZWN0RW5hYmxlZCA9IGVuYWJsZWQ7CisgICAgY29udGV4dC0+c2V0 TmF2aWdhdG9yUXRPYmplY3RFbmFibGVkKHdlYlBhZ2VQcm94eSgpLCBlbmFibGVkKTsKK30KKwog Ly8gRklYTUU6IFJlbW92ZSB0aGlzIG9uY2UgUXRXZWJQYWdlUHJveHkgaXMgcmVtb3ZlZC4KIFdl YktpdDo6V2ViUGFnZVByb3h5KiBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6d2ViUGFnZVByb3h5KCkg Y29uc3QKIHsKQEAgLTU0NSw3ICs1NjAsNyBAQCB2b2lkIFFRdWlja1dlYlZpZXdFeHBlcmltZW50 YWw6OnNldFVzZVRyYWRpdGlvbmFsRGVza3RvcEJlaGF2aW91cihib29sIGVuYWJsZSkKIHZvaWQg UVF1aWNrV2ViVmlld0V4cGVyaW1lbnRhbDo6cG9zdE1lc3NhZ2UoY29uc3QgUVN0cmluZyYgbWVz c2FnZSkKIHsKICAgICBRX0QoUVF1aWNrV2ViVmlldyk7Ci0gICAgZC0+cGFnZVByb3h5LT5wb3N0 TWVzc2FnZVRvTmF2aWdhdG9yUXRPYmplY3QobWVzc2FnZSk7CisgICAgZC0+Y29udGV4dC0+cG9z dE1lc3NhZ2VUb05hdmlnYXRvclF0T2JqZWN0KGQtPndlYlBhZ2VQcm94eSgpLCBtZXNzYWdlKTsK IH0KIAogUURlY2xhcmF0aXZlQ29tcG9uZW50KiBRUXVpY2tXZWJWaWV3RXhwZXJpbWVudGFsOjph bGVydERpYWxvZygpIGNvbnN0CkBAIC03NDAsOCArNzU1LDEwIEBAIFFTdHJpbmcgUVF1aWNrV2Vi Vmlldzo6dGl0bGUoKSBjb25zdAogCiBRV2ViUHJlZmVyZW5jZXMqIFFRdWlja1dlYlZpZXc6OnBy ZWZlcmVuY2VzKCkgY29uc3QKIHsKLSAgICBRX0QoY29uc3QgUVF1aWNrV2ViVmlldyk7Ci0gICAg cmV0dXJuIGQtPnBhZ2VQcm94eS0+cHJlZmVyZW5jZXMoKTsKKyAgICBRUXVpY2tXZWJWaWV3UHJp dmF0ZSogZCA9IGNvbnN0X2Nhc3Q8UVF1aWNrV2ViVmlld1ByaXZhdGUqPihkX3B0ci5kYXRhKCkp OworICAgIGlmICghZC0+cHJlZmVyZW5jZXMpCisgICAgICAgIGQtPnByZWZlcmVuY2VzID0gYWRv cHRQdHIoUVdlYlByZWZlcmVuY2VzUHJpdmF0ZTo6Y3JlYXRlUHJlZmVyZW5jZXMoZCkpOworICAg IHJldHVybiBkLT5wcmVmZXJlbmNlcy5nZXQoKTsKIH0KIAogUVF1aWNrV2ViVmlld0V4cGVyaW1l bnRhbCogUVF1aWNrV2ViVmlldzo6ZXhwZXJpbWVudGFsKCkgY29uc3QKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlld19wX3AuaCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlld19wX3AuaAppbmRleCAyMWI2 YWFiYjI4YWQzZGMyY2EzNzI5M2ZmM2UxMDdmZDNmNzM2N2MyLi5jYTBjOWNkNmQ5Zjg2YjIxMGUz YzA3NGFkYmYyYjgyYzA2MmIzNTVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL3F0L3FxdWlja3dlYnZpZXdfcF9wLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3BfcC5oCkBAIC05Nyw2ICs5Nyw5IEBAIHB1YmxpYzoK ICAgICB2b2lkIHNldFVzZVRyYWRpdGlvbmFsRGVza3RvcEJlaGF2aW91cihib29sIGVuYWJsZSk7 CiAgICAgdm9pZCBzZXRWaWV3SW5BdHRhY2hlZFByb3BlcnRpZXMoUU9iamVjdCopOwogCisgICAg Ym9vbCBuYXZpZ2F0b3JRdE9iamVjdEVuYWJsZWQoKSBjb25zdDsKKyAgICB2b2lkIHNldE5hdmln YXRvclF0T2JqZWN0RW5hYmxlZChib29sKTsKKwogICAgIFdlYktpdDo6V2ViUGFnZVByb3h5KiB3 ZWJQYWdlUHJveHkoKSBjb25zdDsKIAogICAgIC8vIFBhZ2VDbGllbnQuCkBAIC0xNDQsNiArMTQ3 LDcgQEAgcHJpdmF0ZToKICAgICBRdFBhZ2VDbGllbnQgcGFnZUNsaWVudDsKICAgICBRdFdlYlVu ZG9Db250cm9sbGVyIHVuZG9Db250cm9sbGVyOwogICAgIE93blB0cjxRV2ViTmF2aWdhdGlvbkhp c3Rvcnk+IG5hdmlnYXRpb25IaXN0b3J5OworICAgIE93blB0cjxRV2ViUHJlZmVyZW5jZXM+IHBy ZWZlcmVuY2VzOwogCiAgICAgUVNjb3BlZFBvaW50ZXI8UXRXZWJQYWdlTG9hZENsaWVudD4gcGFn ZUxvYWRDbGllbnQ7CiAgICAgUVNjb3BlZFBvaW50ZXI8UXRXZWJQYWdlUG9saWN5Q2xpZW50PiBw YWdlUG9saWN5Q2xpZW50OwpAQCAtMTYyLDEyICsxNjYsMTQgQEAgcHJpdmF0ZToKIAogICAgIFdl YkNvcmU6OlZpZXdwb3J0QXJndW1lbnRzIHZpZXdwb3J0QXJndW1lbnRzOwogICAgIE93blB0cjxQ b3N0VHJhbnNpdGlvblN0YXRlPiBwb3N0VHJhbnNpdGlvblN0YXRlOworICAgIFFGaWxlRGlhbG9n KiBmaWxlRGlhbG9nOworICAgIFdLT3BlblBhbmVsUmVzdWx0TGlzdGVuZXJSZWYgb3BlblBhbmVs UmVzdWx0TGlzdGVuZXI7CisKICAgICBib29sIGlzVHJhbnNpdGlvbmluZ1RvTmV3UGFnZTsKICAg ICBib29sIHBhZ2VJc1N1c3BlbmRlZDsKIAogICAgIGJvb2wgdXNlVHJhZGl0aW9uYWxEZXNrdG9w QmVoYXZpb3VyOwotICAgIFFGaWxlRGlhbG9nKiBmaWxlRGlhbG9nOwotICAgIFdLT3BlblBhbmVs UmVzdWx0TGlzdGVuZXJSZWYgb3BlblBhbmVsUmVzdWx0TGlzdGVuZXI7CisgICAgYm9vbCBtX25h dmlnYXRvclF0T2JqZWN0RW5hYmxlZDsKIH07CiAKICNlbmRpZiAvLyBxcXVpY2t3ZWJ2aWV3X3Bf cF9oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJwcmVm ZXJlbmNlcy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJwcmVmZXJl bmNlcy5jcHAKaW5kZXggMjA3MWJhZTQxMDMxYzg0NzI3YmNiMzNjNDMxNmFhM2E5YjdmMDc3NS4u ZDg1YjNlMzQ0ZGU3MWU2NGM2YWU0ZDI4YWJlMjhkNGQwNzc3YjhlZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2VicHJlZmVyZW5jZXMuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYnByZWZlcmVuY2VzLmNwcApAQCAtMjAs MTggKzIwLDE4IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAicXdlYnByZWZlcmVu Y2VzX3AuaCIKIAotI2luY2x1ZGUgIlF0V2ViUGFnZVByb3h5LmgiCiAjaW5jbHVkZSAiV0tQYWdl R3JvdXAuaCIKICNpbmNsdWRlICJXS1ByZWZlcmVuY2VzLmgiCiAjaW5jbHVkZSAiV0tQcmVmZXJl bmNlc1ByaXZhdGUuaCIKICNpbmNsdWRlICJXS1JldGFpblB0ci5oIgogI2luY2x1ZGUgIldLU3Ry aW5nUXQuaCIKKyNpbmNsdWRlICJxcXVpY2t3ZWJ2aWV3X3BfcC5oIgogI2luY2x1ZGUgInF3ZWJw cmVmZXJlbmNlc19wX3AuaCIKIAotUVdlYlByZWZlcmVuY2VzKiBRV2ViUHJlZmVyZW5jZXNQcml2 YXRlOjpjcmVhdGVQcmVmZXJlbmNlcyhRdFdlYlBhZ2VQcm94eSogcXRXZWJQYWdlUHJveHkpCitR V2ViUHJlZmVyZW5jZXMqIFFXZWJQcmVmZXJlbmNlc1ByaXZhdGU6OmNyZWF0ZVByZWZlcmVuY2Vz KFFRdWlja1dlYlZpZXdQcml2YXRlKiB3ZWJWaWV3UHJpdmF0ZSkKIHsKICAgICBRV2ViUHJlZmVy ZW5jZXMqIHByZWZzID0gbmV3IFFXZWJQcmVmZXJlbmNlczsKLSAgICBwcmVmcy0+ZC0+cXRXZWJQ YWdlUHJveHkgPSBxdFdlYlBhZ2VQcm94eTsKKyAgICBwcmVmcy0+ZC0+d2ViVmlld1ByaXZhdGUg PSB3ZWJWaWV3UHJpdmF0ZTsKICAgICByZXR1cm4gcHJlZnM7CiB9CiAKQEAgLTU0LDggKzU0LDYg QEAgYm9vbCBRV2ViUHJlZmVyZW5jZXNQcml2YXRlOjp0ZXN0QXR0cmlidXRlKFFXZWJQcmVmZXJl bmNlc1ByaXZhdGU6OldlYkF0dHJpYnV0ZQogICAgICAgICByZXR1cm4gV0tQcmVmZXJlbmNlc0dl dFByaXZhdGVCcm93c2luZ0VuYWJsZWQocHJlZmVyZW5jZXNSZWYoKSk7CiAgICAgY2FzZSBEbnNQ cmVmZXRjaEVuYWJsZWQ6CiAgICAgICAgIHJldHVybiBXS1ByZWZlcmVuY2VzR2V0RE5TUHJlZmV0 Y2hpbmdFbmFibGVkKHByZWZlcmVuY2VzUmVmKCkpOwotICAgIGNhc2UgQWNjZWxlcmF0ZWRDb21w b3NpdGluZ0VuYWJsZWQ6Ci0gICAgICAgIHJldHVybiBXS1ByZWZlcmVuY2VzR2V0QWNjZWxlcmF0 ZWRDb21wb3NpdGluZ0VuYWJsZWQocHJlZmVyZW5jZXNSZWYoKSk7CiAgICAgZGVmYXVsdDoKICAg ICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTg5 LDkgKzg3LDYgQEAgdm9pZCBRV2ViUHJlZmVyZW5jZXNQcml2YXRlOjpzZXRBdHRyaWJ1dGUoUVdl YlByZWZlcmVuY2VzUHJpdmF0ZTo6V2ViQXR0cmlidXRlIGEKICAgICBjYXNlIERuc1ByZWZldGNo RW5hYmxlZDoKICAgICAgICAgV0tQcmVmZXJlbmNlc1NldEROU1ByZWZldGNoaW5nRW5hYmxlZChw cmVmZXJlbmNlc1JlZigpLCBlbmFibGUpOwogICAgICAgICBicmVhazsKLSAgICBjYXNlIEFjY2Vs ZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkOgotICAgICAgICBXS1ByZWZlcmVuY2VzU2V0QWNjZWxl cmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQocHJlZmVyZW5jZXNSZWYoKSwgZW5hYmxlKTsKLSAgICAg ICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAg ICAgfQpAQCAtMjg3LDE0ICsyODIsMTQgQEAgdm9pZCBRV2ViUHJlZmVyZW5jZXM6OnNldERuc1By ZWZldGNoRW5hYmxlZChib29sIGVuYWJsZSkKIAogYm9vbCBRV2ViUHJlZmVyZW5jZXM6Om5hdmln YXRvclF0T2JqZWN0RW5hYmxlZCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGQtPnF0V2ViUGFnZVBy b3h5LT5uYXZpZ2F0b3JRdE9iamVjdEVuYWJsZWQoKTsKKyAgICByZXR1cm4gZC0+d2ViVmlld1By aXZhdGUtPm5hdmlnYXRvclF0T2JqZWN0RW5hYmxlZCgpOwogfQogCiB2b2lkIFFXZWJQcmVmZXJl bmNlczo6c2V0TmF2aWdhdG9yUXRPYmplY3RFbmFibGVkKGJvb2wgZW5hYmxlKQogewogICAgIGlm IChlbmFibGUgPT0gbmF2aWdhdG9yUXRPYmplY3RFbmFibGVkKCkpCiAgICAgICAgIHJldHVybjsK LSAgICBkLT5xdFdlYlBhZ2VQcm94eS0+c2V0TmF2aWdhdG9yUXRPYmplY3RFbmFibGVkKGVuYWJs ZSk7CisgICAgZC0+d2ViVmlld1ByaXZhdGUtPnNldE5hdmlnYXRvclF0T2JqZWN0RW5hYmxlZChl bmFibGUpOwogICAgIGVtaXQgbmF2aWdhdG9yUXRPYmplY3RFbmFibGVkQ2hhbmdlZCgpOwogfQog CkBAIC0zOTksNyArMzk0LDcgQEAgdm9pZCBRV2ViUHJlZmVyZW5jZXM6OnNldERlZmF1bHRGaXhl ZEZvbnRTaXplKHVuc2lnbmVkIHNpemUpCiAKIFdLUHJlZmVyZW5jZXNSZWYgUVdlYlByZWZlcmVu Y2VzUHJpdmF0ZTo6cHJlZmVyZW5jZXNSZWYoKSBjb25zdAogewotICAgIFdLUGFnZUdyb3VwUmVm IHBhZ2VHcm91cFJlZiA9IFdLUGFnZUdldFBhZ2VHcm91cChxdFdlYlBhZ2VQcm94eS0+cGFnZVJl ZigpKTsKKyAgICBXS1BhZ2VHcm91cFJlZiBwYWdlR3JvdXBSZWYgPSB0b0FQSSh3ZWJWaWV3UHJp dmF0ZS0+d2ViUGFnZVByb3h5KCktPnBhZ2VHcm91cCgpKTsKICAgICByZXR1cm4gV0tQYWdlR3Jv dXBHZXRQcmVmZXJlbmNlcyhwYWdlR3JvdXBSZWYpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJwcmVmZXJlbmNlc19wX3AuaCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYnByZWZlcmVuY2VzX3BfcC5oCmluZGV4IGI1MDc5 MWY5MmY4NjhjYmU5MjQ1Y2RkNWY3ZTY5OWMwY2RiM2MyZGQuLmY0ZWYxM2MyMWNiODNjNTQ0YTU5 MThmYzVmZDQ5YjUyNDI0NzkxMDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvcXQvcXdlYnByZWZlcmVuY2VzX3BfcC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvcXQvcXdlYnByZWZlcmVuY2VzX3BfcC5oCkBAIC0yMiw3ICsyMiw3IEBACiAKICNp bmNsdWRlICJXS1ByZWZlcmVuY2VzLmgiCiAKLWNsYXNzIFF0V2ViUGFnZVByb3h5OworY2xhc3Mg UVF1aWNrV2ViVmlld1ByaXZhdGU7CiAKIGNsYXNzIFFXZWJQcmVmZXJlbmNlc1ByaXZhdGUgewog cHVibGljOgpAQCAtMzYsNyArMzYsNiBAQCBwdWJsaWM6CiAgICAgICAgIFhTU0F1ZGl0aW5nRW5h YmxlZCwKICAgICAgICAgRnJhbWVGbGF0dGVuaW5nRW5hYmxlZCwKICAgICAgICAgUHJpdmF0ZUJy b3dzaW5nRW5hYmxlZCwKLSAgICAgICAgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQsCiAg ICAgICAgIERuc1ByZWZldGNoRW5hYmxlZAogICAgIH07CiAKQEAgLTU1LDcgKzU0LDcgQEAgcHVi bGljOgogICAgICAgICBEZWZhdWx0Rml4ZWRGb250U2l6ZQogICAgIH07CiAKLSAgICBzdGF0aWMg UVdlYlByZWZlcmVuY2VzKiBjcmVhdGVQcmVmZXJlbmNlcyhRdFdlYlBhZ2VQcm94eSopOworICAg IHN0YXRpYyBRV2ViUHJlZmVyZW5jZXMqIGNyZWF0ZVByZWZlcmVuY2VzKFFRdWlja1dlYlZpZXdQ cml2YXRlKik7CiAKICAgICB2b2lkIHNldEF0dHJpYnV0ZShXZWJBdHRyaWJ1dGUgYXR0ciwgYm9v bCBlbmFibGUpOwogICAgIGJvb2wgdGVzdEF0dHJpYnV0ZShXZWJBdHRyaWJ1dGUgYXR0cikgY29u c3Q7CkBAIC02OCw3ICs2Nyw3IEBAIHB1YmxpYzoKIAogICAgIFdLUHJlZmVyZW5jZXNSZWYgcHJl ZmVyZW5jZXNSZWYoKSBjb25zdDsKIAotICAgIFF0V2ViUGFnZVByb3h5KiBxdFdlYlBhZ2VQcm94 eTsKKyAgICBRUXVpY2tXZWJWaWV3UHJpdmF0ZSogd2ViVmlld1ByaXZhdGU7CiAKICAgICBzdGF0 aWMgUVdlYlByZWZlcmVuY2VzUHJpdmF0ZSogZ2V0KFFXZWJQcmVmZXJlbmNlcyopOwogfTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3BwCmluZGV4IDg4 YjhmZDhhZjBhOGNhZjA3MTdlMjdjNmUxNWU1ZmUxODBkMTlkN2MuLjE0OGE1NGYwZjczNTE4NzBj NzcxZTMzYWE3ZmMzMGExMDViNGU2YjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L3F0L1F0V2ViUGFnZVByb3h5LmNwcApAQCAtMjQsOCArMjQsNiBAQAogI2luY2x1ZGUgPFF0UXVp Y2svcXF1aWNrY2FudmFzLmg+CiAjaW5jbHVkZSAicXF1aWNrd2Vidmlld19wLmgiCiAjaW5jbHVk ZSAicXF1aWNrd2Vidmlld19wX3AuaCIKLSNpbmNsdWRlICJxd2VicHJlZmVyZW5jZXNfcC5oIgot I2luY2x1ZGUgInF3ZWJwcmVmZXJlbmNlc19wX3AuaCIKIAogI2luY2x1ZGUgIlF0UGFnZUNsaWVu dC5oIgogI2luY2x1ZGUgIlF0V2ViQ29udGV4dC5oIgpAQCAtNDEsNyArMzksNiBAQCB1c2luZyBu YW1lc3BhY2UgV2ViQ29yZTsKIFF0V2ViUGFnZVByb3h5OjpRdFdlYlBhZ2VQcm94eShRUXVpY2tX ZWJWaWV3KiBxbWxXZWJWaWV3LCBRdFBhZ2VDbGllbnQgKnBhZ2VDbGllbnQsIFBhc3NSZWZQdHI8 UXRXZWJDb250ZXh0PiBjb250ZXh0LCBXS1BhZ2VHcm91cFJlZiBwYWdlR3JvdXBSZWYpCiAgICAg OiBtX3FtbFdlYlZpZXcocW1sV2ViVmlldykKICAgICAsIG1fY29udGV4dChjb250ZXh0KQotICAg ICwgbV9uYXZpZ2F0b3JRdE9iamVjdEVuYWJsZWQoZmFsc2UpCiB7CiAgICAgbV93ZWJQYWdlUHJv eHkgPSBtX2NvbnRleHQtPmNyZWF0ZVdlYlBhZ2UocGFnZUNsaWVudCwgdG9JbXBsKHBhZ2VHcm91 cFJlZikpOwogfQpAQCAtOTMsMTMgKzkwLDYgQEAgV0tQYWdlUmVmIFF0V2ViUGFnZVByb3h5Ojpw YWdlUmVmKCkgY29uc3QKICAgICByZXR1cm4gdG9BUEkobV93ZWJQYWdlUHJveHkuZ2V0KCkpOzsK IH0KIAotUVdlYlByZWZlcmVuY2VzKiBRdFdlYlBhZ2VQcm94eTo6cHJlZmVyZW5jZXMoKSBjb25z dAotewotICAgIGlmICghbV9wcmVmZXJlbmNlcykKLSAgICAgICAgbV9wcmVmZXJlbmNlcyA9IGFk b3B0UHRyKFFXZWJQcmVmZXJlbmNlc1ByaXZhdGU6OmNyZWF0ZVByZWZlcmVuY2VzKGNvbnN0X2Nh c3Q8UXRXZWJQYWdlUHJveHkqPih0aGlzKSkpOwotICAgIHJldHVybiBtX3ByZWZlcmVuY2VzLmdl dCgpOwotfQotCiB2b2lkIFF0V2ViUGFnZVByb3h5OjpzZXRDdXN0b21Vc2VyQWdlbnQoY29uc3Qg UVN0cmluZyYgdXNlckFnZW50KQogewogICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiB3a1Vz ZXJBZ2VudChXS1N0cmluZ0NyZWF0ZVdpdGhRU3RyaW5nKHVzZXJBZ2VudCkpOwpAQCAtMTExLDE5 ICsxMDEsNiBAQCBRU3RyaW5nIFF0V2ViUGFnZVByb3h5OjpjdXN0b21Vc2VyQWdlbnQoKSBjb25z dAogICAgIHJldHVybiBXS1N0cmluZ0NvcHlRU3RyaW5nKFdLUGFnZUNvcHlDdXN0b21Vc2VyQWdl bnQocGFnZVJlZigpKSk7CiB9CiAKLXZvaWQgUXRXZWJQYWdlUHJveHk6OnNldE5hdmlnYXRvclF0 T2JqZWN0RW5hYmxlZChib29sIGVuYWJsZWQpCi17Ci0gICAgQVNTRVJUKGVuYWJsZWQgIT0gbV9u YXZpZ2F0b3JRdE9iamVjdEVuYWJsZWQpOwotICAgIC8vIEZJWE1FOiBDdXJyZW50bHkgd2UgaGF2 ZSB0byBrZWVwIHRoaXMgaW5mb3JtYXRpb24gaW4gYm90aCBwcm9jZXNzZXMgYW5kIHRoZSBzZXR0 aW5nIGlzIGFzeW5jaHJvbm91cy4KLSAgICBtX25hdmlnYXRvclF0T2JqZWN0RW5hYmxlZCA9IGVu YWJsZWQ7Ci0gICAgbV9jb250ZXh0LT5zZXROYXZpZ2F0b3JRdE9iamVjdEVuYWJsZWQobV93ZWJQ YWdlUHJveHkuZ2V0KCksIGVuYWJsZWQpOwotfQotCi12b2lkIFF0V2ViUGFnZVByb3h5Ojpwb3N0 TWVzc2FnZVRvTmF2aWdhdG9yUXRPYmplY3QoY29uc3QgUVN0cmluZyYgbWVzc2FnZSkKLXsKLSAg ICBtX2NvbnRleHQtPnBvc3RNZXNzYWdlVG9OYXZpZ2F0b3JRdE9iamVjdChtX3dlYlBhZ2VQcm94 eS5nZXQoKSwgbWVzc2FnZSk7Ci19Ci0KIHFyZWFsIFF0V2ViUGFnZVByb3h5Ojp0ZXh0Wm9vbUZh Y3RvcigpIGNvbnN0CiB7CiAgICAgcmV0dXJuIFdLUGFnZUdldFRleHRab29tRmFjdG9yKHBhZ2VS ZWYoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdl UHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5oCmlu ZGV4IDdkYWFhMjQ5ZDU4MjQ4YTZhOTdhNmNjOGE4ZTZlYTU0ZjJhZThhMjIuLjc4MDc0M2ZkODk3 YzFhYTJlMmVhNDQ4NDdkNmI1MGQ4ZWM2MDA3OTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5oCkBAIC0yOSw3ICsyOSw2IEBACiAKIGNsYXNzIFF0UGFn ZUNsaWVudDsKIGNsYXNzIFFRdWlja1dlYlZpZXc7Ci1jbGFzcyBRV2ViUHJlZmVyZW5jZXM7CiAK IG5hbWVzcGFjZSBXZWJLaXQgewogY2xhc3MgUXRXZWJDb250ZXh0OwpAQCAtNDcsMTYgKzQ2LDkg QEAgcHVibGljOgogCiAgICAgV0tQYWdlUmVmIHBhZ2VSZWYoKSBjb25zdDsKIAotICAgIFFXZWJQ cmVmZXJlbmNlcyogcHJlZmVyZW5jZXMoKSBjb25zdDsKLQogICAgIHZvaWQgc2V0Q3VzdG9tVXNl ckFnZW50KGNvbnN0IFFTdHJpbmcmKTsKICAgICBRU3RyaW5nIGN1c3RvbVVzZXJBZ2VudCgpIGNv bnN0OwogCi0gICAgdm9pZCBzZXROYXZpZ2F0b3JRdE9iamVjdEVuYWJsZWQoYm9vbCk7Ci0gICAg Ym9vbCBuYXZpZ2F0b3JRdE9iamVjdEVuYWJsZWQoKSBjb25zdCB7IHJldHVybiBtX25hdmlnYXRv clF0T2JqZWN0RW5hYmxlZDsgfQotCi0gICAgdm9pZCBwb3N0TWVzc2FnZVRvTmF2aWdhdG9yUXRP YmplY3QoY29uc3QgUVN0cmluZyYpOwotCiAgICAgcXJlYWwgdGV4dFpvb21GYWN0b3IoKSBjb25z dDsKICAgICBxcmVhbCBwYWdlWm9vbUZhY3RvcigpIGNvbnN0OwogICAgIHZvaWQgc2V0VGV4dFpv b21GYWN0b3IocXJlYWwgem9vbUZhY3Rvcik7CkBAIC04MywxMCArNzUsNiBAQCBwcm90ZWN0ZWQ6 CiBwcml2YXRlOgogICAgIFJlZlB0cjxRdFdlYkNvbnRleHQ+IG1fY29udGV4dDsKIAotICAgIG11 dGFibGUgT3duUHRyPFFXZWJQcmVmZXJlbmNlcz4gbV9wcmVmZXJlbmNlczsKLQotICAgIGJvb2wg bV9uYXZpZ2F0b3JRdE9iamVjdEVuYWJsZWQ7Ci0KICAgICBRU2hhcmVkUG9pbnRlcjxRTWVudT4g YWN0aXZlTWVudTsKIH07CiAK