87855 2012-05-30 08:00:08 -0700 [Qt] Move ViewportAttribute related methods to the interaction engine. 2012-06-01 23:33:32 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kenneth kenneth cmarcelo hausmann menard webkit.review.bot zalan zoltan oldest_to_newest 637226 0 kenneth 2012-05-30 08:00:08 -0700 SSIA 637229 1 144817 kenneth 2012-05-30 08:00:49 -0700 Created attachment 144817 Patch 637238 2 kenneth 2012-05-30 08:07:03 -0700 Committed in 118923. 639963 3 144817 hausmann 2012-06-01 23:33:32 -0700 Comment on attachment 144817 Patch Clearing review to take this out of the review queue. It's been reviewed on IRC and landed, i.e. this bug is already resolved. 144817 2012-05-30 08:00:49 -0700 2012-06-01 23:33:32 -0700 Patch bug-87855-20120530165926.patch text/plain 12725 kenneth U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4OTE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZTBhODhhMDcxNDM1MWNi ODg2ZGZhZjhiYzE3ZjkyNTA3ZjVkM2Q1Zi4uMTgwMjg2YmVkZjhjY2U1NzA2MzlmYzIxMGY2MzFj ZmMyZWZkMjcwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM2IEBACiAyMDEyLTA1LTMwICBLZW5u ZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Via2l0Lm9yZz4KIAorICAgICAgICBb UXRdIE1vdmUgVmlld3BvcnRBdHRyaWJ1dGUgcmVsYXRlZCBtZXRob2RzIHRvIHRoZSBpbnRlcmFj dGlvbiBlbmdpbmUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD04Nzg1NQorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhhdXNtYW5uLgorCisgICAg ICAgIE1vdmUgdGhlIGxvZ2ljIG9mIGRpZENoYW5nZXtWaWV3cG9ydFByb3BlcnRpZXN8Q29udGVu dHNTaXplfSB0byB0aGUKKyAgICAgICAgaW50ZXJhY3Rpb24gZW5naW5lIGFuZCB1cGRhdGUgb3Vy IHRlc3Rpbmcgb2JqZWN0LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2 aWV3LmNwcDoKKyAgICAgICAgKFFRdWlja1dlYlZpZXdMZWdhY3lQcml2YXRlOjpRUXVpY2tXZWJW aWV3TGVnYWN5UHJpdmF0ZSk6CisgICAgICAgIChRUXVpY2tXZWJWaWV3RmxpY2thYmxlUHJpdmF0 ZTo6ZGlkQ2hhbmdlVmlld3BvcnRQcm9wZXJ0aWVzKToKKyAgICAgICAgKFFRdWlja1dlYlZpZXdG bGlja2FibGVQcml2YXRlOjpkaWRDaGFuZ2VDb250ZW50c1NpemUpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlld19wX3AuaDoKKyAgICAgICAgKFFRdWlja1dlYlZpZXdQ cml2YXRlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F3ZWJraXR0ZXN0LmNwcDoKKyAg ICAgICAgKFFXZWJLaXRUZXN0Ojpjb250ZW50c1NjYWxlKToKKyAgICAgICAgKFFXZWJLaXRUZXN0 OjpkZXZpY2VQaXhlbFJhdGlvKToKKyAgICAgICAgKFFXZWJLaXRUZXN0Ojppbml0aWFsU2NhbGUp OgorICAgICAgICAoUVdlYktpdFRlc3Q6Om1pbmltdW1TY2FsZSk6CisgICAgICAgIChRV2ViS2l0 VGVzdDo6bWF4aW11bVNjYWxlKToKKyAgICAgICAgKFFXZWJLaXRUZXN0Ojppc1NjYWxhYmxlKToK KyAgICAgICAgKFFXZWJLaXRUZXN0OjpsYXlvdXRTaXplKToKKyAgICAgICAgKiBVSVByb2Nlc3Mv cXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UXRW aWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjp2aWV3cG9ydEF0dHJpYnV0ZXNDaGFuZ2VkKToKKyAg ICAgICAgKFdlYktpdCk6CisgICAgICAgIChXZWJLaXQ6OlF0Vmlld3BvcnRJbnRlcmFjdGlvbkVu Z2luZTo6cGFnZUNvbnRlbnRzU2l6ZUNoYW5nZWQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9R dFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaDoKKyAgICAgICAgKFF0Vmlld3BvcnRJbnRlcmFj dGlvbkVuZ2luZSk6CisKKzIwMTItMDUtMzAgIEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuICA8 a2VubmV0aEB3ZWJraXQub3JnPgorCiAgICAgICAgIFtRdF0gRG8gcmVuYW1lcyBpbiBWaWV3cG9y dEludGVyYWN0aW9uRW5naW5lIGFzIGFncmVlZCB1cG9uCiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Nzg0NQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcAppbmRleCA0ODBlYzhhZjk5M2MxNWM3 NDU2YjBkOWUzMDM0ZTQ0YWQ2OTBhMGZiLi41YjQzZTMzN2Q2YzhlMDU3OTU1Y2IwOWJiOGRhMGZm ZTJmNzdlYTFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Fx dWlja3dlYnZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1 aWNrd2Vidmlldy5jcHAKQEAgLTc3MCwxMiArNzcwLDYgQEAgdm9pZCBRUXVpY2tXZWJWaWV3UHJp dmF0ZTo6ZGlkUmVjZWl2ZU1lc3NhZ2VGcm9tTmF2aWdhdG9yUXRPYmplY3QoY29uc3QgU3RyaW5n JgogUVF1aWNrV2ViVmlld0xlZ2FjeVByaXZhdGU6OlFRdWlja1dlYlZpZXdMZWdhY3lQcml2YXRl KFFRdWlja1dlYlZpZXcqIHZpZXdwb3J0KQogICAgIDogUVF1aWNrV2ViVmlld1ByaXZhdGUodmll d3BvcnQpCiB7Ci0gICAgLy8gRGVmYXVsdCB2YWx1ZXMgZm9yIHRoZSBMZWdhY3kgdmlldy4KLSAg ICBhdHRyaWJ1dGVzLmRldmljZVBpeGVsUmF0aW8gPSAxOwotICAgIGF0dHJpYnV0ZXMuaW5pdGlh bFNjYWxlID0gMTsKLSAgICBhdHRyaWJ1dGVzLm1pbmltdW1TY2FsZSA9IDE7Ci0gICAgYXR0cmli dXRlcy5tYXhpbXVtU2NhbGUgPSAxOwotICAgIGF0dHJpYnV0ZXMudXNlclNjYWxhYmxlID0gMDsK IH0KIAogdm9pZCBRUXVpY2tXZWJWaWV3TGVnYWN5UHJpdmF0ZTo6aW5pdGlhbGl6ZShXS0NvbnRl eHRSZWYgY29udGV4dFJlZiwgV0tQYWdlR3JvdXBSZWYgcGFnZUdyb3VwUmVmKQpAQCAtODY3LDMw ICs4NjEsNyBAQCB2b2lkIFFRdWlja1dlYlZpZXdGbGlja2FibGVQcml2YXRlOjpvbkNvbXBvbmVu dENvbXBsZXRlKCkKIAogdm9pZCBRUXVpY2tXZWJWaWV3RmxpY2thYmxlUHJpdmF0ZTo6ZGlkQ2hh bmdlVmlld3BvcnRQcm9wZXJ0aWVzKGNvbnN0IFdlYkNvcmU6OlZpZXdwb3J0QXR0cmlidXRlcyYg bmV3QXR0cmlidXRlcykKIHsKLSAgICBRX1EoUVF1aWNrV2ViVmlldyk7Ci0KLSAgICAvLyBGSVhN RTogUmV2aXNlIHRoZXNlIHdoZW4gaW1wbGVtZW50aW5nIGZpdC10by13aWR0aC4KLSAgICBXZWJD b3JlOjpWaWV3cG9ydEF0dHJpYnV0ZXMgYXR0ciA9IG5ld0F0dHJpYnV0ZXM7Ci0gICAgV2ViQ29y ZTo6cmVzdHJpY3RTY2FsZUZhY3RvclRvSW5pdGlhbFNjYWxlSWZOb3RVc2VyU2NhbGFibGUoYXR0 cik7Ci0KLSAgICAvLyBGSVhNRTogUmVzZXR0aW5nIGhlcmUgY2FuIHJlc2V0IG1vcmUgdGhhbiBu ZWVkZWQuIEZvciBpbnN0YW5jZSBpdCB3aWxsIGVuZCBkZWZlcnJlcnMuCi0gICAgLy8gVGhpcyBu ZWVkcyB0byBiZSByZXZpc2VkIGF0IHNvbWUgcG9pbnQuCi0gICAgaW50ZXJhY3Rpb25FbmdpbmUt PnJlc2V0KCk7Ci0KLSAgICBpbnRlcmFjdGlvbkVuZ2luZS0+c2V0RGV2aWNlUGl4ZWxSYXRpbyhh dHRyLmRldmljZVBpeGVsUmF0aW8pOwotCi0gICAgaW50ZXJhY3Rpb25FbmdpbmUtPnNldEFsbG93 c1VzZXJTY2FsaW5nKCEhYXR0ci51c2VyU2NhbGFibGUpOwotICAgIGludGVyYWN0aW9uRW5naW5l LT5zZXRDU1NTY2FsZUJvdW5kcyhhdHRyLm1pbmltdW1TY2FsZSwgYXR0ci5tYXhpbXVtU2NhbGUp OwotCi0gICAgaWYgKCFpbnRlcmFjdGlvbkVuZ2luZS0+aGFkVXNlckludGVyYWN0aW9uKCkgJiYg IXBhZ2VJc1N1c3BlbmRlZCkKLSAgICAgICAgaW50ZXJhY3Rpb25FbmdpbmUtPnNldENTU1NjYWxl KGF0dHIuaW5pdGlhbFNjYWxlKTsKLQotICAgIHRoaXMtPmF0dHJpYnV0ZXMgPSBhdHRyOwotICAg IGVtaXQgcS0+ZXhwZXJpbWVudGFsKCktPnRlc3QoKS0+dmlld3BvcnRDaGFuZ2VkKCk7Ci0KLSAg ICAvLyBJZiB0aGUgd2ViIGFwcCBzdWNjZXNzaXZlbHkgY2hhbmdlcyB0aGUgdmlld3BvcnQgb24g cHVycG9zZQotICAgIC8vIGl0IHdhbnRzIHRvIGJlIGluIGNvbnRyb2wgYW5kIHdlIHNob3VsZCBk aXNhYmxlIGFuaW1hdGlvbnMuCi0gICAgaW50ZXJhY3Rpb25FbmdpbmUtPnNldFBhZ2VJdGVtUmVj dFZpc2libGUoaW50ZXJhY3Rpb25FbmdpbmUtPm5lYXJlc3RWYWxpZEJvdW5kcygpKTsKKyAgICBp bnRlcmFjdGlvbkVuZ2luZS0+dmlld3BvcnRBdHRyaWJ1dGVzQ2hhbmdlZChuZXdBdHRyaWJ1dGVz KTsKIH0KIAogdm9pZCBRUXVpY2tXZWJWaWV3RmxpY2thYmxlUHJpdmF0ZTo6dXBkYXRlVmlld3Bv cnRTaXplKCkKQEAgLTk2MywyNiArOTM0LDkgQEAgdm9pZCBRUXVpY2tXZWJWaWV3RmxpY2thYmxl UHJpdmF0ZTo6cGFnZURpZFJlcXVlc3RTY3JvbGwoY29uc3QgUVBvaW50JiBwb3MpCiB2b2lkIFFR dWlja1dlYlZpZXdGbGlja2FibGVQcml2YXRlOjpkaWRDaGFuZ2VDb250ZW50c1NpemUoY29uc3Qg UVNpemUmIG5ld1NpemUpCiB7CiAgICAgUV9RKFFRdWlja1dlYlZpZXcpOwotICAgIFFTaXplIHZp ZXdwb3J0U2l6ZSA9IHEtPmJvdW5kaW5nUmVjdCgpLnNpemUoKS50b1NpemUoKTsKIAogICAgIHBh Z2VWaWV3LT5zZXRDb250ZW50c1NpemUobmV3U2l6ZSk7IC8vIGVtaXRzIGNvbnRlbnRzU2l6ZUNo YW5nZWQoKQotCi0gICAgZmxvYXQgbWluaW11bVNjYWxlID0gV2ViQ29yZTo6Y29tcHV0ZU1pbmlt dW1TY2FsZUZhY3RvckZvckNvbnRlbnRDb250YWluZWQoYXR0cmlidXRlcywgdmlld3BvcnRTaXpl LCBuZXdTaXplKTsKLQotICAgIGlmICghcUZ1enp5Q29tcGFyZShtaW5pbXVtU2NhbGUsIGF0dHJp YnV0ZXMubWluaW11bVNjYWxlKSkgewotICAgICAgICBpbnRlcmFjdGlvbkVuZ2luZS0+c2V0Q1NT U2NhbGVCb3VuZHMobWluaW11bVNjYWxlLCBhdHRyaWJ1dGVzLm1heGltdW1TY2FsZSk7Ci0gICAg ICAgIGVtaXQgcS0+ZXhwZXJpbWVudGFsKCktPnRlc3QoKS0+dmlld3BvcnRDaGFuZ2VkKCk7Ci0K LSAgICAgICAgaWYgKCFpbnRlcmFjdGlvbkVuZ2luZS0+aGFkVXNlckludGVyYWN0aW9uKCkgJiYg IXBhZ2VJc1N1c3BlbmRlZCkgewotICAgICAgICAgICAgLy8gRW1pdHMgY29udGVudHNTY2FsZUNo YW5nZWQoKTsKLSAgICAgICAgICAgIGludGVyYWN0aW9uRW5naW5lLT5zZXRDU1NTY2FsZShtaW5p bXVtU2NhbGUpOwotICAgICAgICB9Ci0gICAgfQotCi0gICAgLy8gRW1pdCBmb3IgdGVzdGluZyBw dXJwb3Nlcywgc28gdGhhdCBpdCBjYW4gYmUgdmVyaWZpZWQgdGhhdAotICAgIC8vIHdlIGRpZG4n dCBkbyBzY2FsZSBhZGp1c3RtZW50LgotICAgIGludGVyYWN0aW9uRW5naW5lLT5zZXRQYWdlSXRl bVJlY3RWaXNpYmxlKGludGVyYWN0aW9uRW5naW5lLT5uZWFyZXN0VmFsaWRCb3VuZHMoKSk7Ci0g ICAgZW1pdCBxLT5leHBlcmltZW50YWwoKS0+dGVzdCgpLT5jb250ZW50c1NjYWxlQ29tbWl0dGVk KCk7CisgICAgaW50ZXJhY3Rpb25FbmdpbmUtPnBhZ2VDb250ZW50c1NpemVDaGFuZ2VkKG5ld1Np emUsIHEtPmJvdW5kaW5nUmVjdCgpLnNpemUoKS50b1NpemUoKSk7CiB9CiAKIC8qIQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3BfcC5o IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3BfcC5oCmlu ZGV4IDIzZTg4NWMxNWRhZDJlMTcyYTdkMmM1NzEzNjdjMmI5ZTlmNWMyYTIuLjY5YWZjMmQ1NGQw ZTAyOTE4MGU3M2I5NGQ3ODZhYzI5ZThjZWE5Y2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlld19wX3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdfcF9wLmgKQEAgLTE5Miw4ICsxOTIsNiBA QCBwcm90ZWN0ZWQ6CiAgICAgUVFtbENvbXBvbmVudCogZmlsZVBpY2tlcjsKICAgICBRUW1sQ29t cG9uZW50KiBkYXRhYmFzZVF1b3RhRGlhbG9nOwogCi0gICAgV2ViQ29yZTo6Vmlld3BvcnRBdHRy aWJ1dGVzIGF0dHJpYnV0ZXM7Ci0KICAgICBRTGlzdDxRVXJsPiB1c2VyU2NyaXB0czsKIAogICAg IGJvb2wgbV91c2VEZWZhdWx0Q29udGVudEl0ZW1TaXplOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2Via2l0dGVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL3F0L3F3ZWJraXR0ZXN0LmNwcAppbmRleCBhMzZmOWZhYTNlYzkzZDI4M2Rm YWE4ZGMxNmMyOWUwMDkxMjY0YTg1Li5lMGE0NDFjMGU3ZjMwYWIwZThiMzVlZGFhYjU1ZWEzNmE5 MGY3OGJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJr aXR0ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJraXR0 ZXN0LmNwcApAQCAtMTIwLDQ0ICsxMjAsNDkgQEAgUVNpemUgUVdlYktpdFRlc3Q6OmNvbnRlbnRz U2l6ZSgpIGNvbnN0CiAKIFFWYXJpYW50IFFXZWJLaXRUZXN0Ojpjb250ZW50c1NjYWxlKCkgY29u c3QKIHsKLSAgICBpZiAoUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lKiBpbnRlcmFjdGlvbkVu Z2luZSA9IG1fd2ViVmlld1ByaXZhdGUtPnZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUoKSkKLSAg ICAgICAgcmV0dXJuIGludGVyYWN0aW9uRW5naW5lLT5jdXJyZW50Q1NTU2NhbGUoKTsKLQotICAg IHJldHVybiBtX3dlYlZpZXdQcml2YXRlLT5hdHRyaWJ1dGVzLmluaXRpYWxTY2FsZTsKKyAgICBp ZiAoUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lKiB2aWV3cG9ydCA9IG1fd2ViVmlld1ByaXZh dGUtPnZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUoKSkKKyAgICAgICAgcmV0dXJuIHZpZXdwb3J0 LT5jdXJyZW50Q1NTU2NhbGUoKTsKKyAgICByZXR1cm4gUVZhcmlhbnQoKTsKIH0KIAogUVZhcmlh bnQgUVdlYktpdFRlc3Q6OmRldmljZVBpeGVsUmF0aW8oKSBjb25zdAogewotICAgIHJldHVybiBt X3dlYlZpZXdQcml2YXRlLT5hdHRyaWJ1dGVzLmRldmljZVBpeGVsUmF0aW87CisgICAgaWYgKFF0 Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZSogdmlld3BvcnQgPSBtX3dlYlZpZXdQcml2YXRlLT52 aWV3cG9ydEludGVyYWN0aW9uRW5naW5lKCkpCisgICAgICAgIHJldHVybiB2aWV3cG9ydC0+bV9k ZXZpY2VQaXhlbFJhdGlvOworICAgIHJldHVybiBRVmFyaWFudCgpOwogfQogCiBRVmFyaWFudCBR V2ViS2l0VGVzdDo6aW5pdGlhbFNjYWxlKCkgY29uc3QKIHsKLSAgICByZXR1cm4gbV93ZWJWaWV3 UHJpdmF0ZS0+YXR0cmlidXRlcy5pbml0aWFsU2NhbGU7CisgICAgaWYgKFF0Vmlld3BvcnRJbnRl cmFjdGlvbkVuZ2luZSogdmlld3BvcnQgPSBtX3dlYlZpZXdQcml2YXRlLT52aWV3cG9ydEludGVy YWN0aW9uRW5naW5lKCkpCisgICAgICAgIHJldHVybiB2aWV3cG9ydC0+bV9yYXdBdHRyaWJ1dGVz LmluaXRpYWxTY2FsZTsKKyAgICByZXR1cm4gUVZhcmlhbnQoKTsKIH0KIAogUVZhcmlhbnQgUVdl YktpdFRlc3Q6Om1pbmltdW1TY2FsZSgpIGNvbnN0CiB7Ci0gICAgaWYgKFF0Vmlld3BvcnRJbnRl cmFjdGlvbkVuZ2luZSogaW50ZXJhY3Rpb25FbmdpbmUgPSBtX3dlYlZpZXdQcml2YXRlLT52aWV3 cG9ydEludGVyYWN0aW9uRW5naW5lKCkpCi0gICAgICAgIHJldHVybiBpbnRlcmFjdGlvbkVuZ2lu ZS0+bV9taW5pbXVtU2NhbGU7Ci0KLSAgICByZXR1cm4gbV93ZWJWaWV3UHJpdmF0ZS0+YXR0cmli dXRlcy5taW5pbXVtU2NhbGU7CisgICAgaWYgKFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZSog dmlld3BvcnQgPSBtX3dlYlZpZXdQcml2YXRlLT52aWV3cG9ydEludGVyYWN0aW9uRW5naW5lKCkp CisgICAgICAgIHJldHVybiB2aWV3cG9ydC0+bV9taW5pbXVtU2NhbGU7CisgICAgcmV0dXJuIFFW YXJpYW50KCk7CiB9CiAKIFFWYXJpYW50IFFXZWJLaXRUZXN0OjptYXhpbXVtU2NhbGUoKSBjb25z dAogewotICAgIGlmIChRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUqIGludGVyYWN0aW9uRW5n aW5lID0gbV93ZWJWaWV3UHJpdmF0ZS0+dmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZSgpKQotICAg ICAgICByZXR1cm4gaW50ZXJhY3Rpb25FbmdpbmUtPm1fbWF4aW11bVNjYWxlOwotCi0gICAgcmV0 dXJuIG1fd2ViVmlld1ByaXZhdGUtPmF0dHJpYnV0ZXMubWF4aW11bVNjYWxlOworICAgIGlmIChR dFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUqIHZpZXdwb3J0ID0gbV93ZWJWaWV3UHJpdmF0ZS0+ dmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZSgpKQorICAgICAgICByZXR1cm4gdmlld3BvcnQtPm1f bWF4aW11bVNjYWxlOworICAgIHJldHVybiBRVmFyaWFudCgpOwogfQogCiBRVmFyaWFudCBRV2Vi S2l0VGVzdDo6aXNTY2FsYWJsZSgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuICEhbV93ZWJWaWV3UHJp dmF0ZS0+YXR0cmlidXRlcy51c2VyU2NhbGFibGU7CisgICAgaWYgKFF0Vmlld3BvcnRJbnRlcmFj dGlvbkVuZ2luZSogdmlld3BvcnQgPSBtX3dlYlZpZXdQcml2YXRlLT52aWV3cG9ydEludGVyYWN0 aW9uRW5naW5lKCkpCisgICAgICAgIHJldHVybiAhIXZpZXdwb3J0LT5tX3Jhd0F0dHJpYnV0ZXMu dXNlclNjYWxhYmxlOworICAgIHJldHVybiBRVmFyaWFudCgpOwogfQogCiBRVmFyaWFudCBRV2Vi S2l0VGVzdDo6bGF5b3V0U2l6ZSgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIFFTaXplRihtX3dlYlZp ZXdQcml2YXRlLT5hdHRyaWJ1dGVzLmxheW91dFNpemUpOworICAgIGlmIChRdFZpZXdwb3J0SW50 ZXJhY3Rpb25FbmdpbmUqIHZpZXdwb3J0ID0gbV93ZWJWaWV3UHJpdmF0ZS0+dmlld3BvcnRJbnRl cmFjdGlvbkVuZ2luZSgpKQorICAgICAgICByZXR1cm4gUVNpemVGKHZpZXdwb3J0LT5tX3Jhd0F0 dHJpYnV0ZXMubGF5b3V0U2l6ZSk7CisgICAgcmV0dXJuIFFWYXJpYW50KCk7CiB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5n aW5lLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rp b25FbmdpbmUuY3BwCmluZGV4IGIzODg1MzQyYjIzODBmMTM3OGE3NjZlMDAxMDVlNWVjZmFlMDYx NmMuLmJkMTFjNWY2OTM4NDAyODhiNDhiNWIxYzNjNzYyOWM2ZjI4OTFiYjQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rp b25FbmdpbmUuY3BwCkBAIC0yNCw2ICsyNCw3IEBACiAKICNpbmNsdWRlICJxcXVpY2t3ZWJwYWdl X3AuaCIKICNpbmNsdWRlICJxcXVpY2t3ZWJ2aWV3X3AuaCIKKyNpbmNsdWRlICJxd2Via2l0dGVz dF9wLmgiCiAjaW5jbHVkZSA8UVBvaW50Rj4KICNpbmNsdWRlIDxRVHJhbnNmb3JtPgogI2luY2x1 ZGUgPFFXaGVlbEV2ZW50PgpAQCAtMTc0LDYgKzE3NSw1NSBAQCBxcmVhbCBRdFZpZXdwb3J0SW50 ZXJhY3Rpb25FbmdpbmU6Om91dGVyQm91bmRlZENTU1NjYWxlKHFyZWFsIGNzc1NjYWxlKSBjb25z dAogICAgIHJldHVybiBpbm5lckJvdW5kZWRDU1NTY2FsZShjc3NTY2FsZSk7CiB9CiAKK3ZvaWQg UXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjp2aWV3cG9ydEF0dHJpYnV0ZXNDaGFuZ2VkKGNv bnN0IFdlYkNvcmU6OlZpZXdwb3J0QXR0cmlidXRlcyYgbmV3QXR0cmlidXRlcykKK3sKKyAgICBt X3Jhd0F0dHJpYnV0ZXMgPSBuZXdBdHRyaWJ1dGVzOworICAgIFdlYkNvcmU6OnJlc3RyaWN0U2Nh bGVGYWN0b3JUb0luaXRpYWxTY2FsZUlmTm90VXNlclNjYWxhYmxlKG1fcmF3QXR0cmlidXRlcyk7 CisKKyAgICAvLyBGSVhNRTogUmVzZXR0aW5nIGhlcmUgY2FuIHJlc2V0IG1vcmUgdGhhbiBuZWVk ZWQuIEZvciBpbnN0YW5jZSBpdCB3aWxsIGVuZCBkZWZlcnJlcnMuCisgICAgLy8gVGhpcyBuZWVk cyB0byBiZSByZXZpc2VkIGF0IHNvbWUgcG9pbnQuCisgICAgcmVzZXQoKTsKKworCisgICAgLy8g RklYTUU6IFNob3VsZCBnZXQgZGlyZWN0bHkgZnJvbSB0aGUgd2ViUGFnZVByb3h5LgorICAgIHNl dERldmljZVBpeGVsUmF0aW8obV9yYXdBdHRyaWJ1dGVzLmRldmljZVBpeGVsUmF0aW8pOworCisg ICAgc2V0QWxsb3dzVXNlclNjYWxpbmcoISFtX3Jhd0F0dHJpYnV0ZXMudXNlclNjYWxhYmxlKTsK KyAgICBzZXRDU1NTY2FsZUJvdW5kcyhtX3Jhd0F0dHJpYnV0ZXMubWluaW11bVNjYWxlLCBtX3Jh d0F0dHJpYnV0ZXMubWF4aW11bVNjYWxlKTsKKworICAgIGlmICghbV9oYWRVc2VySW50ZXJhY3Rp b24gJiYgIW1faGFzU3VzcGVuZGVkQ29udGVudCkgeworICAgICAgICAvLyBFbWl0cyBjb250ZW50 c1NjYWxlQ2hhbmdlZCgpOworICAgICAgICBzZXRDU1NTY2FsZShtX3Jhd0F0dHJpYnV0ZXMuaW5p dGlhbFNjYWxlKTsKKyAgICB9CisKKyAgICBlbWl0IG1fdmlld3BvcnRJdGVtLT5leHBlcmltZW50 YWwoKS0+dGVzdCgpLT52aWV3cG9ydENoYW5nZWQoKTsKKworICAgIC8vIElmIHRoZSB3ZWIgYXBw IHN1Y2Nlc3NpdmVseSBjaGFuZ2VzIHRoZSB2aWV3cG9ydCBvbiBwdXJwb3NlCisgICAgLy8gaXQg d2FudHMgdG8gYmUgaW4gY29udHJvbCBhbmQgd2Ugc2hvdWxkIGRpc2FibGUgYW5pbWF0aW9ucy4K KyAgICBzZXRQYWdlSXRlbVJlY3RWaXNpYmxlKG5lYXJlc3RWYWxpZEJvdW5kcygpKTsKK30KKwor dm9pZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnBhZ2VDb250ZW50c1NpemVDaGFuZ2Vk KGNvbnN0IFFTaXplJiBuZXdTaXplLCBjb25zdCBRU2l6ZSYgdmlld3BvcnRTaXplKQoreworICAg IGZsb2F0IG1pbmltdW1TY2FsZSA9IFdlYkNvcmU6OmNvbXB1dGVNaW5pbXVtU2NhbGVGYWN0b3JG b3JDb250ZW50Q29udGFpbmVkKG1fcmF3QXR0cmlidXRlcywgdmlld3BvcnRTaXplLCBuZXdTaXpl KTsKKworICAgIGlmICghcUZ1enp5Q29tcGFyZShtaW5pbXVtU2NhbGUsIG1fcmF3QXR0cmlidXRl cy5taW5pbXVtU2NhbGUpKSB7CisgICAgICAgIHNldENTU1NjYWxlQm91bmRzKG1pbmltdW1TY2Fs ZSwgbV9yYXdBdHRyaWJ1dGVzLm1heGltdW1TY2FsZSk7CisgICAgICAgIGVtaXQgbV92aWV3cG9y dEl0ZW0tPmV4cGVyaW1lbnRhbCgpLT50ZXN0KCktPnZpZXdwb3J0Q2hhbmdlZCgpOworCisgICAg ICAgIGlmICghbV9oYWRVc2VySW50ZXJhY3Rpb24gJiYgIW1faGFzU3VzcGVuZGVkQ29udGVudCkg eworICAgICAgICAgICAgLy8gRW1pdHMgY29udGVudHNTY2FsZUNoYW5nZWQoKTsKKyAgICAgICAg ICAgIHNldENTU1NjYWxlKG1pbmltdW1TY2FsZSk7CisgICAgICAgIH0KKyAgICB9CisKKyAgICAv LyBFbWl0IGZvciB0ZXN0aW5nIHB1cnBvc2VzLCBzbyB0aGF0IGl0IGNhbiBiZSB2ZXJpZmllZCB0 aGF0CisgICAgLy8gd2UgZGlkbid0IGRvIHNjYWxlIGFkanVzdG1lbnQuCisgICAgZW1pdCBtX3Zp ZXdwb3J0SXRlbS0+ZXhwZXJpbWVudGFsKCktPnRlc3QoKS0+Y29udGVudHNTY2FsZUNvbW1pdHRl ZCgpOworCisgICAgc2V0UGFnZUl0ZW1SZWN0VmlzaWJsZShuZWFyZXN0VmFsaWRCb3VuZHMoKSk7 Cit9CisKIHZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpzZXRQYWdlSXRlbVJlY3RW aXNpYmxlKGNvbnN0IFFSZWN0RiYgaXRlbVJlY3QpCiB7CiAgICAgQVNTRVJUX1dJVEhfTUVTU0FH RShtX3N1c3BlbmRDb3VudCwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9x dC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaAppbmRleCBlZTg0Y2I5MGFlZjkxNDAw MWEwMDU5ZGUwMTY0ZjA2NmRiNjAzYTBiLi5iNzU5NWU1Njk3NTIxM2VhOWE0YTZlNTMyNGQ5OGE1 ZTk4M2YxYWU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3 cG9ydEludGVyYWN0aW9uRW5naW5lLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0 L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oCkBAIC0yNiw2ICsyNiw3IEBACiAjaW5jbHVk ZSA8UXRDb3JlL1FSZWN0Rj4KICNpbmNsdWRlIDxRdENvcmUvUVZhcmlhbnQ+CiAjaW5jbHVkZSA8 UXRDb3JlL1FWYXJpYW50QW5pbWF0aW9uPgorI2luY2x1ZGUgPFdlYkNvcmUvVmlld3BvcnRBcmd1 bWVudHMuaD4KICNpbmNsdWRlIDx3dGYvT3duUHRyLmg+CiAKIFFUX0JFR0lOX05BTUVTUEFDRQpA QCAtOTEsNiArOTIsOSBAQCBwdWJsaWM6CiAgICAgdm9pZCB6b29tVG9BcmVhR2VzdHVyZUVuZGVk KGNvbnN0IFFQb2ludEYmIHRvdWNoUG9pbnQsIGNvbnN0IFFSZWN0RiYgdGFyZ2V0QXJlYSk7CiAg ICAgdm9pZCBmb2N1c0VkaXRhYmxlQXJlYShjb25zdCBRUmVjdEYmIGNhcmV0QXJlYSwgY29uc3Qg UVJlY3RGJiB0YXJnZXRBcmVhKTsKIAorICAgIHZvaWQgdmlld3BvcnRBdHRyaWJ1dGVzQ2hhbmdl ZChjb25zdCBXZWJDb3JlOjpWaWV3cG9ydEF0dHJpYnV0ZXMmKTsKKyAgICB2b2lkIHBhZ2VDb250 ZW50c1NpemVDaGFuZ2VkKGNvbnN0IFFTaXplJiBuZXdTaXplLCBjb25zdCBRU2l6ZSYgdmlld3Bv cnRTaXplKTsKKwogUV9TSUdOQUxTOgogICAgIHZvaWQgY29udGVudFN1c3BlbmRSZXF1ZXN0ZWQo KTsKICAgICB2b2lkIGNvbnRlbnRSZXN1bWVSZXF1ZXN0ZWQoKTsKQEAgLTEyNiw2ICsxMzAsOCBA QCBwcml2YXRlOgogICAgIFFSZWN0RiBjb21wdXRlUG9zUmFuZ2VGb3JQYWdlSXRlbUF0U2NhbGUo cXJlYWwgaXRlbVNjYWxlKSBjb25zdDsKICAgICB2b2lkIHNjYWxlQ29udGVudChjb25zdCBRUG9p bnRGJiBjZW50ZXJJbkNTU0Nvb3JkaW5hdGVzLCBxcmVhbCBjc3NTY2FsZSk7CiAKKyAgICBXZWJD b3JlOjpWaWV3cG9ydEF0dHJpYnV0ZXMgbV9yYXdBdHRyaWJ1dGVzOworCiAgICAgYm9vbCBtX2Fs bG93c1VzZXJTY2FsaW5nOwogICAgIHFyZWFsIG1fbWluaW11bVNjYWxlOwogICAgIHFyZWFsIG1f bWF4aW11bVNjYWxlOwo=