75576 2012-01-04 14:29:08 -0800 [Chromium] Do not recompute viewport on same page navigation 2012-01-24 14:53:12 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 fsamuel fsamuel aelias fishd rjkroege webkit.review.bot oldest_to_newest 529765 0 fsamuel 2012-01-04 14:29:08 -0800 [Chromium] Do not recompute viewport on same page navigation 529767 1 121157 fsamuel 2012-01-04 14:31:36 -0800 Created attachment 121157 Patch 529788 2 121163 fsamuel 2012-01-04 15:00:08 -0800 Created attachment 121163 Patch 529793 3 fsamuel 2012-01-04 15:01:58 -0800 Updated based on conversation with aelias. Thanks! :) 529973 4 aelias 2012-01-04 20:17:08 -0800 Looks good to me, thanks. 530546 5 121163 fishd 2012-01-05 12:36:02 -0800 Comment on attachment 121163 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=121163&action=review > Source/WebKit/chromium/src/BackForwardListChromium.cpp:62 > + if ((item && !m_currentItem) || (item && m_currentItem && !equalIgnoringFragmentIdentifier(item->url(), m_currentItem->url()))) Given history.pushState, which can change more than just the reference fragment of the URL but keep the document the same, performing equalIgnoringFragmentIdentifier checks like this is almost always wrong. You probably want to compare HistoryItem::documentSequenceNumber instead. > Source/WebKit/chromium/src/WebViewImpl.cpp:2693 > + // Only reset this flag one on a new page navigation. typo? "flag one on a new"? > Source/WebKit/chromium/src/WebViewImpl.cpp:2696 > + m_pageScaleFactorIsSet = false; you can't just put this code in WebViewImpl::didCommitLoad ? > Source/WebKit/chromium/src/WebViewImpl.h:303 > + void observeNewPageNavigation(); observeNewPageNavigation sounds way too much like observeNewNavigation. what do you really mean? 530563 6 aelias 2012-01-05 12:58:00 -0800 (In reply to comment #5) > (From update of attachment 121163 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=121163&action=review > > > Source/WebKit/chromium/src/BackForwardListChromium.cpp:62 > > + if ((item && !m_currentItem) || (item && m_currentItem && !equalIgnoringFragmentIdentifier(item->url(), m_currentItem->url()))) > > Given history.pushState, which can change more than just the reference fragment of > the URL but keep the document the same, performing equalIgnoringFragmentIdentifier > checks like this is almost always wrong. You probably want to compare > HistoryItem::documentSequenceNumber instead. That sounds good to me. > > Source/WebKit/chromium/src/WebViewImpl.cpp:2696 > > + m_pageScaleFactorIsSet = false; > > you can't just put this code in WebViewImpl::didCommitLoad ? didCommitLoad lacks information about whether the navigation went to a different document. If that information were pushed there, then didCommitLoad would work. > > > Source/WebKit/chromium/src/WebViewImpl.h:303 > > + void observeNewPageNavigation(); > > observeNewPageNavigation sounds way too much like observeNewNavigation. what do you really mean? "observeDifferentDocumentNavigation" might be a more descriptive name. The intent of this change is to initialize the page scale factor to minimum on initial visit of any document without a viewport tag (and never again thereafter). We clear this boolean to false when navigating to a new document as a note that we need to initialize the page scale as soon as we learn the content width. But we don't want to touch the boolean if it's a same-page navigation. 530632 7 121330 fsamuel 2012-01-05 14:28:39 -0800 Created attachment 121330 Patch 530633 8 fsamuel 2012-01-05 14:29:50 -0800 (In reply to comment #6) > (In reply to comment #5) > > (From update of attachment 121163 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=121163&action=review > > > > > Source/WebKit/chromium/src/BackForwardListChromium.cpp:62 > > > + if ((item && !m_currentItem) || (item && m_currentItem && !equalIgnoringFragmentIdentifier(item->url(), m_currentItem->url()))) > > > > Given history.pushState, which can change more than just the reference fragment of > > the URL but keep the document the same, performing equalIgnoringFragmentIdentifier > > checks like this is almost always wrong. You probably want to compare > > HistoryItem::documentSequenceNumber instead. > > That sounds good to me. > > > > Source/WebKit/chromium/src/WebViewImpl.cpp:2696 > > > + m_pageScaleFactorIsSet = false; > > > > you can't just put this code in WebViewImpl::didCommitLoad ? > > didCommitLoad lacks information about whether the navigation went to a different document. If that information were pushed there, then didCommitLoad would work. > > > > > > Source/WebKit/chromium/src/WebViewImpl.h:303 > > > + void observeNewPageNavigation(); > > > > observeNewPageNavigation sounds way too much like observeNewNavigation. what do you really mean? > > "observeDifferentDocumentNavigation" might be a more descriptive name. The intent of this change is to initialize the page scale factor to minimum on initial visit of any document without a viewport tag (and never again thereafter). We clear this boolean to false when navigating to a new document as a note that we need to initialize the page scale as soon as we learn the content width. But we don't want to touch the boolean if it's a same-page navigation. Updated patch according to comments above. 534975 9 fishd 2012-01-12 11:04:09 -0800 (In reply to comment #6) > > > Source/WebKit/chromium/src/WebViewImpl.cpp:2696 > > > + m_pageScaleFactorIsSet = false; > > > > you can't just put this code in WebViewImpl::didCommitLoad ? > > didCommitLoad lacks information about whether the navigation went to a different document. If that information were pushed there, then didCommitLoad would work. It seems trivial to add such a boolean. I would do that. See the two callsites in FrameLoaderClientImpl.cpp. Name the boolean isNavigationWithinPage. 536782 10 122688 fsamuel 2012-01-16 15:18:41 -0800 Created attachment 122688 Patch 539629 11 122688 webkit.review.bot 2012-01-20 11:08:53 -0800 Comment on attachment 122688 Patch Clearing flags on attachment: 122688 Committed r105528: <http://trac.webkit.org/changeset/105528> 539630 12 webkit.review.bot 2012-01-20 11:09:07 -0800 All reviewed patches have been landed. Closing bug. 541730 13 fsamuel 2012-01-24 14:53:12 -0800 *** Bug 74155 has been marked as a duplicate of this bug. *** 121157 2012-01-04 14:31:36 -0800 2012-01-04 15:00:02 -0800 Patch bug-75576-20120104173134.patch text/plain 3739 fsamuel U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0MDQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDRiNGRjNGQ2M2ExNTk4N2NhMzY5NGJjMDc1YzdmNWIwMjMxZDM3NTMuLjhhODAxOTRmZjRjNDVi NWJhMzNjOGMxZDg3N2JmYjgxODY0YzA5OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjQgQEAKKzIwMTItMDEtMDQgIEZhZHkgU2FtdWVsICA8ZnNhbXVlbEBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBEbyBub3QgcmVjb21wdXRlIHZpZXdwb3J0IG9u IHNhbWUgcGFnZSBuYXZpZ2F0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD03NTU3NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkZGVkIGEgbmV3IG1ldGhvZCwgV2ViVmlld0ltcGw6Om9ic2VydmVOZXdQ YWdlTmF2aWdhdGlvbi4KKyAgICAgICAgVGhpcyBtZXRob2QgaXMgY2FsbGVkIGlmIHdlIG5hdmln YXRlIHRvIGEgbmV3IHBhZ2UsIGFuZCB3aWxsCisgICAgICAgIG5vdCBiZSBjYWxsZWQgb24gc2Ft ZS1wYWdlIG5hdmlnYXRpb25zLgorCisgICAgICAgIFRoZSBwYWdlIHNjYWxlIGZhY3RvciBmbGFn IGlzIHJlc2V0IHRoZXJlLCBpbnN0ZWFkLiBPbmNlCisgICAgICAgIHJlc2V0LCB2aWV3cG9ydCB3 aWxsIGJlIHJlY29tcHV0ZWQgb24gbGF5b3V0IGNoYW5nZXMuCisKKyAgICAgICAgKiBzcmMvQmFj a0ZvcndhcmRMaXN0Q2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViS2l0OjpCYWNrRm9yd2FyZExp c3RDaHJvbWl1bTo6YWRkSXRlbSk6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6Om9ic2VydmVOZXdOYXZpZ2F0aW9uKToKKyAgICAg ICAgKFdlYktpdDo6V2ViVmlld0ltcGw6Om9ic2VydmVOZXdQYWdlTmF2aWdhdGlvbik6CisgICAg ICAgICogc3JjL1dlYlZpZXdJbXBsLmg6CisKIDIwMTItMDEtMDMgIFZhbmdlbGlzIEtva2tldmlz ICA8dmFuZ2VsaXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gQnlwYXNzIHRo ZSBzaGFkb3cgdGV4dHVyZSBjb3B5IGZvciBhY2NlbGVyYXRlZApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvQmFja0ZvcndhcmRMaXN0Q2hyb21pdW0uY3BwIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvQmFja0ZvcndhcmRMaXN0Q2hyb21pdW0uY3BwCmluZGV4IGJl MmE3MmIyYmEwMTg0ZjgxNzgzNGU4NGU3NGMzM2IwZjUyY2U2YjcuLmU0YTEwODY1MzdjMmIxMDZj YTJhZDYxMzIxYWM1NWQ5MDA0MTkxMmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL0JhY2tGb3J3YXJkTGlzdENocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9CYWNrRm9yd2FyZExpc3RDaHJvbWl1bS5jcHAKQEAgLTU4LDYgKzU4LDEyIEBA IEJhY2tGb3J3YXJkTGlzdENocm9taXVtOjp+QmFja0ZvcndhcmRMaXN0Q2hyb21pdW0oKQogCiB2 b2lkIEJhY2tGb3J3YXJkTGlzdENocm9taXVtOjphZGRJdGVtKFBhc3NSZWZQdHI8SGlzdG9yeUl0 ZW0+IGl0ZW0pCiB7CisKKyAgICBpZiAoKGl0ZW0gJiYgIW1fY3VycmVudEl0ZW0pIHx8IChpdGVt ICYmIG1fY3VycmVudEl0ZW0gJiYgKG1fY3VycmVudEl0ZW0tPnVybCgpLnBhdGgoKSAhPSBpdGVt LT51cmwoKS5wYXRoKCkKKyAgICAgICAgfHwgbV9jdXJyZW50SXRlbS0+dXJsKCkuaG9zdCgpICE9 IGl0ZW0tPnVybCgpLmhvc3QoKQorICAgICAgICB8fCBtX2N1cnJlbnRJdGVtLT51cmwoKS5wcm90 b2NvbCgpICE9IGl0ZW0tPnVybCgpLnByb3RvY29sKCkpKSkKKyAgICAgICAgbV93ZWJWaWV3LT5v YnNlcnZlTmV3UGFnZU5hdmlnYXRpb24oKTsKKwogICAgIG1fY3VycmVudEl0ZW0gPSBpdGVtOwog CiAgICAgLy8gSWYgV2ViQ29yZSBhZGRzIGEgbmV3IEhpc3RvcnlJdGVtLCBpdCBtZWFucyB0aGlz IGlzIGEgbmV3IG5hdmlnYXRpb24gKGllLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi Vmlld0ltcGwuY3BwCmluZGV4IDI0NzUxZTMyOWJjYzk4NGIxMDFjNjY5Zjc1MTExNDcyYjQ5N2Q4 ZDMuLjEyNjE5NmMwYzkxNWIyNWZmNWNkYjMxYzJlZDI0MzM2YTg4YmMyNTYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTI2ODMsMTQgKzI2ODMsMTkg QEAgdm9pZCBXZWJWaWV3SW1wbDo6c3RhcnREcmFnZ2luZyhjb25zdCBXZWJEcmFnRGF0YSYgZHJh Z0RhdGEsCiB2b2lkIFdlYlZpZXdJbXBsOjpvYnNlcnZlTmV3TmF2aWdhdGlvbigpCiB7CiAgICAg bV9vYnNlcnZlZE5ld05hdmlnYXRpb24gPSB0cnVlOwotICAgIC8vIEZJWE1FOiBXZSBuZWVkIHRv IG1ha2Ugc3VyZSB0aGF0IG1fcGFnZVNjYWxlRmFjdG9ySXNTZXQgaXMgbm90IHJlc2V0Ci0gICAg Ly8gb24gc2FtZSBwYWdlIG5hdmlnYXRpb25zLgotICAgIG1fcGFnZVNjYWxlRmFjdG9ySXNTZXQg PSBmYWxzZTsKICNpZm5kZWYgTkRFQlVHCiAgICAgbV9uZXdOYXZpZ2F0aW9uTG9hZGVyID0gbV9w YWdlLT5tYWluRnJhbWUoKS0+bG9hZGVyKCktPmRvY3VtZW50TG9hZGVyKCk7CiAjZW5kaWYKIH0K IAordm9pZCBXZWJWaWV3SW1wbDo6b2JzZXJ2ZU5ld1BhZ2VOYXZpZ2F0aW9uKCkKK3sKKyAgICAv LyBPbmx5IHJlc2V0IHRoaXMgZmxhZyBvbmUgb24gYSBuZXcgcGFnZSBuYXZpZ2F0aW9uLgorICAg IC8vIFJlc2V0aW5nIHRoaXMgZmxhZyB3aWxsIHRyaWdnZXIgcmVjb21wdXRhdGlvbiBvZiB0aGUg dmlld3BvcnQKKyAgICAvLyBhdHRyaWJ1dGVzIGFuZCByZXNldHRpbmcgb2Ygc2NhbGUgYW5kIGZp eGVkIGxheW91dCBzaXplLgorICAgIG1fcGFnZVNjYWxlRmFjdG9ySXNTZXQgPSBmYWxzZTsKK30K Kwogdm9pZCBXZWJWaWV3SW1wbDo6c2V0SWdub3JlSW5wdXRFdmVudHMoYm9vbCBuZXdWYWx1ZSkK IHsKICAgICBBU1NFUlQobV9pZ25vcmVJbnB1dEV2ZW50cyAhPSBuZXdWYWx1ZSk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAppbmRleCA2NjQxMjlkNjZmYzVhYzljOWQw MDlmY2FhYmRiNmY0ZGRlZTFmNzRkLi5jMWY3NzVkZTY5ZTkwNzU0MmViY2U4NDZhNDI1OTE1N2U1 NzAxOTgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1w bC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKQEAgLTMw MCw2ICszMDAsNyBAQCBwdWJsaWM6CiAKICAgICAvLyBIaXN0b3J5IHJlbGF0ZWQgbWV0aG9kczoK ICAgICB2b2lkIG9ic2VydmVOZXdOYXZpZ2F0aW9uKCk7CisgICAgdm9pZCBvYnNlcnZlTmV3UGFn ZU5hdmlnYXRpb24oKTsKIAogICAgIC8vIEV2ZW50IHJlbGF0ZWQgbWV0aG9kczoKICAgICB2b2lk IG1vdXNlTW92ZShjb25zdCBXZWJNb3VzZUV2ZW50Jik7Cg== 121163 2012-01-04 15:00:08 -0800 2012-01-05 14:28:35 -0800 Patch bug-75576-20120104180006.patch text/plain 3624 fsamuel U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0MDQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDRiNGRjNGQ2M2ExNTk4N2NhMzY5NGJjMDc1YzdmNWIwMjMxZDM3NTMuLjhhODAxOTRmZjRjNDVi NWJhMzNjOGMxZDg3N2JmYjgxODY0YzA5OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjQgQEAKKzIwMTItMDEtMDQgIEZhZHkgU2FtdWVsICA8ZnNhbXVlbEBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBEbyBub3QgcmVjb21wdXRlIHZpZXdwb3J0IG9u IHNhbWUgcGFnZSBuYXZpZ2F0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD03NTU3NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkZGVkIGEgbmV3IG1ldGhvZCwgV2ViVmlld0ltcGw6Om9ic2VydmVOZXdQ YWdlTmF2aWdhdGlvbi4KKyAgICAgICAgVGhpcyBtZXRob2QgaXMgY2FsbGVkIGlmIHdlIG5hdmln YXRlIHRvIGEgbmV3IHBhZ2UsIGFuZCB3aWxsCisgICAgICAgIG5vdCBiZSBjYWxsZWQgb24gc2Ft ZS1wYWdlIG5hdmlnYXRpb25zLgorCisgICAgICAgIFRoZSBwYWdlIHNjYWxlIGZhY3RvciBmbGFn IGlzIHJlc2V0IHRoZXJlLCBpbnN0ZWFkLiBPbmNlCisgICAgICAgIHJlc2V0LCB2aWV3cG9ydCB3 aWxsIGJlIHJlY29tcHV0ZWQgb24gbGF5b3V0IGNoYW5nZXMuCisKKyAgICAgICAgKiBzcmMvQmFj a0ZvcndhcmRMaXN0Q2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViS2l0OjpCYWNrRm9yd2FyZExp c3RDaHJvbWl1bTo6YWRkSXRlbSk6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6Om9ic2VydmVOZXdOYXZpZ2F0aW9uKToKKyAgICAg ICAgKFdlYktpdDo6V2ViVmlld0ltcGw6Om9ic2VydmVOZXdQYWdlTmF2aWdhdGlvbik6CisgICAg ICAgICogc3JjL1dlYlZpZXdJbXBsLmg6CisKIDIwMTItMDEtMDMgIFZhbmdlbGlzIEtva2tldmlz ICA8dmFuZ2VsaXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gQnlwYXNzIHRo ZSBzaGFkb3cgdGV4dHVyZSBjb3B5IGZvciBhY2NlbGVyYXRlZApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvQmFja0ZvcndhcmRMaXN0Q2hyb21pdW0uY3BwIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvQmFja0ZvcndhcmRMaXN0Q2hyb21pdW0uY3BwCmluZGV4IGJl MmE3MmIyYmEwMTg0ZjgxNzgzNGU4NGU3NGMzM2IwZjUyY2U2YjcuLjliZDc1Y2NjZmRjNDljNzY4 YjI0MjRjNzMyODI5M2JiZWYzYzE2MjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL0JhY2tGb3J3YXJkTGlzdENocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9CYWNrRm9yd2FyZExpc3RDaHJvbWl1bS5jcHAKQEAgLTU4LDYgKzU4LDEwIEBA IEJhY2tGb3J3YXJkTGlzdENocm9taXVtOjp+QmFja0ZvcndhcmRMaXN0Q2hyb21pdW0oKQogCiB2 b2lkIEJhY2tGb3J3YXJkTGlzdENocm9taXVtOjphZGRJdGVtKFBhc3NSZWZQdHI8SGlzdG9yeUl0 ZW0+IGl0ZW0pCiB7CisKKyAgICBpZiAoKGl0ZW0gJiYgIW1fY3VycmVudEl0ZW0pIHx8IChpdGVt ICYmIG1fY3VycmVudEl0ZW0gJiYgIWVxdWFsSWdub3JpbmdGcmFnbWVudElkZW50aWZpZXIoaXRl bS0+dXJsKCksIG1fY3VycmVudEl0ZW0tPnVybCgpKSkpCisgICAgICAgIG1fd2ViVmlldy0+b2Jz ZXJ2ZU5ld1BhZ2VOYXZpZ2F0aW9uKCk7CisKICAgICBtX2N1cnJlbnRJdGVtID0gaXRlbTsKIAog ICAgIC8vIElmIFdlYkNvcmUgYWRkcyBhIG5ldyBIaXN0b3J5SXRlbSwgaXQgbWVhbnMgdGhpcyBp cyBhIG5ldyBuYXZpZ2F0aW9uIChpZSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL1dlYlZpZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZp ZXdJbXBsLmNwcAppbmRleCAyNDc1MWUzMjliY2M5ODRiMTAxYzY2OWY3NTExMTQ3MmI0OTdkOGQz Li4wMGVlNzgxYjI0ZTU5Mjk0MmYzNzg4ZjE2YjlkYWY4MTJiZjVkZDUyIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKKysrIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCkBAIC0yNjgzLDE0ICsyNjgzLDE5IEBA IHZvaWQgV2ViVmlld0ltcGw6OnN0YXJ0RHJhZ2dpbmcoY29uc3QgV2ViRHJhZ0RhdGEmIGRyYWdE YXRhLAogdm9pZCBXZWJWaWV3SW1wbDo6b2JzZXJ2ZU5ld05hdmlnYXRpb24oKQogewogICAgIG1f b2JzZXJ2ZWROZXdOYXZpZ2F0aW9uID0gdHJ1ZTsKLSAgICAvLyBGSVhNRTogV2UgbmVlZCB0byBt YWtlIHN1cmUgdGhhdCBtX3BhZ2VTY2FsZUZhY3RvcklzU2V0IGlzIG5vdCByZXNldAotICAgIC8v IG9uIHNhbWUgcGFnZSBuYXZpZ2F0aW9ucy4KLSAgICBtX3BhZ2VTY2FsZUZhY3RvcklzU2V0ID0g ZmFsc2U7CiAjaWZuZGVmIE5ERUJVRwogICAgIG1fbmV3TmF2aWdhdGlvbkxvYWRlciA9IG1fcGFn ZS0+bWFpbkZyYW1lKCktPmxvYWRlcigpLT5kb2N1bWVudExvYWRlcigpOwogI2VuZGlmCiB9CiAK K3ZvaWQgV2ViVmlld0ltcGw6Om9ic2VydmVOZXdQYWdlTmF2aWdhdGlvbigpCit7CisgICAgLy8g T25seSByZXNldCB0aGlzIGZsYWcgb25lIG9uIGEgbmV3IHBhZ2UgbmF2aWdhdGlvbi4KKyAgICAv LyBSZXNldHRpbmcgdGhpcyBmbGFnIHdpbGwgdHJpZ2dlciByZWNvbXB1dGF0aW9uIG9mIHRoZSB2 aWV3cG9ydAorICAgIC8vIGF0dHJpYnV0ZXMgYW5kIHJlc2V0dGluZyBvZiBzY2FsZSBhbmQgZml4 ZWQgbGF5b3V0IHNpemUuCisgICAgbV9wYWdlU2NhbGVGYWN0b3JJc1NldCA9IGZhbHNlOworfQor CiB2b2lkIFdlYlZpZXdJbXBsOjpzZXRJZ25vcmVJbnB1dEV2ZW50cyhib29sIG5ld1ZhbHVlKQog ewogICAgIEFTU0VSVChtX2lnbm9yZUlucHV0RXZlbnRzICE9IG5ld1ZhbHVlKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmggYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCmluZGV4IDY2NDEyOWQ2NmZjNWFjOWM5ZDAw OWZjYWFiZGI2ZjRkZGVlMWY3NGQuLmMxZjc3NWRlNjllOTA3NTQyZWJjZTg0NmE0MjU5MTU3ZTU3 MDE5ODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBs LmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaApAQCAtMzAw LDYgKzMwMCw3IEBAIHB1YmxpYzoKIAogICAgIC8vIEhpc3RvcnkgcmVsYXRlZCBtZXRob2RzOgog ICAgIHZvaWQgb2JzZXJ2ZU5ld05hdmlnYXRpb24oKTsKKyAgICB2b2lkIG9ic2VydmVOZXdQYWdl TmF2aWdhdGlvbigpOwogCiAgICAgLy8gRXZlbnQgcmVsYXRlZCBtZXRob2RzOgogICAgIHZvaWQg bW91c2VNb3ZlKGNvbnN0IFdlYk1vdXNlRXZlbnQmKTsK 121330 2012-01-05 14:28:39 -0800 2012-01-16 15:18:36 -0800 Patch bug-75576-20120105172837.patch text/plain 3790 fsamuel U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0MjEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDBlZDA4N2U5N2MxZTU1MjhkNjhjMjRiZjI3OGNhY2RkZjgzYjA4YjMuLjIxYTY0ODM2ZDQ5OWY3 ZTQzNzRlM2Y5MmJkMmExZjc0OTQzM2E0NjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjQgQEAKKzIwMTItMDEtMDUgIEZhZHkgU2FtdWVsICA8ZnNhbXVlbEBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBEbyBub3QgcmVjb21wdXRlIHZpZXdwb3J0IG9u IHNhbWUgcGFnZSBuYXZpZ2F0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD03NTU3NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkZGVkIGEgbmV3IG1ldGhvZCwgV2ViVmlld0ltcGw6Om9ic2VydmVEaWZm ZXJlbnREb2N1bWVudE5hdmlnYXRpb24uCisgICAgICAgIFRoaXMgbWV0aG9kIGlzIGNhbGxlZCBp ZiB3ZSBuYXZpZ2F0ZSB0byBhIG5ldyBwYWdlLCBhbmQgd2lsbAorICAgICAgICBub3QgYmUgY2Fs bGVkIG9uIHNhbWUtcGFnZSBuYXZpZ2F0aW9ucy4KKworICAgICAgICBUaGUgcGFnZSBzY2FsZSBm YWN0b3IgZmxhZyBpcyByZXNldCB0aGVyZSwgaW5zdGVhZC4gT25jZQorICAgICAgICByZXNldCwg dmlld3BvcnQgYW5kIHBhZ2Ugc2NhbGUgd2lsbCBiZSByZWNvbXB1dGVkIG9uIGxheW91dFVwZGF0 ZWQuCisKKyAgICAgICAgKiBzcmMvQmFja0ZvcndhcmRMaXN0Q2hyb21pdW0uY3BwOgorICAgICAg ICAoV2ViS2l0OjpCYWNrRm9yd2FyZExpc3RDaHJvbWl1bTo6YWRkSXRlbSk6CisgICAgICAgICog c3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6Om9ic2Vy dmVOZXdOYXZpZ2F0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6Om9ic2VydmVE aWZmZXJlbnREb2N1bWVudE5hdmlnYXRpb24pOgorICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5o OgorCiAyMDEyLTAxLTA1ICBXLiBKYW1lcyBNYWNMZWFuICA8d2ptYWNsZWFuQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBbY2hyb21pdW1dW2F1cmFdIFdlYkV4dGVybmFsVGV4dHVyZUxheWVySW1w bDo6ZHJhd3NDb250ZW50KCkgcmV0dXJucyBpbmNvcnJlY3QgdmFsdWUsIGNhdXNpbmcgYWNjZWxl cmF0ZWQgY29udGVudCB0byBub3QgZGlzcGxheSBpbiBBdXJhIGRlc2t0b3AKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0JhY2tGb3J3YXJkTGlzdENocm9taXVtLmNwcCBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0JhY2tGb3J3YXJkTGlzdENocm9taXVtLmNwcApp bmRleCBiZTJhNzJiMmJhMDE4NGY4MTc4MzRlODRlNzRjMzNiMGY1MmNlNmI3Li42Njk0NGQ2Yzgz MWFiZGI1ZGFkMTI1ZWY3ZjgwMzk5OWRjODdjNGE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9CYWNrRm9yd2FyZExpc3RDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvQmFja0ZvcndhcmRMaXN0Q2hyb21pdW0uY3BwCkBAIC01OCw2ICs1 OCwxMCBAQCBCYWNrRm9yd2FyZExpc3RDaHJvbWl1bTo6fkJhY2tGb3J3YXJkTGlzdENocm9taXVt KCkKIAogdm9pZCBCYWNrRm9yd2FyZExpc3RDaHJvbWl1bTo6YWRkSXRlbShQYXNzUmVmUHRyPEhp c3RvcnlJdGVtPiBpdGVtKQogeworCisgICAgaWYgKChpdGVtICYmICFtX2N1cnJlbnRJdGVtKSB8 fCAoaXRlbSAmJiBtX2N1cnJlbnRJdGVtICYmIGl0ZW0tPmRvY3VtZW50U2VxdWVuY2VOdW1iZXIo KSAhPSBtX2N1cnJlbnRJdGVtLT5kb2N1bWVudFNlcXVlbmNlTnVtYmVyKCkpKQorICAgICAgICBt X3dlYlZpZXctPm9ic2VydmVEaWZmZXJlbnREb2N1bWVudE5hdmlnYXRpb24oKTsKKwogICAgIG1f Y3VycmVudEl0ZW0gPSBpdGVtOwogCiAgICAgLy8gSWYgV2ViQ29yZSBhZGRzIGEgbmV3IEhpc3Rv cnlJdGVtLCBpdCBtZWFucyB0aGlzIGlzIGEgbmV3IG5hdmlnYXRpb24gKGllLApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCmluZGV4IDA0NTdiYWE4NWIxZmZiNmNl NjNiOGFlOWI3NjJmMjk5ZjM0MjJlZTEuLjk1NDZkODI0MGJmZjI5NzU2YzZkN2FmMGE2OWMzOTI1 NzYxMzEyYjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJ bXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAK QEAgLTI3MDQsMTQgKzI3MDQsMTkgQEAgdm9pZCBXZWJWaWV3SW1wbDo6c3RhcnREcmFnZ2luZyhj b25zdCBXZWJEcmFnRGF0YSYgZHJhZ0RhdGEsCiB2b2lkIFdlYlZpZXdJbXBsOjpvYnNlcnZlTmV3 TmF2aWdhdGlvbigpCiB7CiAgICAgbV9vYnNlcnZlZE5ld05hdmlnYXRpb24gPSB0cnVlOwotICAg IC8vIEZJWE1FOiBXZSBuZWVkIHRvIG1ha2Ugc3VyZSB0aGF0IG1fcGFnZVNjYWxlRmFjdG9ySXNT ZXQgaXMgbm90IHJlc2V0Ci0gICAgLy8gb24gc2FtZSBwYWdlIG5hdmlnYXRpb25zLgotICAgIG1f cGFnZVNjYWxlRmFjdG9ySXNTZXQgPSBmYWxzZTsKICNpZm5kZWYgTkRFQlVHCiAgICAgbV9uZXdO YXZpZ2F0aW9uTG9hZGVyID0gbV9wYWdlLT5tYWluRnJhbWUoKS0+bG9hZGVyKCktPmRvY3VtZW50 TG9hZGVyKCk7CiAjZW5kaWYKIH0KIAordm9pZCBXZWJWaWV3SW1wbDo6b2JzZXJ2ZURpZmZlcmVu dERvY3VtZW50TmF2aWdhdGlvbigpCit7CisgICAgLy8gT25seSByZXNldCB0aGlzIGZsYWcgb24g bmF2aWdhdGlvbiB0byBhIGRpZmZlcmVudCBkb2N1bWVudC4KKyAgICAvLyBSZXNldHRpbmcgdGhp cyBmbGFnIHdpbGwgdHJpZ2dlciByZWNvbXB1dGF0aW9uIG9mIHRoZSB2aWV3cG9ydAorICAgIC8v IGF0dHJpYnV0ZXMgYW5kIHJlc2V0dGluZyBvZiBzY2FsZSBhbmQgZml4ZWQgbGF5b3V0IHNpemUu CisgICAgbV9wYWdlU2NhbGVGYWN0b3JJc1NldCA9IGZhbHNlOworfQorCiB2b2lkIFdlYlZpZXdJ bXBsOjpzZXRJZ25vcmVJbnB1dEV2ZW50cyhib29sIG5ld1ZhbHVlKQogewogICAgIEFTU0VSVCht X2lnbm9yZUlucHV0RXZlbnRzICE9IG5ld1ZhbHVlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJWaWV3SW1wbC5oCmluZGV4IGUyYmU4NzVlMThhMWQ5MmE3YmU4NmFhNDkwNzExZmY4YzZm OTUxMTUuLmFmZGYzODNiMGI5Y2MyMjYyOWRlMDQxZWJiMTY2MGRiOTdmMWZhMWEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKKysrIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaApAQCAtMzAyLDYgKzMwMiw3IEBAIHB1 YmxpYzoKIAogICAgIC8vIEhpc3RvcnkgcmVsYXRlZCBtZXRob2RzOgogICAgIHZvaWQgb2JzZXJ2 ZU5ld05hdmlnYXRpb24oKTsKKyAgICB2b2lkIG9ic2VydmVEaWZmZXJlbnREb2N1bWVudE5hdmln YXRpb24oKTsKIAogICAgIC8vIEV2ZW50IHJlbGF0ZWQgbWV0aG9kczoKICAgICB2b2lkIG1vdXNl TW92ZShjb25zdCBXZWJNb3VzZUV2ZW50Jik7Cg== 122688 2012-01-16 15:18:41 -0800 2012-01-20 11:08:51 -0800 Patch bug-75576-20120116181840.patch text/plain 4490 fsamuel U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1MDYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDM2Y2Y0ZmRkODAxOWRiNmUxNmE0MDNjM2Q2N2IzNDM3OTBlMDY4YjIuLmFlOGZiNjI1YzUyMDVh YjM0MGYxMDAwOGIzOTc0OGU5M2IzMzU4MmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjUgQEAKKzIwMTItMDEtMTYgIEZhZHkgU2FtdWVsICA8ZnNhbXVlbEBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBEbyBub3QgcmVjb21wdXRlIHZpZXdwb3J0IG9u IHNhbWUgcGFnZSBuYXZpZ2F0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD03NTU3NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkZGVkIHBhcmFtZXRlciBpc05hdmlnYXRpb25XaXRoaW5QYWdlIHRvIFdl YlZpZXdJbXBsOjpkaWRDb21taXRMb2FkCisgICAgICAgIHRoYXQgaW5kaWNhdGVzIHdoZXRoZXIg YSBzYW1lLXBhZ2UgbmF2aWdhdGlvbiBoYXMganVzdCBvY2N1cnJlZC4KKworICAgICAgICBUaGUg cGFnZSBzY2FsZSBmYWN0b3IgZmxhZyBpcyByZXNldCBvbmx5IG9uIG5hdmlnYXRpb24gdG8gYSBu ZXcgcGFnZS4KKyAgICAgICAgSWYgdGhlIGZsYWcgaXMgbm90IHNldCwgdmlld3BvcnQgYW5kIHBh Z2Ugc2NhbGUgd2lsbCBiZSByZWNvbXB1dGVkIG9uCisgICAgICAgIGxheW91dFVwZGF0ZWQuCisK KyAgICAgICAgKiBzcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktp dDo6RnJhbWVMb2FkZXJDbGllbnRJbXBsOjpkaXNwYXRjaERpZE5hdmlnYXRlV2l0aGluUGFnZSk6 CisgICAgICAgIChXZWJLaXQ6OkZyYW1lTG9hZGVyQ2xpZW50SW1wbDo6ZGlzcGF0Y2hEaWRDb21t aXRMb2FkKToKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJWaWV3SW1wbDo6ZGlkQ29tbWl0TG9hZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJ bXBsOjpvYnNlcnZlTmV3TmF2aWdhdGlvbik6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmg6 CisKIDIwMTItMDEtMTYgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29t PgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMDUwNDAuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuY3BwIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcAppbmRl eCA3MmU3MWI5NjA4N2RiNjE4ZmVkM2QwMDllZDQ4NDkzZWE2YzVkOTExLi4wZjc2YWM5OWRkMWE2 ZWNlNzBmOWU5Mjk4MDdmNGIyY2JmNjEyNGY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAKQEAgLTY5Miw3ICs2OTIsNyBA QCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50SW1wbDo6ZGlzcGF0Y2hEaWROYXZpZ2F0ZVdpdGhpblBh Z2UoKQogICAgIH0KIAogICAgIGJvb2wgaXNOZXdOYXZpZ2F0aW9uOwotICAgIHdlYlZpZXctPmRp ZENvbW1pdExvYWQoJmlzTmV3TmF2aWdhdGlvbik7CisgICAgd2ViVmlldy0+ZGlkQ29tbWl0TG9h ZCgmaXNOZXdOYXZpZ2F0aW9uLCB0cnVlKTsKICAgICBpZiAobV93ZWJGcmFtZS0+Y2xpZW50KCkp CiAgICAgICAgIG1fd2ViRnJhbWUtPmNsaWVudCgpLT5kaWROYXZpZ2F0ZVdpdGhpblBhZ2UobV93 ZWJGcmFtZSwgaXNOZXdOYXZpZ2F0aW9uKTsKIApAQCAtODA0LDcgKzgwNCw3IEBAIHZvaWQgRnJh bWVMb2FkZXJDbGllbnRJbXBsOjpkaXNwYXRjaERpZENvbW1pdExvYWQoKQogewogICAgIFdlYlZp ZXdJbXBsKiB3ZWJ2aWV3ID0gbV93ZWJGcmFtZS0+dmlld0ltcGwoKTsKICAgICBib29sIGlzTmV3 TmF2aWdhdGlvbjsKLSAgICB3ZWJ2aWV3LT5kaWRDb21taXRMb2FkKCZpc05ld05hdmlnYXRpb24p OworICAgIHdlYnZpZXctPmRpZENvbW1pdExvYWQoJmlzTmV3TmF2aWdhdGlvbiwgZmFsc2UpOwog CiAgICAgaWYgKG1fd2ViRnJhbWUtPmNsaWVudCgpKQogICAgICAgICBtX3dlYkZyYW1lLT5jbGll bnQoKS0+ZGlkQ29tbWl0UHJvdmlzaW9uYWxMb2FkKG1fd2ViRnJhbWUsIGlzTmV3TmF2aWdhdGlv bik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5j cHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKaW5kZXggYTE0 NzQ4MzUzMTk3YjcyNzkzOTcyMDRmYTQ4MGRiYTMzNDA1OTdkNy4uZDczODg5MGI0ZWI4NmU4YjIw Y2JkNjVjZDZhZDRlMDdhZmRiMWQzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViVmlld0ltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YlZpZXdJbXBsLmNwcApAQCAtMjY0OSw3ICsyNjQ5LDcgQEAgdm9pZCBXZWJWaWV3OjpyZW1vdmVB bGxVc2VyQ29udGVudCgpCiAgICAgcGFnZUdyb3VwLT5yZW1vdmVBbGxVc2VyQ29udGVudCgpOwog fQogCi12b2lkIFdlYlZpZXdJbXBsOjpkaWRDb21taXRMb2FkKGJvb2wqIGlzTmV3TmF2aWdhdGlv bikKK3ZvaWQgV2ViVmlld0ltcGw6OmRpZENvbW1pdExvYWQoYm9vbCogaXNOZXdOYXZpZ2F0aW9u LCBib29sIGlzTmF2aWdhdGlvbldpdGhpblBhZ2UpCiB7CiAgICAgaWYgKGlzTmV3TmF2aWdhdGlv bikKICAgICAgICAgKmlzTmV3TmF2aWdhdGlvbiA9IG1fb2JzZXJ2ZWROZXdOYXZpZ2F0aW9uOwpA QCAtMjY2MCw2ICsyNjYwLDggQEAgdm9pZCBXZWJWaWV3SW1wbDo6ZGlkQ29tbWl0TG9hZChib29s KiBpc05ld05hdmlnYXRpb24pCiAgICAgbV9uZXdOYXZpZ2F0aW9uTG9hZGVyID0gMDsKICNlbmRp ZgogICAgIG1fb2JzZXJ2ZWROZXdOYXZpZ2F0aW9uID0gZmFsc2U7CisgICAgaWYgKCFpc05hdmln YXRpb25XaXRoaW5QYWdlKQorICAgICAgICBtX3BhZ2VTY2FsZUZhY3RvcklzU2V0ID0gZmFsc2U7 CiB9CiAKIHZvaWQgV2ViVmlld0ltcGw6OmxheW91dFVwZGF0ZWQoV2ViRnJhbWVJbXBsKiB3ZWJm cmFtZSkKQEAgLTI3NDIsOSArMjc0NCw2IEBAIHZvaWQgV2ViVmlld0ltcGw6OnN0YXJ0RHJhZ2dp bmcoY29uc3QgV2ViRHJhZ0RhdGEmIGRyYWdEYXRhLAogdm9pZCBXZWJWaWV3SW1wbDo6b2JzZXJ2 ZU5ld05hdmlnYXRpb24oKQogewogICAgIG1fb2JzZXJ2ZWROZXdOYXZpZ2F0aW9uID0gdHJ1ZTsK LSAgICAvLyBGSVhNRTogV2UgbmVlZCB0byBtYWtlIHN1cmUgdGhhdCBtX3BhZ2VTY2FsZUZhY3Rv cklzU2V0IGlzIG5vdCByZXNldAotICAgIC8vIG9uIHNhbWUgcGFnZSBuYXZpZ2F0aW9ucy4KLSAg ICBtX3BhZ2VTY2FsZUZhY3RvcklzU2V0ID0gZmFsc2U7CiAjaWZuZGVmIE5ERUJVRwogICAgIG1f bmV3TmF2aWdhdGlvbkxvYWRlciA9IG1fcGFnZS0+bWFpbkZyYW1lKCktPmxvYWRlcigpLT5kb2N1 bWVudExvYWRlcigpOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0lt cGwuaAppbmRleCA2ZWExOTZhNzViYmMzOTlhNDI3MzUzMzFkMWQwZWU5ZWVhMTNiOTE2Li41NmY0 YmFkOTY2ZGJkNzc5YTkwYWRhYWY1M2Q5OTM4MmY0NDMzY2IyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKQEAgLTMzMSw4ICszMzEsOSBAQCBwdWJsaWM6CiAKICAg ICAvLyBOb3RpZmllcyB0aGUgV2ViVmlldyB0aGF0IGEgbG9hZCBoYXMgYmVlbiBjb21taXR0ZWQu IGlzTmV3TmF2aWdhdGlvbgogICAgIC8vIHdpbGwgYmUgdHJ1ZSBpZiBhIG5ldyBzZXNzaW9uIGhp c3RvcnkgaXRlbSBzaG91bGQgYmUgY3JlYXRlZCBmb3IgdGhhdAotICAgIC8vIGxvYWQuCi0gICAg dm9pZCBkaWRDb21taXRMb2FkKGJvb2wqIGlzTmV3TmF2aWdhdGlvbik7CisgICAgLy8gbG9hZC4g aXNOYXZpZ2F0aW9uV2l0aGluUGFnZSB3aWxsIGJlIHRydWUgaWYgdGhlIG5hdmlnYXRpb24gZG9l cworICAgIC8vIG5vdCB0YWtlIHRoZSB1c2VyIGF3YXkgZnJvbSB0aGUgY3VycmVudCBwYWdlLgor ICAgIHZvaWQgZGlkQ29tbWl0TG9hZChib29sKiBpc05ld05hdmlnYXRpb24sIGJvb2wgaXNOYXZp Z2F0aW9uV2l0aGluUGFnZSk7CiAKICAgICAvLyBJbmRpY2F0ZXMgdHdvIHRoaW5nczoKICAgICAv LyAgIDEpIFRoaXMgdmlldyBtYXkgaGF2ZSBhIG5ldyBsYXlvdXQgbm93Lgo=