104767 2012-12-11 22:22:44 -0800 WebViewImpl::resetScrollAndScaleState() causes the page to render incorrectly 2012-12-14 17:22:33 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Android Android RESOLVED FIXED http://crbug.com/165436 P2 Normal --- 1 dfalcantara dfalcantara abarth aelias dglazkov fishd jamesr japhet tkent+wkapi webkit.review.bot oldest_to_newest 789206 0 dfalcantara 2012-12-11 22:22:44 -0800 Follow up of https://bugs.webkit.org/show_bug.cgi?id=90222 The patch set applied in the above bug is meant to avoid issues where the page would be zoomed in and scrolled incorrectly after a page has been reloaded with an override URL. It does so by resetting the page's scale factor to 0.0f (which is a special value for HistoryController::restoreScrollPositionAndViewState()) and then saving it to the HistoryItem. While this was working on Android, it was not working on ChromeOS when it landed (http://crbug.com/153907). Recently, this stopped working on Android, as well, resulting in black page loads if called (http://crbug.com/165436). There are two workarounds that get this working again: * The original version of the patch in the original WebKit bug avoids this issue by directly setting the HistoryItem values instead of indirectly setting them through setPageScaleFactor(0.0). Later versions of the patch flipped this around, apparently breaking things. * Moving the resetScrollAndScaleState() call to RenderViewImpl::didFirstVisuallyNonEmptyLayout() from RenderViewImpl::didCommitProvisionalLoad() in chromium also appears to work, but this might cause a secondary reload. 789214 1 178969 dfalcantara 2012-12-11 22:30:38 -0800 Created attachment 178969 Patch 789217 2 dfalcantara 2012-12-11 22:32:44 -0800 The attached patch goes with option 1 and changes the way the WebKit function works. 789218 3 webkit.review.bot 2012-12-11 22:34:19 -0800 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 789276 4 178969 aelias 2012-12-12 00:09:05 -0800 Comment on attachment 178969 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=178969&action=review Note that I recommended this change because it's unsafe to set pageScaleFactor to 0: code elsewhere doesn't know what to do with that and will just shrink the document to a point. The 0 value is only valid within a historyItem. > Source/WebKit/chromium/src/WebViewImpl.cpp:-3093 > - page()->setPageScaleFactor(0, IntPoint()); Let's keep this line but change it to "page()->setPageScaleFactor(1, IntPoint());" so that non-history-item-related callers still get the reset behavior. > Source/WebKit/chromium/src/WebViewImpl.cpp:3093 > + // Clear out the values for the current history item. Add extra comment: "This will prevent the history item from clobbering the value determined during page scale initialization, which may be less than 1." > Source/WebKit/chromium/src/WebViewImpl.cpp:3095 > + RefPtr<HistoryItem> currentItem = m_page->mainFrame()->loader()->history()->currentItem(); I'm thinking we should just move these lines to a new method "HistoryController::clearDocumentAndScrollState()". That would be a reasonable method for HistoryController to have. 789775 5 179098 dfalcantara 2012-12-12 12:07:16 -0800 Created attachment 179098 Patch 789791 6 aelias 2012-12-12 12:15:57 -0800 LGTM, thanks. 789797 7 dfalcantara 2012-12-12 12:23:05 -0800 (In reply to comment #0) > * Moving the resetScrollAndScaleState() call to RenderViewImpl::didFirstVisuallyNonEmptyLayout() from RenderViewImpl::didCommitProvisionalLoad() in chromium also appears to work, but this might cause a secondary reload. Meant re-layout instead of reload. 791990 8 179098 webkit.review.bot 2012-12-14 17:22:28 -0800 Comment on attachment 179098 Patch Clearing flags on attachment: 179098 Committed r137792: <http://trac.webkit.org/changeset/137792> 791991 9 webkit.review.bot 2012-12-14 17:22:33 -0800 All reviewed patches have been landed. Closing bug. 178969 2012-12-11 22:30:38 -0800 2012-12-12 12:07:14 -0800 Patch bug-104767-20121211222759.patch text/plain 4366 dfalcantara SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiAxMzc0MTcpCisrKyBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIw IEBACisyMDEyLTEyLTExICBEYW4gQWxjYW50YXJhICA8ZGZhbGNhbnRhcmFAY2hyb21pdW0ub3Jn PgorCisgICAgICAgIFdlYlZpZXdJbXBsOjpyZXNldFNjcm9sbEFuZFNjYWxlU3RhdGUoKSBjYXVz ZXMgdGhlIHBhZ2UgdG8gcmVuZGVyIGluY29ycmVjdGx5CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDQ3NjcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDaGFuZ2UgV2ViVmlld0ltcGw6OnJlc2V0U2Nyb2xs QW5kU2NhbGVTdGF0ZSgpIHNvIHRoYXQgaXQgZGlyZWN0bHkKKyAgICAgICAgYWx0ZXJzIHZhbHVl cyBpbiB0aGUgSGlzdG9yeUl0ZW0gaW5zdGVhZCBvZiBpbmRpcmVjdGx5IGNoYW5naW5nIHRoZQor ICAgICAgICB2YWx1ZXMuCisKKyAgICAgICAgKiBwdWJsaWMvV2ViVmlldy5oOgorICAgICAgICAo V2ViVmlldyk6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViVmlld0ltcGw6OnJlc2V0U2Nyb2xsQW5kU2NhbGVTdGF0ZSk6CisgICAgICAgICogdGVz dHMvV2ViVmlld1Rlc3QuY3BwOgorCiAyMDEyLTEyLTExICBEb21pbmljIE1henpvbmkgIDxkbWF6 em9uaUBnb29nbGUuY29tPgogCiAgICAgICAgIEFYOiBNYWtlIGlzQWN0aW9uU3VwcG9ydGVkIGNy b3NzLXBsYXRmb3JtLgpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmll dy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXcu aAkocmV2aXNpb24gMTM3NDA3KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi Vmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNjIsOCArMjYyLDcgQEAgcHVibGljOgogICAgIC8v IHN0YXRlLCB0aGlzIGZ1bmN0aW9uIGRlbGV0ZXMgYW55IHNhdmVkIHNjcm9sbCBhbmQgc2NhbGUg c3RhdGUuCiAgICAgdmlydHVhbCB2b2lkIHJlc3RvcmVTY3JvbGxBbmRTY2FsZVN0YXRlKCkgPSAw OwogCi0gICAgLy8gUmVzZXQgdGhlIHNjcm9sbCBhbmQgc2NhbGUgc3RhdGUgYW5kIGNsb2JiZXIg YW55IHByZXZpb3VzbHkgc2F2ZWQgdmFsdWVzIGZvcgotICAgIC8vIHRoZXNlIHBhcmFtZXRlcnMu CisgICAgLy8gUmVzZXQgYW55IHNhdmVkIHZhbHVlcyBmb3IgdGhlIHNjcm9sbCBhbmQgc2NhbGUg c3RhdGUuCiAgICAgdmlydHVhbCB2b2lkIHJlc2V0U2Nyb2xsQW5kU2NhbGVTdGF0ZSgpID0gMDsK IAogICAgIC8vIFByZXZlbnQgdGhlIHdlYiBwYWdlIGZyb20gc2V0dGluZyBhIG1heGltdW0gc2Nh bGUgdmlhIHRoZSB2aWV3cG9ydCBtZXRhCkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJWaWV3SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViVmlld0ltcGwuY3BwCShyZXZpc2lvbiAxMzc0MDcpCisrKyBTb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMwOTAsMTQgKzMw OTAsMTcgQEAgdm9pZCBXZWJWaWV3SW1wbDo6cmVzZXRTYXZlZFNjcm9sbEFuZFNjYQogCiB2b2lk IFdlYlZpZXdJbXBsOjpyZXNldFNjcm9sbEFuZFNjYWxlU3RhdGUoKQogewotICAgIHBhZ2UoKS0+ c2V0UGFnZVNjYWxlRmFjdG9yKDAsIEludFBvaW50KCkpOworICAgIC8vIENsZWFyIG91dCB0aGUg dmFsdWVzIGZvciB0aGUgY3VycmVudCBoaXN0b3J5IGl0ZW0uCisgICAgcGFnZSgpLT5tYWluRnJh bWUoKS0+bG9hZGVyKCktPmhpc3RvcnkoKS0+c2F2ZURvY3VtZW50QW5kU2Nyb2xsU3RhdGUoKTsK KyAgICBSZWZQdHI8SGlzdG9yeUl0ZW0+IGN1cnJlbnRJdGVtID0gbV9wYWdlLT5tYWluRnJhbWUo KS0+bG9hZGVyKCktPmhpc3RvcnkoKS0+Y3VycmVudEl0ZW0oKTsKKyAgICBjdXJyZW50SXRlbS0+ Y2xlYXJTY3JvbGxQb2ludCgpOworICAgIGN1cnJlbnRJdGVtLT5zZXRQYWdlU2NhbGVGYWN0b3Io MCk7CiAgICAgbV9wYWdlU2NhbGVGYWN0b3JJc1NldCA9IGZhbHNlOwogCiAgICAgLy8gQ2xvYmJl ciBzYXZlZCBzY2FsZXMgYW5kIHNjcm9sbCBvZmZzZXRzLgogICAgIGlmIChGcmFtZVZpZXcqIHZp ZXcgPSBwYWdlKCktPm1haW5GcmFtZSgpLT5kb2N1bWVudCgpLT52aWV3KCkpCiAgICAgICAgIHZp ZXctPmNhY2hlQ3VycmVudFNjcm9sbFBvc2l0aW9uKCk7CiAgICAgcmVzZXRTYXZlZFNjcm9sbEFu ZFNjYWxlU3RhdGUoKTsKLSAgICBwYWdlKCktPm1haW5GcmFtZSgpLT5sb2FkZXIoKS0+aGlzdG9y eSgpLT5zYXZlRG9jdW1lbnRBbmRTY3JvbGxTdGF0ZSgpOwogfQogCiBXZWJTaXplIFdlYlZpZXdJ bXBsOjpmaXhlZExheW91dFNpemUoKSBjb25zdApJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1 bS90ZXN0cy9XZWJWaWV3VGVzdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJv bWl1bS90ZXN0cy9XZWJWaWV3VGVzdC5jcHAJKHJldmlzaW9uIDEzNzQwNykKKysrIFNvdXJjZS9X ZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViVmlld1Rlc3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00 ODIsMTQgKzQ4MiwxNSBAQCBURVNUX0YoV2ViVmlld1Rlc3QsIFJlc2V0U2Nyb2xsQW5kU2NhbGVT CiAgICAgRVhQRUNUX0VRKDg0LCB3ZWJWaWV3SW1wbC0+bWFpbkZyYW1lKCktPnNjcm9sbE9mZnNl dCgpLmhlaWdodCk7CiAgICAgd2ViVmlld0ltcGwtPnBhZ2UoKS0+bWFpbkZyYW1lKCktPmxvYWRl cigpLT5oaXN0b3J5KCktPnNhdmVEb2N1bWVudEFuZFNjcm9sbFN0YXRlKCk7CiAKLSAgICAvLyBD b25maXJtIHRoYXQgcmVzZXR0aW5nIHRoZSBwYWdlIHN0YXRlIHJlc2V0cyBib3RoIHRoZSBzY2Fs ZSBhbmQgc2Nyb2xsIHBvc2l0aW9uLCBhcyB3ZWxsCi0gICAgLy8gYXMgb3ZlcndyaXRlcyB0aGUg b3JpZ2luYWwgcGFyYW1ldGVycyB0aGF0IHdlcmUgc2F2ZWQgdG8gdGhlIEhpc3RvcnlDb250cm9s bGVyLgorICAgIC8vIENvbmZpcm0gdGhhdCByZXNldHRpbmcgdGhlIHBhZ2Ugc3RhdGUgcmVzZXRz IHRoZSBzYXZlZCBzY3JvbGwgcG9zaXRpb24uCisgICAgLy8gVGhlIEhpc3RvcnlDb250cm9sbGVy IHRyZWF0cyBhIHBhZ2Ugc2NhbGUgZmFjdG9yIG9mIDAuMGYgYXMgc3BlY2lhbCBhbmQgYXZvaWRz CisgICAgLy8gcmVzdG9yaW5nIGl0IHRvIHRoZSBXZWJWaWV3LgogICAgIHdlYlZpZXdJbXBsLT5y ZXNldFNjcm9sbEFuZFNjYWxlU3RhdGUoKTsKLSAgICBFWFBFQ1RfRVEoMC4wZiwgd2ViVmlld0lt cGwtPnBhZ2VTY2FsZUZhY3RvcigpKTsKLSAgICBFWFBFQ1RfRVEoMCwgd2ViVmlld0ltcGwtPm1h aW5GcmFtZSgpLT5zY3JvbGxPZmZzZXQoKS53aWR0aCk7Ci0gICAgRVhQRUNUX0VRKDAsIHdlYlZp ZXdJbXBsLT5tYWluRnJhbWUoKS0+c2Nyb2xsT2Zmc2V0KCkuaGVpZ2h0KTsKKyAgICBFWFBFQ1Rf RVEoMi4wZiwgd2ViVmlld0ltcGwtPnBhZ2VTY2FsZUZhY3RvcigpKTsKKyAgICBFWFBFQ1RfRVEo MTE2LCB3ZWJWaWV3SW1wbC0+bWFpbkZyYW1lKCktPnNjcm9sbE9mZnNldCgpLndpZHRoKTsKKyAg ICBFWFBFQ1RfRVEoODQsIHdlYlZpZXdJbXBsLT5tYWluRnJhbWUoKS0+c2Nyb2xsT2Zmc2V0KCku aGVpZ2h0KTsKICAgICB3ZWJWaWV3SW1wbC0+cGFnZSgpLT5tYWluRnJhbWUoKS0+bG9hZGVyKCkt Pmhpc3RvcnkoKS0+cmVzdG9yZVNjcm9sbFBvc2l0aW9uQW5kVmlld1N0YXRlKCk7Ci0gICAgRVhQ RUNUX0VRKDAuMGYsIHdlYlZpZXdJbXBsLT5wYWdlU2NhbGVGYWN0b3IoKSk7CisgICAgRVhQRUNU X0VRKDIuMGYsIHdlYlZpZXdJbXBsLT5wYWdlU2NhbGVGYWN0b3IoKSk7CiAgICAgRVhQRUNUX0VR KDAsIHdlYlZpZXdJbXBsLT5tYWluRnJhbWUoKS0+c2Nyb2xsT2Zmc2V0KCkud2lkdGgpOwogICAg IEVYUEVDVF9FUSgwLCB3ZWJWaWV3SW1wbC0+bWFpbkZyYW1lKCktPnNjcm9sbE9mZnNldCgpLmhl aWdodCk7CiAgICAgd2ViVmlld0ltcGwtPmNsb3NlKCk7Cg== 179098 2012-12-12 12:07:16 -0800 2012-12-14 17:22:28 -0800 Patch bug-104767-20121212120437.patch text/plain 5723 dfalcantara SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9IaXN0b3J5Q29udHJvbGxlci5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL0hpc3RvcnlDb250cm9sbGVyLmNwcAkocmV2 aXNpb24gMTM3NDA3KQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL0hpc3RvcnlDb250cm9sbGVy LmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTMsNiArOTMsMTUgQEAgdm9pZCBIaXN0b3J5Q29udHJv bGxlcjo6c2F2ZVNjcm9sbFBvc2l0aQogICAgIG1fZnJhbWUtPmxvYWRlcigpLT5jbGllbnQoKS0+ c2F2ZVZpZXdTdGF0ZVRvSXRlbShpdGVtKTsKIH0KIAordm9pZCBIaXN0b3J5Q29udHJvbGxlcjo6 Y2xlYXJTY3JvbGxQb3NpdGlvbkFuZFZpZXdTdGF0ZSgpCit7CisgICAgaWYgKCFtX2N1cnJlbnRJ dGVtKQorICAgICAgICByZXR1cm47CisKKyAgICBtX2N1cnJlbnRJdGVtLT5jbGVhclNjcm9sbFBv aW50KCk7CisgICAgbV9jdXJyZW50SXRlbS0+c2V0UGFnZVNjYWxlRmFjdG9yKDApOworfQorCiAv KgogIFRoZXJlIGlzIGEgcmFjZSBjb25kaXRpb24gYmV0d2VlbiB0aGUgbGF5b3V0IGFuZCBsb2Fk IGNvbXBsZXRpb24gdGhhdCBhZmZlY3RzIHJlc3RvcmluZyB0aGUgc2Nyb2xsIHBvc2l0aW9uLgog IFdlIHRyeSB0byByZXN0b3JlIHRoZSBzY3JvbGwgcG9zaXRpb24gYXQgYm90aCB0aGUgZmlyc3Qg bGF5b3V0IGFuZCB1cG9uIGxvYWQgY29tcGxldGlvbi4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xv YWRlci9IaXN0b3J5Q29udHJvbGxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xv YWRlci9IaXN0b3J5Q29udHJvbGxlci5oCShyZXZpc2lvbiAxMzc0MDcpCisrKyBTb3VyY2UvV2Vi Q29yZS9sb2FkZXIvSGlzdG9yeUNvbnRyb2xsZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNTIsNiAr NTIsNyBAQCBwdWJsaWM6CiAgICAgfkhpc3RvcnlDb250cm9sbGVyKCk7CiAKICAgICB2b2lkIHNh dmVTY3JvbGxQb3NpdGlvbkFuZFZpZXdTdGF0ZVRvSXRlbShIaXN0b3J5SXRlbSopOworICAgIHZv aWQgY2xlYXJTY3JvbGxQb3NpdGlvbkFuZFZpZXdTdGF0ZSgpOwogICAgIHZvaWQgcmVzdG9yZVNj cm9sbFBvc2l0aW9uQW5kVmlld1N0YXRlKCk7CiAKICAgICB2b2lkIHVwZGF0ZUJhY2tGb3J3YXJk TGlzdEZvckZyYWdtZW50U2Nyb2xsKCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwko cmV2aXNpb24gMTM3NDE3KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwyMyBAQAorMjAxMi0xMi0xMSAgRGFuIEFsY2FudGFyYSAg PGRmYWxjYW50YXJhQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWJWaWV3SW1wbDo6cmVzZXRT Y3JvbGxBbmRTY2FsZVN0YXRlKCkgY2F1c2VzIHRoZSBwYWdlIHRvIHJlbmRlciBpbmNvcnJlY3Rs eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA0NzY3 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2hhbmdl IFdlYlZpZXdJbXBsOjpyZXNldFNjcm9sbEFuZFNjYWxlU3RhdGUoKSBzbyB0aGF0IGl0IGRpcmVj dGx5CisgICAgICAgIGFsdGVycyB2YWx1ZXMgaW4gdGhlIEhpc3RvcnlJdGVtIGluc3RlYWQgb2Yg aW5kaXJlY3RseSBjaGFuZ2luZyB0aGUKKyAgICAgICAgdmFsdWVzLgorCisgICAgICAgIEFkZHMg YSBtZXRob2QgaW4gSGlzdG9yeUNvbnRyb2xsZXIgdG8gY2xlYXIgdGhlIHNjcm9sbCBhbmQgc2Nh bGUgc3RhdGUgb2YKKyAgICAgICAgaXRzIGN1cnJlbnQgSGlzdG9yeUl0ZW0uCisKKyAgICAgICAg KiBwdWJsaWMvV2ViVmlldy5oOgorICAgICAgICAoV2ViVmlldyk6CisgICAgICAgICogc3JjL1dl YlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnJlc2V0U2Nyb2xs QW5kU2NhbGVTdGF0ZSk6CisgICAgICAgICogdGVzdHMvV2ViVmlld1Rlc3QuY3BwOgorCiAyMDEy LTEyLTExICBEb21pbmljIE1henpvbmkgIDxkbWF6em9uaUBnb29nbGUuY29tPgogCiAgICAgICAg IEFYOiBNYWtlIGlzQWN0aW9uU3VwcG9ydGVkIGNyb3NzLXBsYXRmb3JtLgpJbmRleDogU291cmNl L1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXcuaAkocmV2aXNpb24gMTM3NDA3KQorKysgU291 cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC0y NjIsOCArMjYyLDcgQEAgcHVibGljOgogICAgIC8vIHN0YXRlLCB0aGlzIGZ1bmN0aW9uIGRlbGV0 ZXMgYW55IHNhdmVkIHNjcm9sbCBhbmQgc2NhbGUgc3RhdGUuCiAgICAgdmlydHVhbCB2b2lkIHJl c3RvcmVTY3JvbGxBbmRTY2FsZVN0YXRlKCkgPSAwOwogCi0gICAgLy8gUmVzZXQgdGhlIHNjcm9s bCBhbmQgc2NhbGUgc3RhdGUgYW5kIGNsb2JiZXIgYW55IHByZXZpb3VzbHkgc2F2ZWQgdmFsdWVz IGZvcgotICAgIC8vIHRoZXNlIHBhcmFtZXRlcnMuCisgICAgLy8gUmVzZXQgYW55IHNhdmVkIHZh bHVlcyBmb3IgdGhlIHNjcm9sbCBhbmQgc2NhbGUgc3RhdGUuCiAgICAgdmlydHVhbCB2b2lkIHJl c2V0U2Nyb2xsQW5kU2NhbGVTdGF0ZSgpID0gMDsKIAogICAgIC8vIFByZXZlbnQgdGhlIHdlYiBw YWdlIGZyb20gc2V0dGluZyBhIG1heGltdW0gc2NhbGUgdmlhIHRoZSB2aWV3cG9ydCBtZXRhCklu ZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCShyZXZpc2lv biAxMzc0MDcpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTMwOTAsMTQgKzMwOTAsMTggQEAgdm9pZCBXZWJWaWV3SW1wbDo6 cmVzZXRTYXZlZFNjcm9sbEFuZFNjYQogCiB2b2lkIFdlYlZpZXdJbXBsOjpyZXNldFNjcm9sbEFu ZFNjYWxlU3RhdGUoKQogewotICAgIHBhZ2UoKS0+c2V0UGFnZVNjYWxlRmFjdG9yKDAsIEludFBv aW50KCkpOworICAgIHBhZ2UoKS0+c2V0UGFnZVNjYWxlRmFjdG9yKDEsIEludFBvaW50KCkpOwor CisgICAgLy8gQ2xlYXIgb3V0IHRoZSB2YWx1ZXMgZm9yIHRoZSBjdXJyZW50IGhpc3RvcnkgaXRl bS4gVGhpcyB3aWxsIHByZXZlbnQgdGhlIGhpc3RvcnkgaXRlbSBmcm9tIGNsb2JiZXJpbmcgdGhl CisgICAgLy8gdmFsdWUgZGV0ZXJtaW5lZCBkdXJpbmcgcGFnZSBzY2FsZSBpbml0aWFsaXphdGlv biwgd2hpY2ggbWF5IGJlIGxlc3MgdGhhbiAxLgorICAgIHBhZ2UoKS0+bWFpbkZyYW1lKCktPmxv YWRlcigpLT5oaXN0b3J5KCktPnNhdmVEb2N1bWVudEFuZFNjcm9sbFN0YXRlKCk7CisgICAgcGFn ZSgpLT5tYWluRnJhbWUoKS0+bG9hZGVyKCktPmhpc3RvcnkoKS0+Y2xlYXJTY3JvbGxQb3NpdGlv bkFuZFZpZXdTdGF0ZSgpOwogICAgIG1fcGFnZVNjYWxlRmFjdG9ySXNTZXQgPSBmYWxzZTsKIAog ICAgIC8vIENsb2JiZXIgc2F2ZWQgc2NhbGVzIGFuZCBzY3JvbGwgb2Zmc2V0cy4KICAgICBpZiAo RnJhbWVWaWV3KiB2aWV3ID0gcGFnZSgpLT5tYWluRnJhbWUoKS0+ZG9jdW1lbnQoKS0+dmlldygp KQogICAgICAgICB2aWV3LT5jYWNoZUN1cnJlbnRTY3JvbGxQb3NpdGlvbigpOwogICAgIHJlc2V0 U2F2ZWRTY3JvbGxBbmRTY2FsZVN0YXRlKCk7Ci0gICAgcGFnZSgpLT5tYWluRnJhbWUoKS0+bG9h ZGVyKCktPmhpc3RvcnkoKS0+c2F2ZURvY3VtZW50QW5kU2Nyb2xsU3RhdGUoKTsKIH0KIAogV2Vi U2l6ZSBXZWJWaWV3SW1wbDo6Zml4ZWRMYXlvdXRTaXplKCkgY29uc3QKSW5kZXg6IFNvdXJjZS9X ZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViVmlld1Rlc3QuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViVmlld1Rlc3QuY3BwCShyZXZpc2lvbiAxMzc0MDcp CisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYlZpZXdUZXN0LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNDgyLDE0ICs0ODIsMTUgQEAgVEVTVF9GKFdlYlZpZXdUZXN0LCBSZXNldFNj cm9sbEFuZFNjYWxlUwogICAgIEVYUEVDVF9FUSg4NCwgd2ViVmlld0ltcGwtPm1haW5GcmFtZSgp LT5zY3JvbGxPZmZzZXQoKS5oZWlnaHQpOwogICAgIHdlYlZpZXdJbXBsLT5wYWdlKCktPm1haW5G cmFtZSgpLT5sb2FkZXIoKS0+aGlzdG9yeSgpLT5zYXZlRG9jdW1lbnRBbmRTY3JvbGxTdGF0ZSgp OwogCi0gICAgLy8gQ29uZmlybSB0aGF0IHJlc2V0dGluZyB0aGUgcGFnZSBzdGF0ZSByZXNldHMg Ym90aCB0aGUgc2NhbGUgYW5kIHNjcm9sbCBwb3NpdGlvbiwgYXMgd2VsbAotICAgIC8vIGFzIG92 ZXJ3cml0ZXMgdGhlIG9yaWdpbmFsIHBhcmFtZXRlcnMgdGhhdCB3ZXJlIHNhdmVkIHRvIHRoZSBI aXN0b3J5Q29udHJvbGxlci4KKyAgICAvLyBDb25maXJtIHRoYXQgcmVzZXR0aW5nIHRoZSBwYWdl IHN0YXRlIHJlc2V0cyB0aGUgc2F2ZWQgc2Nyb2xsIHBvc2l0aW9uLgorICAgIC8vIFRoZSBIaXN0 b3J5Q29udHJvbGxlciB0cmVhdHMgYSBwYWdlIHNjYWxlIGZhY3RvciBvZiAwLjBmIGFzIHNwZWNp YWwgYW5kIGF2b2lkcworICAgIC8vIHJlc3RvcmluZyBpdCB0byB0aGUgV2ViVmlldy4KICAgICB3 ZWJWaWV3SW1wbC0+cmVzZXRTY3JvbGxBbmRTY2FsZVN0YXRlKCk7Ci0gICAgRVhQRUNUX0VRKDAu MGYsIHdlYlZpZXdJbXBsLT5wYWdlU2NhbGVGYWN0b3IoKSk7CisgICAgRVhQRUNUX0VRKDEuMGYs IHdlYlZpZXdJbXBsLT5wYWdlU2NhbGVGYWN0b3IoKSk7CiAgICAgRVhQRUNUX0VRKDAsIHdlYlZp ZXdJbXBsLT5tYWluRnJhbWUoKS0+c2Nyb2xsT2Zmc2V0KCkud2lkdGgpOwogICAgIEVYUEVDVF9F USgwLCB3ZWJWaWV3SW1wbC0+bWFpbkZyYW1lKCktPnNjcm9sbE9mZnNldCgpLmhlaWdodCk7CiAg ICAgd2ViVmlld0ltcGwtPnBhZ2UoKS0+bWFpbkZyYW1lKCktPmxvYWRlcigpLT5oaXN0b3J5KCkt PnJlc3RvcmVTY3JvbGxQb3NpdGlvbkFuZFZpZXdTdGF0ZSgpOwotICAgIEVYUEVDVF9FUSgwLjBm LCB3ZWJWaWV3SW1wbC0+cGFnZVNjYWxlRmFjdG9yKCkpOworICAgIEVYUEVDVF9FUSgxLjBmLCB3 ZWJWaWV3SW1wbC0+cGFnZVNjYWxlRmFjdG9yKCkpOwogICAgIEVYUEVDVF9FUSgwLCB3ZWJWaWV3 SW1wbC0+bWFpbkZyYW1lKCktPnNjcm9sbE9mZnNldCgpLndpZHRoKTsKICAgICBFWFBFQ1RfRVEo MCwgd2ViVmlld0ltcGwtPm1haW5GcmFtZSgpLT5zY3JvbGxPZmZzZXQoKS5oZWlnaHQpOwogICAg IHdlYlZpZXdJbXBsLT5jbG9zZSgpOwo=