84738 2012-04-24 10:18:55 -0700 [BlackBerry] setUserViewportArguments not always respected. 2012-04-24 16:46:02 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 0 mlattanzio webkit-unassigned kpiascik tonikitoo webkit.review.bot oldest_to_newest 608802 0 mlattanzio 2012-04-24 10:18:55 -0700 Not all code paths lead to the fallback viewport arguments being used. Ensure that the fallback ViewportArguments for all loads are used if no meta viewport is present. 608808 1 138592 mlattanzio 2012-04-24 10:26:11 -0700 Created attachment 138592 Patch 608816 2 kpiascik 2012-04-24 10:36:47 -0700 This looks much cleaner. Since this is actually an implementation of the original bug then I'm inclined to re-open the previous bug, revert the old commit and cleanup this change to be correct. I'm just not sure if its worth it. That being said, I'd like to see if there's some way to write a unit test for this. 608817 3 138592 tonikitoo 2012-04-24 10:37:26 -0700 Comment on attachment 138592 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=138592&action=review > Source/WebKit/blackberry/Api/WebPage.cpp:3158 > - currentViewportArguments.targetDensityDpi = deviceDPI; > + m_viewportArguments.targetDensityDpi = deviceDPI; > } we set 'deviceDPI' here... > Source/WebKit/blackberry/Api/WebPage.cpp:3160 > - ViewportAttributes result = computeViewportAttributes(currentViewportArguments, desktopWidth, deviceWidth, deviceHeight, deviceDPI, m_defaultLayoutSize); > + ViewportAttributes result = computeViewportAttributes(m_viewportArguments, desktopWidth, deviceWidth, deviceHeight, deviceDPI, m_defaultLayoutSize); ... and pass it as a parameter here. Is it really needed? 608821 4 kpiascik 2012-04-24 10:41:10 -0700 (In reply to comment #3) > (From update of attachment 138592 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=138592&action=review > > > Source/WebKit/blackberry/Api/WebPage.cpp:3158 > > - currentViewportArguments.targetDensityDpi = deviceDPI; > > + m_viewportArguments.targetDensityDpi = deviceDPI; > > } > > we set 'deviceDPI' here... > > > Source/WebKit/blackberry/Api/WebPage.cpp:3160 > > - ViewportAttributes result = computeViewportAttributes(currentViewportArguments, desktopWidth, deviceWidth, deviceHeight, deviceDPI, m_defaultLayoutSize); > > + ViewportAttributes result = computeViewportAttributes(m_viewportArguments, desktopWidth, deviceWidth, deviceHeight, deviceDPI, m_defaultLayoutSize); > > ... and pass it as a parameter here. Is it really needed? Yes this is needed. 608833 5 tonikitoo 2012-04-24 10:51:12 -0700 (In reply to comment #4) > (In reply to comment #3) > > (From update of attachment 138592 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=138592&action=review > > > > > Source/WebKit/blackberry/Api/WebPage.cpp:3158 > > > - currentViewportArguments.targetDensityDpi = deviceDPI; > > > + m_viewportArguments.targetDensityDpi = deviceDPI; > > > } > > > > we set 'deviceDPI' here... > > > > > Source/WebKit/blackberry/Api/WebPage.cpp:3160 > > > - ViewportAttributes result = computeViewportAttributes(currentViewportArguments, desktopWidth, deviceWidth, deviceHeight, deviceDPI, m_defaultLayoutSize); > > > + ViewportAttributes result = computeViewportAttributes(m_viewportArguments, desktopWidth, deviceWidth, deviceHeight, deviceDPI, m_defaultLayoutSize); > > > > ... and pass it as a parameter here. Is it really needed? > > Yes this is needed. Could you explain why? Why not assign it from within ::computeViewportAttributes? 608844 6 kpiascik 2012-04-24 10:57:49 -0700 View in context: https://bugs.webkit.org/attachment.cgi?id=138592&action=review >> Source/WebKit/blackberry/Api/WebPage.cpp:3160 >> + ViewportAttributes result = computeViewportAttributes(m_viewportArguments, desktopWidth, deviceWidth, deviceHeight, deviceDPI, m_defaultLayoutSize); > > ... and pass it as a parameter here. Is it really needed? We're not changing the DeviceDPI, what we're doing is changing the default targetDensityDPI of the meta viewport arguments. On the PlayBook the targetDensityDPI if not specified should be the DeviceDPI. The DeviceDPI passed into the computeViewportAttributes needs to be the correct deviceDPI otherwise there will be no scaling. 608855 7 138601 mlattanzio 2012-04-24 11:06:25 -0700 Created attachment 138601 Patch 609245 8 138601 webkit.review.bot 2012-04-24 16:45:53 -0700 Comment on attachment 138601 Patch Clearing flags on attachment: 138601 Committed r115135: <http://trac.webkit.org/changeset/115135> 609246 9 webkit.review.bot 2012-04-24 16:46:02 -0700 All reviewed patches have been landed. Closing bug. 138592 2012-04-24 10:26:11 -0700 2012-04-24 11:06:14 -0700 Patch bug-84738-20120424132630.patch text/plain 4691 mlattanzio U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0NzYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA2Mzk2YjQ4ZThjYmFkZTNlMjgyNjhhMjdjNDZkZWY5ZTA4OWIwYWM3Li4zNzFhMDhhN2Fj Yzc1ZDBhN2NmNTEzNWMyM2UyNzI1MTQ1Yjg1ZGUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMi0wNC0yNCAgTWlrZSBMYXR0YW56aW8gIDxtbGF0 dGFuemlvQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIHNldFVzZXJWaWV3cG9ydEFy Z3VtZW50cyBub3QgYWx3YXlzIHJlc3BlY3RlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTg0NzM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHRoZSB1bm5lY2Vzc2FyeSBsb2dpYyBpbgorICAg ICAgICBXZWJQYWdlUHJpdmF0ZTo6cmVjb21wdXRlVmlydHVhbFZpZXdwb3J0RnJvbVZpZXdwb3J0 QXJndW1lbnRzKCkuCisgICAgICAgIEluc3RlYWQgaXQgaXMgbXVjaCBzaW1wbGVyIHRvIGp1c3Qg c2V0IHRoZSBtX3ZpZXdwb3J0QXJndW1lbnRzIHRvCisgICAgICAgIG1fdXNlclZpZXdwb3J0QXJn dW1lbnRzIG9uIExvYWRDb21taXR0ZWQuIElmIHRoZXJlIGlzIGEgdmlld3BvcnQKKyAgICAgICAg dGFnIGluIHRoZSBjb250ZW50LCBtX3ZpZXdwb3J0QXJndW1lbnRzIHdpbGwgYmUgcmVwbGFjZWQg d2l0aCBpdAorICAgICAgICBhcyB1c3VhbCBkdXJpbmcgbm9ybWFsIHBhZ2UgbG9hZC4KKworICAg ICAgICAqIEFwaS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2Vi UGFnZVByaXZhdGU6OnNldExvYWRTdGF0ZSk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6 OldlYlBhZ2VQcml2YXRlOjpyZWNvbXB1dGVWaXJ0dWFsVmlld3BvcnRGcm9tVmlld3BvcnRBcmd1 bWVudHMpOgorCiAyMDEyLTA0LTIwICBNaWtlIExhdHRhbnppbyAgPG1sYXR0YW56aW9AcmltLmNv bT4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gRXhwb3NlIFdlYlZpZXdwb3J0QXJndW1lbnRzIHRv IFdlYlBhZ2VDbGllbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkv V2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCmlu ZGV4IDU4N2FjMjJiZGI5M2UxMDIyYmExNWU3MmZmZThiNDAzYWY2ZDQzYTUuLjQ3ZmY1ZmU4ZjQ1 NmVjMTcwMTJhYTRhZWNhOWRlYTE4YWE3MTY1OTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L0FwaS9XZWJQYWdlLmNwcApAQCAtODUzLDYgKzg1MywxMiBAQCB2b2lkIFdlYlBhZ2VQcml2YXRl OjpzZXRMb2FkU3RhdGUoTG9hZFN0YXRlIHN0YXRlKQogICAgICAgICAgICAgLy8gQ2hlY2sgaWYg d2UgaGF2ZSBhbHJlYWR5IHByb2Nlc3MgdGhlIG1ldGEgdmlld3BvcnQgdGFnLCB0aGlzIG9ubHkg aGFwcGVucyBvbiBoaXN0b3J5IG5hdmlnYXRpb24KICAgICAgICAgICAgIGlmICghbV9kaWRSZXN0 b3JlRnJvbVBhZ2VDYWNoZSkgewogICAgICAgICAgICAgICAgIG1fdmlld3BvcnRBcmd1bWVudHMg PSBWaWV3cG9ydEFyZ3VtZW50cygpOworCisgICAgICAgICAgICAgICAgLy8gQXQgdGhlIG1vbWVu dCB3ZSBjb21taXQgYSBuZXcgbG9hZCwgc2V0IHRoZSB2aWV3cG9ydCBhcmd1bWVudHMKKyAgICAg ICAgICAgICAgICAvLyB0byBhbnkgZmFsbGJhY2sgdmFsdWVzLiBJZiB0aGVyZSBpcyBhIG1ldGEg dmlld3BvcnQgaW4gdGhlCisgICAgICAgICAgICAgICAgLy8gY29udGVudCBpdCB3aWxsIG92ZXJ3 cml0ZSB0aGUgZmFsbGJhY2sgYXJndW1lbnRzIHNvb24uCisgICAgICAgICAgICAgICAgZGlzcGF0 Y2hWaWV3cG9ydFByb3BlcnRpZXNEaWRDaGFuZ2UobV91c2VyVmlld3BvcnRBcmd1bWVudHMpOwor CiAgICAgICAgICAgICAgICAgbV91c2VyU2NhbGFibGUgPSBtX3dlYlNldHRpbmdzLT5pc1VzZXJT Y2FsYWJsZSgpOwogICAgICAgICAgICAgICAgIHJlc2V0U2NhbGVzKCk7CiAgICAgICAgICAgICB9 IGVsc2UgewpAQCAtMzEzNSwzNSArMzE0MSwyMyBAQCB2b2lkIFdlYlBhZ2U6OnJlc2V0VmlydHVh bFZpZXdwb3J0T25Db21taXR0ZWQoYm9vbCByZXNldCkKIEludFNpemUgV2ViUGFnZVByaXZhdGU6 OnJlY29tcHV0ZVZpcnR1YWxWaWV3cG9ydEZyb21WaWV3cG9ydEFyZ3VtZW50cygpCiB7CiAgICAg c3RhdGljIGNvbnN0IFZpZXdwb3J0QXJndW1lbnRzIGRlZmF1bHRWaWV3cG9ydEFyZ3VtZW50czsK LQotICAgIC8vIFdoZW4gY2FsY3VsYXRpbmcgYSB2aXJ0dWFsIHZpZXdwb3J0IGZvciBsYXlvdXQg d2UgcHJpb3JpdGl6ZSB0aGUKLSAgICAvLyBtX3ZpZXdwb3J0QXJndW1lbnRzIGZyb20gV2ViQ29y ZSBvdmVyIHRoZSBtX3VzZXJWaWV3cG9ydEFyZ3VtZW50cy4gV2UKLSAgICAvLyBjYW5ub3QgYXNz aWduIG1fdmlld3BvcnRBZ3VtZW50cyA9IG1fdXNlclZpZXdwb3J0QXJndW1lbnRzIGJlY2F1c2Ug dGhlbgotICAgIC8vIHN1YnNlcXVlbnQgY2hhbmdlcyB0byBtX3VzZXJWaWV3cG9ydEFyZ3VtZW50 cyB3b3VsZCBiZSBpZ25vcmVkLCB0aGlua2luZwotICAgIC8vIHRoZSBtX3ZpZXdwb3J0QXJndW1l bnRzIGhhZCBjb21lIGZyb20gV2ViQ29yZS4gSW5zdGVhZCB3ZSBtYWtlIGEgY29weS4KLQotICAg IFZpZXdwb3J0QXJndW1lbnRzIGN1cnJlbnRWaWV3cG9ydEFyZ3VtZW50cyA9IG1fdmlld3BvcnRB cmd1bWVudHM7Ci0gICAgaWYgKGN1cnJlbnRWaWV3cG9ydEFyZ3VtZW50cyA9PSBkZWZhdWx0Vmll d3BvcnRBcmd1bWVudHMpIHsKLSAgICAgICAgaWYgKGN1cnJlbnRWaWV3cG9ydEFyZ3VtZW50cyA9 PSBtX3VzZXJWaWV3cG9ydEFyZ3VtZW50cykKLSAgICAgICAgICAgIHJldHVybiBJbnRTaXplKCk7 Ci0KLSAgICAgICAgY3VycmVudFZpZXdwb3J0QXJndW1lbnRzID0gbV91c2VyVmlld3BvcnRBcmd1 bWVudHM7Ci0gICAgfQorICAgIGlmIChtX3ZpZXdwb3J0QXJndW1lbnRzID09IGRlZmF1bHRWaWV3 cG9ydEFyZ3VtZW50cykKKyAgICAgICAgcmV0dXJuIEludFNpemUoKTsKIAogICAgIGludCBkZXNr dG9wV2lkdGggPSBkZWZhdWx0TWF4TGF5b3V0U2l6ZSgpLndpZHRoKCk7CiAgICAgaW50IGRldmlj ZVdpZHRoID0gUGxhdGZvcm06OkdyYXBoaWNzOjpTY3JlZW46OnByaW1hcnlTY3JlZW4oKS0+d2lk dGgoKTsKICAgICBpbnQgZGV2aWNlSGVpZ2h0ID0gUGxhdGZvcm06OkdyYXBoaWNzOjpTY3JlZW46 OnByaW1hcnlTY3JlZW4oKS0+aGVpZ2h0KCk7CiAgICAgRmxvYXRTaXplIGN1cnJlbnRQUEkgPSBQ bGF0Zm9ybTo6R3JhcGhpY3M6OlNjcmVlbjo6cHJpbWFyeVNjcmVlbigpLT5waXhlbHNQZXJJbmNo KC0xKTsKICAgICBpbnQgZGV2aWNlRFBJID0gaW50KHJvdW5kZigoY3VycmVudFBQSS53aWR0aCgp ICsgY3VycmVudFBQSS5oZWlnaHQoKSkgLyAyKSk7Ci0gICAgaWYgKGN1cnJlbnRWaWV3cG9ydEFy Z3VtZW50cy50YXJnZXREZW5zaXR5RHBpID09IFZpZXdwb3J0QXJndW1lbnRzOjpWYWx1ZUF1dG8K KyAgICBpZiAobV92aWV3cG9ydEFyZ3VtZW50cy50YXJnZXREZW5zaXR5RHBpID09IFZpZXdwb3J0 QXJndW1lbnRzOjpWYWx1ZUF1dG8KICAgICAgICAgJiYgIVBsYXRmb3JtOjpEZXZpY2VJbmZvOjpp bnN0YW5jZSgpLT5pc01vYmlsZSgpKSB7CiAgICAgICAgIC8vIElmIHRoZSBjb250ZW50IHByb3Zp ZGVyIGhhc24ndCBzcGVjaWZpZWQgYSB0YXJnZXQgZHBpIGFuZCB3ZSBoYXZlIGEgbGFyZ2UKICAg ICAgICAgLy8gc2NyZWVuIHdlIGFzc3VtZSB0aGUgY29udGVudCBpcyBmaW5lIGFuZCBzZXQgdGhl IHRhcmdldERlbnNpdHlEcGkgdG8gb3VyIGRwaS4KICAgICAgICAgLy8gT24gc21hbGxlciBzY3Jl ZW4gbW9iaWxlIGRldmljZXMgd2Ugc2tpcCB0aGlzIGFuZCB1c2UgV2ViQ29yZSBkcGkgc2NhbGlu Zy4KLSAgICAgICAgY3VycmVudFZpZXdwb3J0QXJndW1lbnRzLnRhcmdldERlbnNpdHlEcGkgPSBk ZXZpY2VEUEk7CisgICAgICAgIG1fdmlld3BvcnRBcmd1bWVudHMudGFyZ2V0RGVuc2l0eURwaSA9 IGRldmljZURQSTsKICAgICB9CiAKLSAgICBWaWV3cG9ydEF0dHJpYnV0ZXMgcmVzdWx0ID0gY29t cHV0ZVZpZXdwb3J0QXR0cmlidXRlcyhjdXJyZW50Vmlld3BvcnRBcmd1bWVudHMsIGRlc2t0b3BX aWR0aCwgZGV2aWNlV2lkdGgsIGRldmljZUhlaWdodCwgZGV2aWNlRFBJLCBtX2RlZmF1bHRMYXlv dXRTaXplKTsKKyAgICBWaWV3cG9ydEF0dHJpYnV0ZXMgcmVzdWx0ID0gY29tcHV0ZVZpZXdwb3J0 QXR0cmlidXRlcyhtX3ZpZXdwb3J0QXJndW1lbnRzLCBkZXNrdG9wV2lkdGgsIGRldmljZVdpZHRo LCBkZXZpY2VIZWlnaHQsIGRldmljZURQSSwgbV9kZWZhdWx0TGF5b3V0U2l6ZSk7CiAgICAgbV9w YWdlLT5zZXREZXZpY2VTY2FsZUZhY3RvcihyZXN1bHQuZGV2aWNlUGl4ZWxSYXRpbyk7CiAgICAg cmV0dXJuIEludFNpemUocmVzdWx0LmxheW91dFNpemUud2lkdGgoKSwgcmVzdWx0LmxheW91dFNp emUuaGVpZ2h0KCkpOwogfQo= 138601 2012-04-24 11:06:25 -0700 2012-04-24 16:45:53 -0700 Patch bug-84738-20120424140645.patch text/plain 4722 mlattanzio U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1MDc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA3Y2I5NWQ0MjQwYzc4ZjM0ZGQ1YWE3MWNhMWFjNWYxODE2ODUzNzFlLi41OTVjNWNjMTM0 YTM4NGMxMmNjMDYyZTgxYTNkZmJhMGI4NDZiNjZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMi0wNC0yNCAgTWlrZSBMYXR0YW56aW8gIDxtbGF0 dGFuemlvQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIHNldFVzZXJWaWV3cG9ydEFy Z3VtZW50cyBub3QgYWx3YXlzIHJlc3BlY3RlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTg0NzM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHRoZSB1bm5lY2Vzc2FyeSBsb2dpYyBpbgorICAg ICAgICBXZWJQYWdlUHJpdmF0ZTo6cmVjb21wdXRlVmlydHVhbFZpZXdwb3J0RnJvbVZpZXdwb3J0 QXJndW1lbnRzKCkuCisgICAgICAgIEluc3RlYWQgaXQgaXMgbXVjaCBzaW1wbGVyIHRvIGp1c3Qg c2V0IHRoZSBtX3ZpZXdwb3J0QXJndW1lbnRzIHRvCisgICAgICAgIG1fdXNlclZpZXdwb3J0QXJn dW1lbnRzIG9uIExvYWRDb21taXR0ZWQuIElmIHRoZXJlIGlzIGEgdmlld3BvcnQKKyAgICAgICAg dGFnIGluIHRoZSBjb250ZW50LCBtX3ZpZXdwb3J0QXJndW1lbnRzIHdpbGwgYmUgcmVwbGFjZWQg d2l0aCBpdAorICAgICAgICBhcyB1c3VhbCBkdXJpbmcgbm9ybWFsIHBhZ2UgbG9hZC4KKworICAg ICAgICAqIEFwaS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2Vi UGFnZVByaXZhdGU6OnNldExvYWRTdGF0ZSk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6 OldlYlBhZ2VQcml2YXRlOjpyZWNvbXB1dGVWaXJ0dWFsVmlld3BvcnRGcm9tVmlld3BvcnRBcmd1 bWVudHMpOgorCiAyMDEyLTA0LTI0ICBNaWtlIEZlbnRvbiAgPG1pZmVudG9uQHJpbS5jb20+CiAK ICAgICAgICAgW0JsYWNrQmVycnldIEFkZCBhZGRpdGlvbmFsIGRldGFpbHMgaW5jbHVkaW5nIHRo ZSBib3VuZHMgb2YgdGhlIGJveCBmb3IgY2FyZXRQb3NpdGlvbkNoYW5nZWQuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcAppbmRleCA1ODdhYzIyYmRiOTNlMTAyMmJhMTVl NzJmZmU4YjQwM2FmNmQ0M2E1Li40N2ZmNWZlOGY0NTZlYzE3MDEyYWE0YWVjYTlkZWExOGFhNzE2 NTk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKQEAgLTg1Myw2 ICs4NTMsMTIgQEAgdm9pZCBXZWJQYWdlUHJpdmF0ZTo6c2V0TG9hZFN0YXRlKExvYWRTdGF0ZSBz dGF0ZSkKICAgICAgICAgICAgIC8vIENoZWNrIGlmIHdlIGhhdmUgYWxyZWFkeSBwcm9jZXNzIHRo ZSBtZXRhIHZpZXdwb3J0IHRhZywgdGhpcyBvbmx5IGhhcHBlbnMgb24gaGlzdG9yeSBuYXZpZ2F0 aW9uCiAgICAgICAgICAgICBpZiAoIW1fZGlkUmVzdG9yZUZyb21QYWdlQ2FjaGUpIHsKICAgICAg ICAgICAgICAgICBtX3ZpZXdwb3J0QXJndW1lbnRzID0gVmlld3BvcnRBcmd1bWVudHMoKTsKKwor ICAgICAgICAgICAgICAgIC8vIEF0IHRoZSBtb21lbnQgd2UgY29tbWl0IGEgbmV3IGxvYWQsIHNl dCB0aGUgdmlld3BvcnQgYXJndW1lbnRzCisgICAgICAgICAgICAgICAgLy8gdG8gYW55IGZhbGxi YWNrIHZhbHVlcy4gSWYgdGhlcmUgaXMgYSBtZXRhIHZpZXdwb3J0IGluIHRoZQorICAgICAgICAg ICAgICAgIC8vIGNvbnRlbnQgaXQgd2lsbCBvdmVyd3JpdGUgdGhlIGZhbGxiYWNrIGFyZ3VtZW50 cyBzb29uLgorICAgICAgICAgICAgICAgIGRpc3BhdGNoVmlld3BvcnRQcm9wZXJ0aWVzRGlkQ2hh bmdlKG1fdXNlclZpZXdwb3J0QXJndW1lbnRzKTsKKwogICAgICAgICAgICAgICAgIG1fdXNlclNj YWxhYmxlID0gbV93ZWJTZXR0aW5ncy0+aXNVc2VyU2NhbGFibGUoKTsKICAgICAgICAgICAgICAg ICByZXNldFNjYWxlcygpOwogICAgICAgICAgICAgfSBlbHNlIHsKQEAgLTMxMzUsMzUgKzMxNDEs MjMgQEAgdm9pZCBXZWJQYWdlOjpyZXNldFZpcnR1YWxWaWV3cG9ydE9uQ29tbWl0dGVkKGJvb2wg cmVzZXQpCiBJbnRTaXplIFdlYlBhZ2VQcml2YXRlOjpyZWNvbXB1dGVWaXJ0dWFsVmlld3BvcnRG cm9tVmlld3BvcnRBcmd1bWVudHMoKQogewogICAgIHN0YXRpYyBjb25zdCBWaWV3cG9ydEFyZ3Vt ZW50cyBkZWZhdWx0Vmlld3BvcnRBcmd1bWVudHM7Ci0KLSAgICAvLyBXaGVuIGNhbGN1bGF0aW5n IGEgdmlydHVhbCB2aWV3cG9ydCBmb3IgbGF5b3V0IHdlIHByaW9yaXRpemUgdGhlCi0gICAgLy8g bV92aWV3cG9ydEFyZ3VtZW50cyBmcm9tIFdlYkNvcmUgb3ZlciB0aGUgbV91c2VyVmlld3BvcnRB cmd1bWVudHMuIFdlCi0gICAgLy8gY2Fubm90IGFzc2lnbiBtX3ZpZXdwb3J0QWd1bWVudHMgPSBt X3VzZXJWaWV3cG9ydEFyZ3VtZW50cyBiZWNhdXNlIHRoZW4KLSAgICAvLyBzdWJzZXF1ZW50IGNo YW5nZXMgdG8gbV91c2VyVmlld3BvcnRBcmd1bWVudHMgd291bGQgYmUgaWdub3JlZCwgdGhpbmtp bmcKLSAgICAvLyB0aGUgbV92aWV3cG9ydEFyZ3VtZW50cyBoYWQgY29tZSBmcm9tIFdlYkNvcmUu IEluc3RlYWQgd2UgbWFrZSBhIGNvcHkuCi0KLSAgICBWaWV3cG9ydEFyZ3VtZW50cyBjdXJyZW50 Vmlld3BvcnRBcmd1bWVudHMgPSBtX3ZpZXdwb3J0QXJndW1lbnRzOwotICAgIGlmIChjdXJyZW50 Vmlld3BvcnRBcmd1bWVudHMgPT0gZGVmYXVsdFZpZXdwb3J0QXJndW1lbnRzKSB7Ci0gICAgICAg IGlmIChjdXJyZW50Vmlld3BvcnRBcmd1bWVudHMgPT0gbV91c2VyVmlld3BvcnRBcmd1bWVudHMp Ci0gICAgICAgICAgICByZXR1cm4gSW50U2l6ZSgpOwotCi0gICAgICAgIGN1cnJlbnRWaWV3cG9y dEFyZ3VtZW50cyA9IG1fdXNlclZpZXdwb3J0QXJndW1lbnRzOwotICAgIH0KKyAgICBpZiAobV92 aWV3cG9ydEFyZ3VtZW50cyA9PSBkZWZhdWx0Vmlld3BvcnRBcmd1bWVudHMpCisgICAgICAgIHJl dHVybiBJbnRTaXplKCk7CiAKICAgICBpbnQgZGVza3RvcFdpZHRoID0gZGVmYXVsdE1heExheW91 dFNpemUoKS53aWR0aCgpOwogICAgIGludCBkZXZpY2VXaWR0aCA9IFBsYXRmb3JtOjpHcmFwaGlj czo6U2NyZWVuOjpwcmltYXJ5U2NyZWVuKCktPndpZHRoKCk7CiAgICAgaW50IGRldmljZUhlaWdo dCA9IFBsYXRmb3JtOjpHcmFwaGljczo6U2NyZWVuOjpwcmltYXJ5U2NyZWVuKCktPmhlaWdodCgp OwogICAgIEZsb2F0U2l6ZSBjdXJyZW50UFBJID0gUGxhdGZvcm06OkdyYXBoaWNzOjpTY3JlZW46 OnByaW1hcnlTY3JlZW4oKS0+cGl4ZWxzUGVySW5jaCgtMSk7CiAgICAgaW50IGRldmljZURQSSA9 IGludChyb3VuZGYoKGN1cnJlbnRQUEkud2lkdGgoKSArIGN1cnJlbnRQUEkuaGVpZ2h0KCkpIC8g MikpOwotICAgIGlmIChjdXJyZW50Vmlld3BvcnRBcmd1bWVudHMudGFyZ2V0RGVuc2l0eURwaSA9 PSBWaWV3cG9ydEFyZ3VtZW50czo6VmFsdWVBdXRvCisgICAgaWYgKG1fdmlld3BvcnRBcmd1bWVu dHMudGFyZ2V0RGVuc2l0eURwaSA9PSBWaWV3cG9ydEFyZ3VtZW50czo6VmFsdWVBdXRvCiAgICAg ICAgICYmICFQbGF0Zm9ybTo6RGV2aWNlSW5mbzo6aW5zdGFuY2UoKS0+aXNNb2JpbGUoKSkgewog ICAgICAgICAvLyBJZiB0aGUgY29udGVudCBwcm92aWRlciBoYXNuJ3Qgc3BlY2lmaWVkIGEgdGFy Z2V0IGRwaSBhbmQgd2UgaGF2ZSBhIGxhcmdlCiAgICAgICAgIC8vIHNjcmVlbiB3ZSBhc3N1bWUg dGhlIGNvbnRlbnQgaXMgZmluZSBhbmQgc2V0IHRoZSB0YXJnZXREZW5zaXR5RHBpIHRvIG91ciBk cGkuCiAgICAgICAgIC8vIE9uIHNtYWxsZXIgc2NyZWVuIG1vYmlsZSBkZXZpY2VzIHdlIHNraXAg dGhpcyBhbmQgdXNlIFdlYkNvcmUgZHBpIHNjYWxpbmcuCi0gICAgICAgIGN1cnJlbnRWaWV3cG9y dEFyZ3VtZW50cy50YXJnZXREZW5zaXR5RHBpID0gZGV2aWNlRFBJOworICAgICAgICBtX3ZpZXdw b3J0QXJndW1lbnRzLnRhcmdldERlbnNpdHlEcGkgPSBkZXZpY2VEUEk7CiAgICAgfQogCi0gICAg Vmlld3BvcnRBdHRyaWJ1dGVzIHJlc3VsdCA9IGNvbXB1dGVWaWV3cG9ydEF0dHJpYnV0ZXMoY3Vy cmVudFZpZXdwb3J0QXJndW1lbnRzLCBkZXNrdG9wV2lkdGgsIGRldmljZVdpZHRoLCBkZXZpY2VI ZWlnaHQsIGRldmljZURQSSwgbV9kZWZhdWx0TGF5b3V0U2l6ZSk7CisgICAgVmlld3BvcnRBdHRy aWJ1dGVzIHJlc3VsdCA9IGNvbXB1dGVWaWV3cG9ydEF0dHJpYnV0ZXMobV92aWV3cG9ydEFyZ3Vt ZW50cywgZGVza3RvcFdpZHRoLCBkZXZpY2VXaWR0aCwgZGV2aWNlSGVpZ2h0LCBkZXZpY2VEUEks IG1fZGVmYXVsdExheW91dFNpemUpOwogICAgIG1fcGFnZS0+c2V0RGV2aWNlU2NhbGVGYWN0b3Io cmVzdWx0LmRldmljZVBpeGVsUmF0aW8pOwogICAgIHJldHVybiBJbnRTaXplKHJlc3VsdC5sYXlv dXRTaXplLndpZHRoKCksIHJlc3VsdC5sYXlvdXRTaXplLmhlaWdodCgpKTsKIH0K