102764 2012-11-19 20:56:42 -0800 Use m_webView->size() for viewport update 2012-11-21 15:10:10 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 trchen webkit-unassigned abarth fsamuel webkit.review.bot oldest_to_newest 771450 0 trchen 2012-11-19 20:56:42 -0800 Use m_webView->size() for viewport update 771452 1 175128 trchen 2012-11-19 21:01:27 -0800 Created attachment 175128 Patch 771457 2 175130 trchen 2012-11-19 21:11:59 -0800 Created attachment 175130 Patch 771479 3 175130 bfulgham 2012-11-19 21:35:57 -0800 Comment on attachment 175130 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=175130&action=review I think the general concept here is good, but I think there is relatively weak evidence that this won't have unexpected changes in behavior. > Source/WebKit/chromium/ChangeLog:12 > + rendering purpose. While the intent of this change seems good, it seems scary to apply such a modification without at least identifying some test cases that cover this behavior. From the sound of the bug, it should be possible to construct a test case illustrating the case of a pending resize that should not be used for the current rendering. 771485 4 trchen 2012-11-19 21:40:16 -0800 (In reply to comment #3) > (From update of attachment 175130 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=175130&action=review > > I think the general concept here is good, but I think there is relatively weak evidence that this won't have unexpected changes in behavior. > > > Source/WebKit/chromium/ChangeLog:12 > > + rendering purpose. > > While the intent of this change seems good, it seems scary to apply such a modification without at least identifying some test cases that cover this behavior. From the sound of the bug, it should be possible to construct a test case illustrating the case of a pending resize that should not be used for the current rendering. Makes sense. The real life bug I have is this one: https://code.google.com/p/chromium/issues/detail?id=160619 That windowRect will be one frame behind when rotating an Android device. I think I can probably do a WebFrameTest for that. I'll try tomorrow. 771600 5 abarth 2012-11-19 23:46:07 -0800 "Your client does not have permission to get URL /p/chromium/issues/detail?id=160619 from this server." 771602 6 175130 abarth 2012-11-19 23:46:47 -0800 Comment on attachment 175130 Patch Can you add a test? 772325 7 trchen 2012-11-20 17:24:59 -0800 (In reply to comment #3) > (From update of attachment 175130 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=175130&action=review > > I think the general concept here is good, but I think there is relatively weak evidence that this won't have unexpected changes in behavior. > > > Source/WebKit/chromium/ChangeLog:12 > > + rendering purpose. > > While the intent of this change seems good, it seems scary to apply such a modification without at least identifying some test cases that cover this behavior. From the sound of the bug, it should be possible to construct a test case illustrating the case of a pending resize that should not be used for the current rendering. I just added some debug output to RenderWidget::setWindowRect and RenderWidget::OnResize. I think it is very wrong to use windowRect in the first place. The semantics of windowRect is the outer rect of the window, that is, including all decorations like the title bar, status bar, navigation buttons and such. I don't think it makes any sense to use it for layout purpose. (In reply to comment #6) > (From update of attachment 175130 [details]) > Can you add a test? Instead of adding tests, I think we should modify all tests in WebFrameTest to remove the windowRect() override in WebViewClient implementations. The tests should still work without windowRect(). 772330 8 abarth 2012-11-20 17:34:50 -0800 > Instead of adding tests, I think we should modify all tests in WebFrameTest to remove the windowRect() override in WebViewClient implementations. The tests should still work without windowRect(). That sounds worth trying. 772340 9 175313 trchen 2012-11-20 17:55:32 -0800 Created attachment 175313 Patch 773327 10 175313 abarth 2012-11-21 14:59:21 -0800 Comment on attachment 175313 Patch Thanks for updating the tests. 773332 11 175313 webkit.review.bot 2012-11-21 15:10:06 -0800 Comment on attachment 175313 Patch Clearing flags on attachment: 175313 Committed r135442: <http://trac.webkit.org/changeset/135442> 773333 12 webkit.review.bot 2012-11-21 15:10:10 -0800 All reviewed patches have been landed. Closing bug. 175128 2012-11-19 21:01:27 -0800 2012-11-19 21:11:56 -0800 Patch bug-102764-20121119205917.patch text/plain 2558 trchen U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1MDQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGQ2YWIxZjczY2M4MjkyOTM3YzM2NWIzZmIyOGM3OWNmMDA4ZWY0NmMuLjQ1ZDM3OGY1ZDdhY2Vm NTI4NzQwMjk2N2RiYWMxNGEyN2IzNGI3ODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTItMTEtMTkgIFRpZW4tUmVuIENoZW4gIDx0cmNoZW5AY2hyb21p dW0ub3JnPgorCisgICAgICAgIFVzZSBtX3dlYlZpZXctPnNpemUoKSBmb3Igdmlld3BvcnQgdXBk YXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDI3 NjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBtX3dl YlZpZXctPmNsaWVudCgpLT53aW5kb3dSZWN0KCkgZG9lc24ndCBhbHdheXMgcmVmbGVjdCB0aGUg Y3VycmVudCBzaXplCisgICAgICAgIG9mIHRoZSBXZWJWaWV3LiBGb3IgZXhhbXBsZSBpdCBjYW4g aW5jbHVkZSBwZW5kaW5nIEphdmFTY3JpcHQgaW5pdGlhdGVkCisgICAgICAgIHJlc2l6ZSB0aGF0 IGhhcyBiZWVuIGFzeW5jaHJvbm91c2x5IHNlbnQgdG8gdGhlIGJyb3dzZXIgcHJvY2Vzcy4KKyAg ICAgICAgV2Ugc2hvdWxkIGFsd2F5cyB1c2UgdGhlIGN1cnJlbnQgc2l6ZSBvZiB0aGUgV2ViVmll dyBmb3IgbGF5b3V0IGFuZAorICAgICAgICByZW5kZXJpbmcgcHVycG9zZS4KKworICAgICAgICAq IHNyYy9DaHJvbWVDbGllbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q2hyb21lQ2xpZW50 SW1wbDo6ZGlzcGF0Y2hWaWV3cG9ydFByb3BlcnRpZXNEaWRDaGFuZ2UpOgorCiAyMDEyLTExLTE2 ICBSYW1hbiBLdW1hciAgPHJhbWFua2tAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEFkZCBzZXRD aGVja2VkIEFQSSBpbiBXZWJJbnB1dEVsZW1lbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHAKaW5kZXggMmIzYTVjMjg3NGVhZDU2NWVlMjM2MGIx NThkNDdkOTk2M2JkOGE2MC4uZmY4NWJhZGQzMzJjYjA5MjRlZjkwNDIyNGRkNjVhYjlkNTQxYTgz MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50SW1w bC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5j cHAKQEAgLTYyNSwxOCArNjI1LDE3IEBAIHZvaWQgQ2hyb21lQ2xpZW50SW1wbDo6ZGlzcGF0Y2hW aWV3cG9ydFByb3BlcnRpZXNEaWRDaGFuZ2UoY29uc3QgVmlld3BvcnRBcmd1bWVuCiAgICAgaW50 IGRwaSA9IHNjcmVlbkhvcml6b250YWxEUEkoZnJhbWVWaWV3KTsKICAgICBBU1NFUlQoZHBpID4g MCk7CiAKLSAgICBXZWJWaWV3Q2xpZW50KiBjbGllbnQgPSBtX3dlYlZpZXctPmNsaWVudCgpOwot ICAgIFdlYlJlY3QgZGV2aWNlUmVjdCA9IGNsaWVudC0+d2luZG93UmVjdCgpOworICAgIFdlYlNp emUgZGV2aWNlU2l6ZSA9IG1fd2ViVmlldy0+c2l6ZSgpOwogICAgIC8vIElmIHRoZSB3aW5kb3cg c2l6ZSBoYXMgbm90IGJlZW4gc2V0IHlldCBkb24ndCBhdHRlbXB0IHRvIHNldCB0aGUgdmlld3Bv cnQKLSAgICBpZiAoIWRldmljZVJlY3Qud2lkdGggfHwgIWRldmljZVJlY3QuaGVpZ2h0KQorICAg IGlmICghZGV2aWNlU2l6ZS53aWR0aCB8fCAhZGV2aWNlU2l6ZS5oZWlnaHQpCiAgICAgICAgIHJl dHVybjsKIAogICAgIFNldHRpbmdzKiBzZXR0aW5ncyA9IG1fd2ViVmlldy0+cGFnZSgpLT5zZXR0 aW5ncygpOwogICAgIGZsb2F0IGRldmljZVBpeGVsUmF0aW8gPSBkcGkgLyBWaWV3cG9ydEFyZ3Vt ZW50czo6ZGVwcmVjYXRlZFRhcmdldERQSTsKICAgICAvLyBDYWxsIHRoZSBjb21tb24gdmlld3Bv cnQgY29tcHV0aW5nIGxvZ2ljIGluIFZpZXdwb3J0QXJndW1lbnRzLmNwcC4KICAgICBWaWV3cG9y dEF0dHJpYnV0ZXMgY29tcHV0ZWQgPSBjb21wdXRlVmlld3BvcnRBdHRyaWJ1dGVzKAotICAgICAg ICBhcmd1bWVudHMsIHNldHRpbmdzLT5sYXlvdXRGYWxsYmFja1dpZHRoKCksIGRldmljZVJlY3Qu d2lkdGgsIGRldmljZVJlY3QuaGVpZ2h0LAotICAgICAgICBkZXZpY2VQaXhlbFJhdGlvLCBJbnRT aXplKGRldmljZVJlY3Qud2lkdGgsIGRldmljZVJlY3QuaGVpZ2h0KSk7CisgICAgICAgIGFyZ3Vt ZW50cywgc2V0dGluZ3MtPmxheW91dEZhbGxiYWNrV2lkdGgoKSwgZGV2aWNlU2l6ZS53aWR0aCwg ZGV2aWNlU2l6ZS5oZWlnaHQsCisgICAgICAgIGRldmljZVBpeGVsUmF0aW8sIEludFNpemUoZGV2 aWNlU2l6ZS53aWR0aCwgZGV2aWNlU2l6ZS5oZWlnaHQpKTsKIAogICAgIHJlc3RyaWN0U2NhbGVG YWN0b3JUb0luaXRpYWxTY2FsZUlmTm90VXNlclNjYWxhYmxlKGNvbXB1dGVkKTsKIAo= 175130 2012-11-19 21:11:59 -0800 2012-11-20 17:55:28 -0800 Patch bug-102764-20121119210949.patch text/plain 2531 trchen U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1MjA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDIzYzIyNjAyNmY4MTIxZjYzYjIwZGMyNDU1M2VjZjUzOTU3YTVmNjUuLjNkMWMyZWExYjdiY2Fm ZDYzN2RmMjkwMjVmOWU1M2EwZWYzZjMxZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTItMTEtMTkgIFRpZW4tUmVuIENoZW4gIDx0cmNoZW5AY2hyb21p dW0ub3JnPgorCisgICAgICAgIFVzZSBtX3dlYlZpZXctPnNpemUoKSBmb3Igdmlld3BvcnQgdXBk YXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDI3 NjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBtX3dl YlZpZXctPmNsaWVudCgpLT53aW5kb3dSZWN0KCkgZG9lc24ndCBhbHdheXMgcmVmbGVjdCB0aGUg Y3VycmVudCBzaXplCisgICAgICAgIG9mIHRoZSBXZWJWaWV3LiBGb3IgZXhhbXBsZSBpdCBjYW4g aW5jbHVkZSBwZW5kaW5nIEphdmFTY3JpcHQgaW5pdGlhdGVkCisgICAgICAgIHJlc2l6ZSB0aGF0 IGhhcyBiZWVuIGFzeW5jaHJvbm91c2x5IHNlbnQgdG8gdGhlIGJyb3dzZXIgcHJvY2Vzcy4KKyAg ICAgICAgV2Ugc2hvdWxkIGFsd2F5cyB1c2UgdGhlIGN1cnJlbnQgc2l6ZSBvZiB0aGUgV2ViVmll dyBmb3IgbGF5b3V0IGFuZAorICAgICAgICByZW5kZXJpbmcgcHVycG9zZS4KKworICAgICAgICAq IHNyYy9DaHJvbWVDbGllbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q2hyb21lQ2xpZW50 SW1wbDo6ZGlzcGF0Y2hWaWV3cG9ydFByb3BlcnRpZXNEaWRDaGFuZ2UpOgorCiAyMDEyLTExLTE5 ICBNaWd1ZWwgR2FyY2lhICA8bWlndWVsZ0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9t aXVtXSBSZW1vdmUgdGhlIGRlcGVuZGVuY3kgb2YgSU5QVVRfVFlQRV9DT0xPUiBvbiBQQUdFX1BP UFVQCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJ bXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3Bw CmluZGV4IDYyOGU5OTkyN2I1NjhmZjlkYmE4NDQxZjVmMGE4MTg2NzQ2MGMzMzQuLjgyZWQ3OThm N2U5Mzc4MzA2MWQ3MTlhN2EwZTQxZmYwZDk2ZDFlN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwCkBAIC02MjYsMTcgKzYyNiwxNyBAQCB2 b2lkIENocm9tZUNsaWVudEltcGw6OmRpc3BhdGNoVmlld3BvcnRQcm9wZXJ0aWVzRGlkQ2hhbmdl KGNvbnN0IFZpZXdwb3J0QXJndW1lbgogICAgICAgICByZXR1cm47CiAKICAgICBXZWJWaWV3Q2xp ZW50KiBjbGllbnQgPSBtX3dlYlZpZXctPmNsaWVudCgpOwotICAgIFdlYlJlY3QgZGV2aWNlUmVj dCA9IGNsaWVudC0+d2luZG93UmVjdCgpOworICAgIFdlYlNpemUgZGV2aWNlU2l6ZSA9IG1fd2Vi Vmlldy0+c2l6ZSgpOwogICAgIC8vIElmIHRoZSB3aW5kb3cgc2l6ZSBoYXMgbm90IGJlZW4gc2V0 IHlldCBkb24ndCBhdHRlbXB0IHRvIHNldCB0aGUgdmlld3BvcnQKLSAgICBpZiAoIWRldmljZVJl Y3Qud2lkdGggfHwgIWRldmljZVJlY3QuaGVpZ2h0KQorICAgIGlmICghZGV2aWNlU2l6ZS53aWR0 aCB8fCAhZGV2aWNlU2l6ZS5oZWlnaHQpCiAgICAgICAgIHJldHVybjsKIAogICAgIFNldHRpbmdz KiBzZXR0aW5ncyA9IG1fd2ViVmlldy0+cGFnZSgpLT5zZXR0aW5ncygpOwogICAgIGZsb2F0IGRl dmljZVBpeGVsUmF0aW8gPSBjbGllbnQtPnNjcmVlbkluZm8oKS5kZXZpY2VTY2FsZUZhY3RvcjsK ICAgICAvLyBDYWxsIHRoZSBjb21tb24gdmlld3BvcnQgY29tcHV0aW5nIGxvZ2ljIGluIFZpZXdw b3J0QXJndW1lbnRzLmNwcC4KICAgICBWaWV3cG9ydEF0dHJpYnV0ZXMgY29tcHV0ZWQgPSBjb21w dXRlVmlld3BvcnRBdHRyaWJ1dGVzKAotICAgICAgICBhcmd1bWVudHMsIHNldHRpbmdzLT5sYXlv dXRGYWxsYmFja1dpZHRoKCksIGRldmljZVJlY3Qud2lkdGgsIGRldmljZVJlY3QuaGVpZ2h0LAot ICAgICAgICBkZXZpY2VQaXhlbFJhdGlvLCBJbnRTaXplKGRldmljZVJlY3Qud2lkdGgsIGRldmlj ZVJlY3QuaGVpZ2h0KSk7CisgICAgICAgIGFyZ3VtZW50cywgc2V0dGluZ3MtPmxheW91dEZhbGxi YWNrV2lkdGgoKSwgZGV2aWNlU2l6ZS53aWR0aCwgZGV2aWNlU2l6ZS5oZWlnaHQsCisgICAgICAg IGRldmljZVBpeGVsUmF0aW8sIEludFNpemUoZGV2aWNlU2l6ZS53aWR0aCwgZGV2aWNlU2l6ZS5o ZWlnaHQpKTsKIAogICAgIHJlc3RyaWN0U2NhbGVGYWN0b3JUb0luaXRpYWxTY2FsZUlmTm90VXNl clNjYWxhYmxlKGNvbXB1dGVkKTsKIAo= 175313 2012-11-20 17:55:32 -0800 2012-11-21 15:10:06 -0800 Patch bug-102764-20121120175320.patch text/plain 8591 trchen U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1MjA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDIzYzIyNjAyNmY4MTIxZjYzYjIwZGMyNDU1M2VjZjUzOTU3YTVmNjUuLmExMGFmODA0NmVjMTAw MzkwYzdjZTQzOTEzZDg5YmY5NGYwN2I2OGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTItMTEtMjAgIFRpZW4tUmVuIENoZW4gIDx0cmNoZW5AY2hyb21p dW0ub3JnPgorCisgICAgICAgIFVzZSBtX3dlYlZpZXctPnNpemUoKSBmb3Igdmlld3BvcnQgdXBk YXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDI3 NjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBtX3dl YlZpZXctPmNsaWVudCgpLT53aW5kb3dSZWN0KCkgcmV0dXJucyB0aGUgb3V0ZXIgcmVjdCBvZiB0 aGUgYnJvd3NlcgorICAgICAgICB3aW5kb3csIHdoaWNoIGluY2x1ZGVzIHRoZSBkZWNvcmF0aW9u cyBzdWNoIGFzIHRoZSB0aXRsZSBiYXIuCisgICAgICAgIFdlIHNob3VsZCB1c2UgdGhlIHNpemUg b2YgdGhlIFdlYlZpZXcgZm9yIGxheW91dCBhbmQgcmVuZGVyaW5nIHB1cnBvc2UuCisKKyAgICAg ICAgRXhpc3RpbmcgdGVzdHMgYXJlIHVwZGF0ZWQgdG8gd29yayB3aXRob3V0IHdpbmRvd1JlY3Qo KS4KKworICAgICAgICAqIHNyYy9DaHJvbWVDbGllbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktp dDo6Q2hyb21lQ2xpZW50SW1wbDo6ZGlzcGF0Y2hWaWV3cG9ydFByb3BlcnRpZXNEaWRDaGFuZ2Up OgorICAgICAgICAqIHRlc3RzL1dlYkZyYW1lVGVzdC5jcHA6CisKIDIwMTItMTEtMTkgIE1pZ3Vl bCBHYXJjaWEgIDxtaWd1ZWxnQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW1dIFJl bW92ZSB0aGUgZGVwZW5kZW5jeSBvZiBJTlBVVF9UWVBFX0NPTE9SIG9uIFBBR0VfUE9QVVAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3Bw IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHAKaW5kZXgg NjI4ZTk5OTI3YjU2OGZmOWRiYTg0NDFmNWYwYTgxODY3NDYwYzMzNC4uODJlZDc5OGY3ZTkzNzgz MDYxZDcxOWE3YTBlNDFmZjBkOTZkMWU3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHAKQEAgLTYyNiwxNyArNjI2LDE3IEBAIHZvaWQgQ2hy b21lQ2xpZW50SW1wbDo6ZGlzcGF0Y2hWaWV3cG9ydFByb3BlcnRpZXNEaWRDaGFuZ2UoY29uc3Qg Vmlld3BvcnRBcmd1bWVuCiAgICAgICAgIHJldHVybjsKIAogICAgIFdlYlZpZXdDbGllbnQqIGNs aWVudCA9IG1fd2ViVmlldy0+Y2xpZW50KCk7Ci0gICAgV2ViUmVjdCBkZXZpY2VSZWN0ID0gY2xp ZW50LT53aW5kb3dSZWN0KCk7CisgICAgV2ViU2l6ZSBkZXZpY2VTaXplID0gbV93ZWJWaWV3LT5z aXplKCk7CiAgICAgLy8gSWYgdGhlIHdpbmRvdyBzaXplIGhhcyBub3QgYmVlbiBzZXQgeWV0IGRv bid0IGF0dGVtcHQgdG8gc2V0IHRoZSB2aWV3cG9ydAotICAgIGlmICghZGV2aWNlUmVjdC53aWR0 aCB8fCAhZGV2aWNlUmVjdC5oZWlnaHQpCisgICAgaWYgKCFkZXZpY2VTaXplLndpZHRoIHx8ICFk ZXZpY2VTaXplLmhlaWdodCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgU2V0dGluZ3MqIHNldHRp bmdzID0gbV93ZWJWaWV3LT5wYWdlKCktPnNldHRpbmdzKCk7CiAgICAgZmxvYXQgZGV2aWNlUGl4 ZWxSYXRpbyA9IGNsaWVudC0+c2NyZWVuSW5mbygpLmRldmljZVNjYWxlRmFjdG9yOwogICAgIC8v IENhbGwgdGhlIGNvbW1vbiB2aWV3cG9ydCBjb21wdXRpbmcgbG9naWMgaW4gVmlld3BvcnRBcmd1 bWVudHMuY3BwLgogICAgIFZpZXdwb3J0QXR0cmlidXRlcyBjb21wdXRlZCA9IGNvbXB1dGVWaWV3 cG9ydEF0dHJpYnV0ZXMoCi0gICAgICAgIGFyZ3VtZW50cywgc2V0dGluZ3MtPmxheW91dEZhbGxi YWNrV2lkdGgoKSwgZGV2aWNlUmVjdC53aWR0aCwgZGV2aWNlUmVjdC5oZWlnaHQsCi0gICAgICAg IGRldmljZVBpeGVsUmF0aW8sIEludFNpemUoZGV2aWNlUmVjdC53aWR0aCwgZGV2aWNlUmVjdC5o ZWlnaHQpKTsKKyAgICAgICAgYXJndW1lbnRzLCBzZXR0aW5ncy0+bGF5b3V0RmFsbGJhY2tXaWR0 aCgpLCBkZXZpY2VTaXplLndpZHRoLCBkZXZpY2VTaXplLmhlaWdodCwKKyAgICAgICAgZGV2aWNl UGl4ZWxSYXRpbywgSW50U2l6ZShkZXZpY2VTaXplLndpZHRoLCBkZXZpY2VTaXplLmhlaWdodCkp OwogCiAgICAgcmVzdHJpY3RTY2FsZUZhY3RvclRvSW5pdGlhbFNjYWxlSWZOb3RVc2VyU2NhbGFi bGUoY29tcHV0ZWQpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3Rz L1dlYkZyYW1lVGVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYkZyYW1l VGVzdC5jcHAKaW5kZXggMjA4ZmNjYjk0YjdlYzYxMDI5YWI4NDk3NGI3NjIxMWQyNjkyYTMzYy4u ZjUwMzU0MWY1NjRmZTk3YWZhZmI1MWRlYjIwYTM3NThkYjkzN2FmMCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJGcmFtZVRlc3QuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViRnJhbWVUZXN0LmNwcApAQCAtMjIwLDEwICsyMjAsOCBA QCBURVNUX0YoV2ViRnJhbWVUZXN0LCBEaXNwYXRjaE1lc3NhZ2VFdmVudFdpdGhPcmlnaW5DaGVj aykKIAogY2xhc3MgRml4ZWRMYXlvdXRUZXN0V2ViVmlld0NsaWVudCA6IHB1YmxpYyBXZWJWaWV3 Q2xpZW50IHsKICBwdWJsaWM6Ci0gICAgdmlydHVhbCBXZWJSZWN0IHdpbmRvd1JlY3QoKSBPVkVS UklERSB7IHJldHVybiBtX3dpbmRvd1JlY3Q7IH0KICAgICB2aXJ0dWFsIFdlYlNjcmVlbkluZm8g c2NyZWVuSW5mbygpIE9WRVJSSURFIHsgcmV0dXJuIG1fc2NyZWVuSW5mbzsgfQogCi0gICAgV2Vi UmVjdCBtX3dpbmRvd1JlY3Q7CiAgICAgV2ViU2NyZWVuSW5mbyBtX3NjcmVlbkluZm87CiB9Owog CkBAIC0yMzYsNyArMjM0LDYgQEAgVEVTVF9GKFdlYkZyYW1lVGVzdCwgRGV2aWNlU2NhbGVGYWN0 b3JVc2VzRGVmYXVsdFdpdGhvdXRWaWV3cG9ydFRhZykKIAogICAgIEZpeGVkTGF5b3V0VGVzdFdl YlZpZXdDbGllbnQgY2xpZW50OwogICAgIGNsaWVudC5tX3NjcmVlbkluZm8uZGV2aWNlU2NhbGVG YWN0b3IgPSAyOwotICAgIGNsaWVudC5tX3dpbmRvd1JlY3QgPSBXZWJSZWN0KDAsIDAsIHZpZXdw b3J0V2lkdGgsIHZpZXdwb3J0SGVpZ2h0KTsKIAogICAgIFdlYlZpZXcqIHdlYlZpZXcgPSBzdGF0 aWNfY2FzdDxXZWJWaWV3Kj4oRnJhbWVUZXN0SGVscGVyczo6Y3JlYXRlV2ViVmlld0FuZExvYWQo bV9iYXNlVVJMICsgIm5vX3ZpZXdwb3J0X3RhZy5odG1sIiwgdHJ1ZSwgMCwgJmNsaWVudCkpOwog CkBAIC0yNjMsNyArMjYwLDYgQEAgVEVTVF9GKFdlYkZyYW1lVGVzdCwgRml4ZWRMYXlvdXRJbml0 aWFsaXplQXRNaW5pbXVtUGFnZVNjYWxlKQogICAgIGNsaWVudC5tX3NjcmVlbkluZm8uZGV2aWNl U2NhbGVGYWN0b3IgPSAxOwogICAgIGludCB2aWV3cG9ydFdpZHRoID0gNjQwOwogICAgIGludCB2 aWV3cG9ydEhlaWdodCA9IDQ4MDsKLSAgICBjbGllbnQubV93aW5kb3dSZWN0ID0gV2ViUmVjdCgw LCAwLCB2aWV3cG9ydFdpZHRoLCB2aWV3cG9ydEhlaWdodCk7CiAKICAgICAvLyBNYWtlIHN1cmUg d2UgaW5pdGlhbGl6ZSB0byBtaW5pbXVtIHNjYWxlLCBldmVuIGlmIHRoZSB3aW5kb3cgc2l6ZQog ICAgIC8vIG9ubHkgYmVjb21lcyBhdmFpbGFibGUgYWZ0ZXIgdGhlIGxvYWQgYmVnaW5zLgpAQCAt MzAwLDcgKzI5Niw2IEBAIFRFU1RfRihXZWJGcmFtZVRlc3QsIFNjYWxlRmFjdG9yU2hvdWxkTm90 T3NjaWxsYXRlKQogICAgIGNsaWVudC5tX3NjcmVlbkluZm8uaG9yaXpvbnRhbERQSSA9IDIxMjsK ICAgICBpbnQgdmlld3BvcnRXaWR0aCA9IDgwMDsKICAgICBpbnQgdmlld3BvcnRIZWlnaHQgPSAx MDU3OwotICAgIGNsaWVudC5tX3dpbmRvd1JlY3QgPSBXZWJSZWN0KDAsIDAsIHZpZXdwb3J0V2lk dGgsIHZpZXdwb3J0SGVpZ2h0KTsKIAogICAgIFdlYlZpZXdJbXBsKiB3ZWJWaWV3SW1wbCA9IHN0 YXRpY19jYXN0PFdlYlZpZXdJbXBsKj4oRnJhbWVUZXN0SGVscGVyczo6Y3JlYXRlV2ViVmlld0Fu ZExvYWQobV9iYXNlVVJMICsgInNjYWxlX29zY2lsbGF0ZS5odG1sIiwgdHJ1ZSwgMCwgJmNsaWVu dCkpOwogICAgIHdlYlZpZXdJbXBsLT5lbmFibGVGaXhlZExheW91dE1vZGUodHJ1ZSk7CkBAIC0z MTksNyArMzE0LDYgQEAgVEVTVF9GKFdlYkZyYW1lVGVzdCwgQ2FuT3ZlcnJpZGVNYXhpbXVtU2Nh bGVGYWN0b3IpCiAgICAgY2xpZW50Lm1fc2NyZWVuSW5mby5kZXZpY2VTY2FsZUZhY3RvciA9IDE7 CiAgICAgaW50IHZpZXdwb3J0V2lkdGggPSA2NDA7CiAgICAgaW50IHZpZXdwb3J0SGVpZ2h0ID0g NDgwOwotICAgIGNsaWVudC5tX3dpbmRvd1JlY3QgPSBXZWJSZWN0KDAsIDAsIHZpZXdwb3J0V2lk dGgsIHZpZXdwb3J0SGVpZ2h0KTsKIAogICAgIFdlYlZpZXdJbXBsKiB3ZWJWaWV3SW1wbCA9IHN0 YXRpY19jYXN0PFdlYlZpZXdJbXBsKj4oRnJhbWVUZXN0SGVscGVyczo6Y3JlYXRlV2ViVmlld0Fu ZExvYWQobV9iYXNlVVJMICsgIm5vX3NjYWxlX2Zvcl95b3UuaHRtbCIsIHRydWUsIDAsICZjbGll bnQpKTsKICAgICB3ZWJWaWV3SW1wbC0+ZW5hYmxlRml4ZWRMYXlvdXRNb2RlKHRydWUpOwpAQCAt MzM0LDEzICszMjgsNiBAQCBURVNUX0YoV2ViRnJhbWVUZXN0LCBDYW5PdmVycmlkZU1heGltdW1T Y2FsZUZhY3RvcikKIH0KIAogI2lmIEVOQUJMRShHRVNUVVJFX0VWRU5UUykKLWNsYXNzIERpdkF1 dG9ab29tVGVzdFdlYlZpZXdDbGllbnQgOiBwdWJsaWMgV2ViVmlld0NsaWVudCB7Ci0gICAgcHVi bGljOgotICAgIHZpcnR1YWwgV2ViUmVjdCB3aW5kb3dSZWN0KCkgT1ZFUlJJREUgeyByZXR1cm4g bV93aW5kb3dSZWN0OyB9Ci0KLSAgICBXZWJSZWN0IG1fd2luZG93UmVjdDsKLX07Ci0KIHZvaWQg c2V0U2NhbGVBbmRTY3JvbGxBbmRMYXlvdXQoV2ViS2l0OjpXZWJWaWV3KiB3ZWJWaWV3LCBXZWJQ b2ludCBzY3JvbGwsIGZsb2F0IHNjYWxlKQogewogICAgIHdlYlZpZXctPnNldFBhZ2VTY2FsZUZh Y3RvcihzY2FsZSwgV2ViUG9pbnQoc2Nyb2xsLngsIHNjcm9sbC55KSk7CkBAIC0zNTEsMTEgKzMz OCw5IEBAIFRFU1RfRihXZWJGcmFtZVRlc3QsIERpdkF1dG9ab29tUGFyYW1zVGVzdCkKIHsKICAg ICByZWdpc3Rlck1vY2tlZEh0dHBVUkxMb2FkKCJnZXRfc2NhbGVfZm9yX2F1dG9fem9vbV9pbnRv X2Rpdl90ZXN0Lmh0bWwiKTsKIAotICAgIERpdkF1dG9ab29tVGVzdFdlYlZpZXdDbGllbnQgY2xp ZW50OwogICAgIGludCB2aWV3cG9ydFdpZHRoID0gNjQwOwogICAgIGludCB2aWV3cG9ydEhlaWdo dCA9IDQ4MDsKLSAgICBjbGllbnQubV93aW5kb3dSZWN0ID0gV2ViUmVjdCgwLCAwLCB2aWV3cG9y dFdpZHRoLCB2aWV3cG9ydEhlaWdodCk7Ci0gICAgV2ViS2l0OjpXZWJWaWV3KiB3ZWJWaWV3ID0g RnJhbWVUZXN0SGVscGVyczo6Y3JlYXRlV2ViVmlld0FuZExvYWQobV9iYXNlVVJMICsgImdldF9z Y2FsZV9mb3JfYXV0b196b29tX2ludG9fZGl2X3Rlc3QuaHRtbCIsIHRydWUsIDAsICZjbGllbnQp OworICAgIFdlYktpdDo6V2ViVmlldyogd2ViVmlldyA9IEZyYW1lVGVzdEhlbHBlcnM6OmNyZWF0 ZVdlYlZpZXdBbmRMb2FkKG1fYmFzZVVSTCArICJnZXRfc2NhbGVfZm9yX2F1dG9fem9vbV9pbnRv X2Rpdl90ZXN0Lmh0bWwiKTsKICAgICB3ZWJWaWV3LT5lbmFibGVGaXhlZExheW91dE1vZGUodHJ1 ZSk7CiAgICAgd2ViVmlldy0+c2V0RGV2aWNlU2NhbGVGYWN0b3IoMi4wZik7CiAgICAgd2ViVmll dy0+cmVzaXplKFdlYlNpemUodmlld3BvcnRXaWR0aCwgdmlld3BvcnRIZWlnaHQpKTsKQEAgLTQx OSwxMiArNDA0LDEwIEBAIFRFU1RfRihXZWJGcmFtZVRlc3QsIERpdkF1dG9ab29tTXVsdGlwbGVE aXZzVGVzdCkKIHsKICAgICByZWdpc3Rlck1vY2tlZEh0dHBVUkxMb2FkKCJnZXRfbXVsdGlwbGVf ZGl2c19mb3JfYXV0b196b29tX3Rlc3QuaHRtbCIpOwogCi0gICAgRGl2QXV0b1pvb21UZXN0V2Vi Vmlld0NsaWVudCBjbGllbnQ7CiAgICAgaW50IHZpZXdwb3J0V2lkdGggPSA2NDA7CiAgICAgaW50 IHZpZXdwb3J0SGVpZ2h0ID0gNDgwOwogICAgIGZsb2F0IGRvdWJsZVRhcFpvb21BbHJlYWR5TGVn aWJsZVJhdGlvID0gMS4yZjsKLSAgICBjbGllbnQubV93aW5kb3dSZWN0ID0gV2ViUmVjdCgwLCAw LCB2aWV3cG9ydFdpZHRoLCB2aWV3cG9ydEhlaWdodCk7Ci0gICAgV2ViS2l0OjpXZWJWaWV3KiB3 ZWJWaWV3ID0gRnJhbWVUZXN0SGVscGVyczo6Y3JlYXRlV2ViVmlld0FuZExvYWQobV9iYXNlVVJM ICsgImdldF9tdWx0aXBsZV9kaXZzX2Zvcl9hdXRvX3pvb21fdGVzdC5odG1sIiwgdHJ1ZSwgMCwg JmNsaWVudCk7CisgICAgV2ViS2l0OjpXZWJWaWV3KiB3ZWJWaWV3ID0gRnJhbWVUZXN0SGVscGVy czo6Y3JlYXRlV2ViVmlld0FuZExvYWQobV9iYXNlVVJMICsgImdldF9tdWx0aXBsZV9kaXZzX2Zv cl9hdXRvX3pvb21fdGVzdC5odG1sIik7CiAgICAgd2ViVmlldy0+ZW5hYmxlRml4ZWRMYXlvdXRN b2RlKHRydWUpOwogICAgIHdlYlZpZXctPnJlc2l6ZShXZWJTaXplKHZpZXdwb3J0V2lkdGgsIHZp ZXdwb3J0SGVpZ2h0KSk7CiAgICAgd2ViVmlldy0+c2V0UGFnZVNjYWxlRmFjdG9yTGltaXRzKDEs IDQpOwpAQCAtNDYwLDEyICs0NDMsMTAgQEAgVEVTVF9GKFdlYkZyYW1lVGVzdCwgRGl2QXV0b1pv b21TY2FsZUJvdW5kc1Rlc3QpCiB7CiAgICAgcmVnaXN0ZXJNb2NrZWRIdHRwVVJMTG9hZCgiZ2V0 X3NjYWxlX2JvdW5kc19jaGVja19mb3JfYXV0b196b29tX3Rlc3QuaHRtbCIpOwogCi0gICAgRGl2 QXV0b1pvb21UZXN0V2ViVmlld0NsaWVudCBjbGllbnQ7CiAgICAgaW50IHZpZXdwb3J0V2lkdGgg PSA2NDA7CiAgICAgaW50IHZpZXdwb3J0SGVpZ2h0ID0gNDgwOwogICAgIGZsb2F0IGRvdWJsZVRh cFpvb21BbHJlYWR5TGVnaWJsZVJhdGlvID0gMS4yZjsKLSAgICBjbGllbnQubV93aW5kb3dSZWN0 ID0gV2ViUmVjdCgwLCAwLCB2aWV3cG9ydFdpZHRoLCB2aWV3cG9ydEhlaWdodCk7Ci0gICAgV2Vi S2l0OjpXZWJWaWV3KiB3ZWJWaWV3ID0gRnJhbWVUZXN0SGVscGVyczo6Y3JlYXRlV2ViVmlld0Fu ZExvYWQobV9iYXNlVVJMICsgImdldF9zY2FsZV9ib3VuZHNfY2hlY2tfZm9yX2F1dG9fem9vbV90 ZXN0Lmh0bWwiLCB0cnVlLCAwLCAmY2xpZW50KTsKKyAgICBXZWJLaXQ6OldlYlZpZXcqIHdlYlZp ZXcgPSBGcmFtZVRlc3RIZWxwZXJzOjpjcmVhdGVXZWJWaWV3QW5kTG9hZChtX2Jhc2VVUkwgKyAi Z2V0X3NjYWxlX2JvdW5kc19jaGVja19mb3JfYXV0b196b29tX3Rlc3QuaHRtbCIpOwogICAgIHdl YlZpZXctPmVuYWJsZUZpeGVkTGF5b3V0TW9kZSh0cnVlKTsKICAgICB3ZWJWaWV3LT5yZXNpemUo V2ViU2l6ZSh2aWV3cG9ydFdpZHRoLCB2aWV3cG9ydEhlaWdodCkpOwogICAgIHdlYlZpZXctPnNl dFBhZ2VTY2FsZUZhY3RvckxpbWl0cygxLCA0KTsKQEAgLTUyMiwxNCArNTAzLDEyIEBAIFRFU1Rf RihXZWJGcmFtZVRlc3QsIERJU0FCTEVEX0RpdlNjcm9sbEludG9FZGl0YWJsZVRlc3QpCiB7CiAg ICAgcmVnaXN0ZXJNb2NrZWRIdHRwVVJMTG9hZCgiZ2V0X3NjYWxlX2Zvcl96b29tX2ludG9fZWRp dGFibGVfdGVzdC5odG1sIik7CiAKLSAgICBEaXZBdXRvWm9vbVRlc3RXZWJWaWV3Q2xpZW50IGNs aWVudDsKICAgICBpbnQgdmlld3BvcnRXaWR0aCA9IDY0MDsKICAgICBpbnQgdmlld3BvcnRIZWln aHQgPSA0ODA7CiAgICAgZmxvYXQgbGVmdEJveFJhdGlvID0gMC4zZjsKICAgICBpbnQgY2FyZXRQ YWRkaW5nID0gMTA7CiAgICAgaW50IG1pblJlYWRhYmxlQ2FyZXRIZWlnaHQgPSAxODsKLSAgICBj bGllbnQubV93aW5kb3dSZWN0ID0gV2ViUmVjdCgwLCAwLCB2aWV3cG9ydFdpZHRoLCB2aWV3cG9y dEhlaWdodCk7Ci0gICAgV2ViS2l0OjpXZWJWaWV3KiB3ZWJWaWV3ID0gRnJhbWVUZXN0SGVscGVy czo6Y3JlYXRlV2ViVmlld0FuZExvYWQobV9iYXNlVVJMICsgImdldF9zY2FsZV9mb3Jfem9vbV9p bnRvX2VkaXRhYmxlX3Rlc3QuaHRtbCIsIHRydWUsIDAsICZjbGllbnQpOworICAgIFdlYktpdDo6 V2ViVmlldyogd2ViVmlldyA9IEZyYW1lVGVzdEhlbHBlcnM6OmNyZWF0ZVdlYlZpZXdBbmRMb2Fk KG1fYmFzZVVSTCArICJnZXRfc2NhbGVfZm9yX3pvb21faW50b19lZGl0YWJsZV90ZXN0Lmh0bWwi KTsKICAgICB3ZWJWaWV3LT5lbmFibGVGaXhlZExheW91dE1vZGUodHJ1ZSk7CiAgICAgd2ViVmll dy0+cmVzaXplKFdlYlNpemUodmlld3BvcnRXaWR0aCwgdmlld3BvcnRIZWlnaHQpKTsKICAgICB3 ZWJWaWV3LT5zZXRQYWdlU2NhbGVGYWN0b3JMaW1pdHMoMSwgMTApOwo=