56340 2011-03-14 15:39:24 -0700 Add WKViewSetScrollOffsetOnNextResize() to C API on Windows 2011-03-14 16:53:05 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P2 Normal --- 1 jeffm jeffm aroben oldest_to_newest 367297 0 jeffm 2011-03-14 15:39:24 -0700 This is the Windows version of bug 53814. 367298 1 jeffm 2011-03-14 15:40:29 -0700 Unlike the Mac, on Windows we just need to be able to set the scroll offset to be applied the next time the view is sized, since we change the size separately. 367307 2 85733 jeffm 2011-03-14 15:49:57 -0700 Created attachment 85733 Patch 367313 3 85733 aroben 2011-03-14 16:02:39 -0700 Comment on attachment 85733 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=85733&action=review The "on next size" terminology is a little confusing. "on next resize" would be slightly clearer. Is there any downside to making the Windows API match the Mac API? > Source/WebKit2/UIProcess/win/WebView.cpp:503 > if (m_page && m_page->drawingArea()) > - m_page->drawingArea()->setSize(IntSize(width, height), IntSize()); > + m_page->drawingArea()->setSize(IntSize(width, height), m_nextSizeScrollOffset); > + > + m_nextSizeScrollOffset = IntSize(); Should we only clear out m_nextSizeScrollOffset when we actually call setSize? > Source/WebKit2/UIProcess/win/WebView.cpp:805 > + ASSERT(m_nextSizeScrollOffset.isZero()); I don't think we can assert this. A WebKit client app could call this API twice in a row without allowing any messages to be processed. 367341 4 jeffm 2011-03-14 16:36:10 -0700 (In reply to comment #3) > (From update of attachment 85733 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=85733&action=review > > The "on next size" terminology is a little confusing. "on next resize" would be slightly clearer. Is there any downside to making the Windows API match the Mac API? I'll change it to use on next resize. I didn't attempt to match the Mac API since the resizing is done inside Safari. > > > Source/WebKit2/UIProcess/win/WebView.cpp:503 > > if (m_page && m_page->drawingArea()) > > - m_page->drawingArea()->setSize(IntSize(width, height), IntSize()); > > + m_page->drawingArea()->setSize(IntSize(width, height), m_nextSizeScrollOffset); > > + > > + m_nextSizeScrollOffset = IntSize(); > > Should we only clear out m_nextSizeScrollOffset when we actually call setSize? Sounds good. > > > Source/WebKit2/UIProcess/win/WebView.cpp:805 > > + ASSERT(m_nextSizeScrollOffset.isZero()); > > I don't think we can assert this. A WebKit client app could call this API twice in a row without allowing any messages to be processed. I will remove the assert. 367345 5 85743 jeffm 2011-03-14 16:43:27 -0700 Created attachment 85743 Patch 367357 6 jeffm 2011-03-14 16:53:05 -0700 Committed r81082: <http://trac.webkit.org/changeset/81082> 85733 2011-03-14 15:49:57 -0700 2011-03-14 16:43:25 -0700 Patch bug-56340-20110314154955.patch text/plain 4572 jeffm SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgxMDcyKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDMtMTQgIEplZmYgTWls bGVyICA8amVmZm1AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZCBXS1ZpZXdTZXRTY3JvbGxPZmZzZXRPbk5leHRTaXplKCkgdG8g QyBBUEkgb24gV2luZG93cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NTYzNDAKKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy93aW4vV0tWaWV3LmNw cDoKKyAgICAgICAgKFdLVmlld1NldFNjcm9sbE9mZnNldE9uTmV4dFNpemUpOiBBZGRlZC4KKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL0Mvd2luL1dLVmlldy5oOiBBZGRlZCBXS1ZpZXdTZXRTY3Jv bGxPZmZzZXRPbk5leHRTaXplKCkuCisgICAgICAgICogVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlldzo6b25TaXplRXZlbnQpOiBBcHBseSBhbnkgc2Ny b2xsIG9mZnNldCB3aGVuIHNldHRpbmcgdGhlIGRyYXdpbmcgYXJlYSBzaXplLgorICAgICAgICAo V2ViS2l0OjpXZWJWaWV3OjpzZXRTY3JvbGxPZmZzZXRPbk5leHRTaXplKTogQWRkZWQuCisgICAg ICAgICogVUlQcm9jZXNzL3dpbi9XZWJWaWV3Lmg6IEFkZGVkIHNldFNjcm9sbE9mZnNldE9uTmV4 dFNpemUoKS4KKwogMjAxMS0wMy0xNCAgQnJpYW4gV2VpbnN0ZWluICA8YndlaW5zdGVpbkBhcHBs ZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBSb2JlbiBhbmQgR2F2aW4gQmFycmFj bG91Z2guCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Mvd2luL1dLVmlldy5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL3dpbi9XS1Zp ZXcuY3BwCShyZXZpc2lvbiA4MTAyNCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Qy93aW4vV0tWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzIsNiArNzIsMTEgQEAgdm9pZCBX S1ZpZXdTZXRJbml0aWFsRm9jdXMoV0tWaWV3UmVmIHZpZQogICAgIHRvSW1wbCh2aWV3UmVmKS0+ c2V0SW5pdGlhbEZvY3VzKGZvcndhcmQpOwogfQogCit2b2lkIFdLVmlld1NldFNjcm9sbE9mZnNl dE9uTmV4dFNpemUoV0tWaWV3UmVmIHZpZXdSZWYsIFdLU2l6ZSBzY3JvbGxPZmZzZXQpCit7Cisg ICAgdG9JbXBsKHZpZXdSZWYpLT5zZXRTY3JvbGxPZmZzZXRPbk5leHRTaXplKHRvSW50U2l6ZShz Y3JvbGxPZmZzZXQpKTsKK30KKwogdm9pZCBXS1ZpZXdTZXRGaW5kSW5kaWNhdG9yQ2FsbGJhY2so V0tWaWV3UmVmIHZpZXdSZWYsIFdLVmlld0ZpbmRJbmRpY2F0b3JDYWxsYmFjayBjYWxsYmFjaywg dm9pZCogY29udGV4dCkKIHsKICAgICB0b0ltcGwodmlld1JlZiktPnNldEZpbmRJbmRpY2F0b3JD YWxsYmFjayhjYWxsYmFjaywgY29udGV4dCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0Mvd2luL1dLVmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvQy93aW4vV0tWaWV3LmgJKHJldmlzaW9uIDgxMDI0KQorKysgU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL3dpbi9XS1ZpZXcuaAkod29ya2luZyBjb3B5KQpAQCAtMjcsNiAr MjcsNyBAQAogI2RlZmluZSBXS1ZpZXdfaAogCiAjaW5jbHVkZSA8V2ViS2l0Mi9XS0Jhc2UuaD4K KyNpbmNsdWRlIDxXZWJLaXQyL1dLR2VvbWV0cnkuaD4KICNpbmNsdWRlIDx3aW5kb3dzLmg+CiAK ICNpZmRlZiBfX2NwbHVzcGx1cwpAQCAtNjcsNiArNjgsNyBAQCBXS19FWFBPUlQgdm9pZCBXS1Zp ZXdTZXRQYXJlbnRXaW5kb3coV0tWCiBXS19FWFBPUlQgdm9pZCBXS1ZpZXdXaW5kb3dBbmNlc3Ry eURpZENoYW5nZShXS1ZpZXdSZWYgdmlldyk7CiBXS19FWFBPUlQgdm9pZCBXS1ZpZXdTZXRJc0lu V2luZG93KFdLVmlld1JlZiB2aWV3LCBib29sIGlzSW5XaW5kb3cpOwogV0tfRVhQT1JUIHZvaWQg V0tWaWV3U2V0SW5pdGlhbEZvY3VzKFdLVmlld1JlZiB2aWV3LCBib29sIGZvcndhcmQpOworV0tf RVhQT1JUIHZvaWQgV0tWaWV3U2V0U2Nyb2xsT2Zmc2V0T25OZXh0U2l6ZShXS1ZpZXdSZWYgdmll dywgV0tTaXplIHNjcm9sbE9mZnNldCk7CiAKIHR5cGVkZWYgdm9pZCAoKldLVmlld0ZpbmRJbmRp Y2F0b3JDYWxsYmFjaykoV0tWaWV3UmVmLCBIQklUTUFQIHNlbGVjdGlvbkJpdG1hcCwgUkVDVCBz ZWxlY3Rpb25SZWN0SW5XaW5kb3dDb29yZGluYXRlcywgYm9vbCBmYWRlb3V0LCB2b2lkKik7CiBX S19FWFBPUlQgdm9pZCBXS1ZpZXdTZXRGaW5kSW5kaWNhdG9yQ2FsbGJhY2soV0tWaWV3UmVmIHZp ZXcsIFdLVmlld0ZpbmRJbmRpY2F0b3JDYWxsYmFjayBjYWxsYmFjaywgdm9pZCogY29udGV4dCk7 CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHAJKHJldmlzaW9u IDgxMDI0KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcAkod29y a2luZyBjb3B5KQpAQCAtNDk4LDcgKzQ5OCw5IEBAIExSRVNVTFQgV2ViVmlldzo6b25TaXplRXZl bnQoSFdORCwgVUlOVCwKICAgICBpbnQgaGVpZ2h0ID0gSElXT1JEKGxQYXJhbSk7CiAKICAgICBp ZiAobV9wYWdlICYmIG1fcGFnZS0+ZHJhd2luZ0FyZWEoKSkKLSAgICAgICAgbV9wYWdlLT5kcmF3 aW5nQXJlYSgpLT5zZXRTaXplKEludFNpemUod2lkdGgsIGhlaWdodCksIEludFNpemUoKSk7Cisg ICAgICAgIG1fcGFnZS0+ZHJhd2luZ0FyZWEoKS0+c2V0U2l6ZShJbnRTaXplKHdpZHRoLCBoZWln aHQpLCBtX25leHRTaXplU2Nyb2xsT2Zmc2V0KTsKKyAgICAKKyAgICBtX25leHRTaXplU2Nyb2xs T2Zmc2V0ID0gSW50U2l6ZSgpOwogCiAgICAgaGFuZGxlZCA9IHRydWU7CiAgICAgcmV0dXJuIDA7 CkBAIC03OTcsNiArNzk5LDEzIEBAIHZvaWQgV2ViVmlldzo6c2V0SW5pdGlhbEZvY3VzKGJvb2wg Zm9yd2EKICAgICBtX3BhZ2UtPnNldEluaXRpYWxGb2N1cyhmb3J3YXJkKTsKIH0KIAordm9pZCBX ZWJWaWV3OjpzZXRTY3JvbGxPZmZzZXRPbk5leHRTaXplKGNvbnN0IEludFNpemUmIHNjcm9sbE9m ZnNldCkKK3sKKyAgICAvLyBUaGUgbmV4dCB0aW1lIHdlIGdldCBhIFdNX1NJWkUgbWVzc2FnZSwg c2Nyb2xsIGJ5IHRoZSBzcGVjaWZpZWQgYW1vdW50IGluIG9uU2l6ZUV2ZW50KCkuCisgICAgQVNT RVJUKG1fbmV4dFNpemVTY3JvbGxPZmZzZXQuaXNaZXJvKCkpOworICAgIG1fbmV4dFNpemVTY3Jv bGxPZmZzZXQgPSBzY3JvbGxPZmZzZXQ7Cit9CisKIHZvaWQgV2ViVmlldzo6c2V0Vmlld3BvcnRB cmd1bWVudHMoY29uc3QgV2ViQ29yZTo6Vmlld3BvcnRBcmd1bWVudHMmKQogewogfQpJbmRleDog U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmgJKHJldmlzaW9uIDgxMDI0KQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmgJKHdvcmtpbmcgY29weSkKQEAg LTYyLDYgKzYyLDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0SXNJbldpbmRvdyhib29sKTsKICAg ICB2b2lkIHNldE92ZXJyaWRlQ3Vyc29yKEhDVVJTT1IpOwogICAgIHZvaWQgc2V0SW5pdGlhbEZv Y3VzKGJvb2wgZm9yd2FyZCk7CisgICAgdm9pZCBzZXRTY3JvbGxPZmZzZXRPbk5leHRTaXplKGNv bnN0IFdlYkNvcmU6OkludFNpemUmKTsKICAgICB2b2lkIHNldEZpbmRJbmRpY2F0b3JDYWxsYmFj ayhXS1ZpZXdGaW5kSW5kaWNhdG9yQ2FsbGJhY2ssIHZvaWQqKTsKICAgICBXS1ZpZXdGaW5kSW5k aWNhdG9yQ2FsbGJhY2sgZ2V0RmluZEluZGljYXRvckNhbGxiYWNrKHZvaWQqKik7CiAgICAgdm9p ZCBpbml0aWFsaXplKCk7CkBAIC0xODQsNiArMTg1LDggQEAgcHJpdmF0ZToKICAgICBIV05EIG1f d2luZG93OwogICAgIEhXTkQgbV90b3BMZXZlbFBhcmVudFdpbmRvdzsKICAgICBIV05EIG1fdG9v bFRpcFdpbmRvdzsKKyAgICAKKyAgICBXZWJDb3JlOjpJbnRTaXplIG1fbmV4dFNpemVTY3JvbGxP ZmZzZXQ7CiAKICAgICBIQ1VSU09SIG1fbGFzdEN1cnNvclNldDsKICAgICBIQ1VSU09SIG1fd2Vi Q29yZUN1cnNvcjsK 85743 2011-03-14 16:43:27 -0700 2011-03-14 16:51:11 -0700 Patch bug-56340-20110314164325.patch text/plain 4637 jeffm SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgxMDcyKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDMtMTQgIEplZmYgTWls bGVyICA8amVmZm1AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZCBXS1ZpZXdTZXRTY3JvbGxPZmZzZXRPbk5leHRSZXNpemUoKSB0 byBDIEFQSSBvbiBXaW5kb3dzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD01NjM0MAorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL3dpbi9XS1ZpZXcu Y3BwOgorICAgICAgICAoV0tWaWV3U2V0U2Nyb2xsT2Zmc2V0T25OZXh0UmVzaXplKTogQWRkZWQu CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL3dpbi9XS1ZpZXcuaDogQWRkZWQgV0tWaWV3U2V0 U2Nyb2xsT2Zmc2V0T25OZXh0UmVzaXplKCkuCisgICAgICAgICogVUlQcm9jZXNzL3dpbi9XZWJW aWV3LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlldzo6b25TaXplRXZlbnQpOiBBcHBseSBh bnkgc2Nyb2xsIG9mZnNldCB3aGVuIHNldHRpbmcgdGhlIGRyYXdpbmcgYXJlYSBzaXplLgorICAg ICAgICAoV2ViS2l0OjpXZWJWaWV3OjpzZXRTY3JvbGxPZmZzZXRPbk5leHRSZXNpemUpOiBBZGRl ZC4KKyAgICAgICAgKiBVSVByb2Nlc3Mvd2luL1dlYlZpZXcuaDogQWRkZWQgc2V0U2Nyb2xsT2Zm c2V0T25OZXh0UmVzaXplKCkuCisKIDIwMTEtMDMtMTQgIEJyaWFuIFdlaW5zdGVpbiAgPGJ3ZWlu c3RlaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gUm9iZW4gYW5kIEdh dmluIEJhcnJhY2xvdWdoLgpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL3dp bi9XS1ZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Qy93aW4vV0tWaWV3LmNwcAkocmV2aXNpb24gODEwMjQpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0Mvd2luL1dLVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcyLDYgKzcyLDEx IEBAIHZvaWQgV0tWaWV3U2V0SW5pdGlhbEZvY3VzKFdLVmlld1JlZiB2aWUKICAgICB0b0ltcGwo dmlld1JlZiktPnNldEluaXRpYWxGb2N1cyhmb3J3YXJkKTsKIH0KIAordm9pZCBXS1ZpZXdTZXRT Y3JvbGxPZmZzZXRPbk5leHRSZXNpemUoV0tWaWV3UmVmIHZpZXdSZWYsIFdLU2l6ZSBzY3JvbGxP ZmZzZXQpCit7CisgICAgdG9JbXBsKHZpZXdSZWYpLT5zZXRTY3JvbGxPZmZzZXRPbk5leHRSZXNp emUodG9JbnRTaXplKHNjcm9sbE9mZnNldCkpOworfQorCiB2b2lkIFdLVmlld1NldEZpbmRJbmRp Y2F0b3JDYWxsYmFjayhXS1ZpZXdSZWYgdmlld1JlZiwgV0tWaWV3RmluZEluZGljYXRvckNhbGxi YWNrIGNhbGxiYWNrLCB2b2lkKiBjb250ZXh0KQogewogICAgIHRvSW1wbCh2aWV3UmVmKS0+c2V0 RmluZEluZGljYXRvckNhbGxiYWNrKGNhbGxiYWNrLCBjb250ZXh0KTsKSW5kZXg6IFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy93aW4vV0tWaWV3LmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL3dpbi9XS1ZpZXcuaAkocmV2aXNpb24gODEwMjQpCisr KyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Mvd2luL1dLVmlldy5oCSh3b3JraW5nIGNv cHkpCkBAIC0yNyw2ICsyNyw3IEBACiAjZGVmaW5lIFdLVmlld19oCiAKICNpbmNsdWRlIDxXZWJL aXQyL1dLQmFzZS5oPgorI2luY2x1ZGUgPFdlYktpdDIvV0tHZW9tZXRyeS5oPgogI2luY2x1ZGUg PHdpbmRvd3MuaD4KIAogI2lmZGVmIF9fY3BsdXNwbHVzCkBAIC02Nyw2ICs2OCw3IEBAIFdLX0VY UE9SVCB2b2lkIFdLVmlld1NldFBhcmVudFdpbmRvdyhXS1YKIFdLX0VYUE9SVCB2b2lkIFdLVmll d1dpbmRvd0FuY2VzdHJ5RGlkQ2hhbmdlKFdLVmlld1JlZiB2aWV3KTsKIFdLX0VYUE9SVCB2b2lk IFdLVmlld1NldElzSW5XaW5kb3coV0tWaWV3UmVmIHZpZXcsIGJvb2wgaXNJbldpbmRvdyk7CiBX S19FWFBPUlQgdm9pZCBXS1ZpZXdTZXRJbml0aWFsRm9jdXMoV0tWaWV3UmVmIHZpZXcsIGJvb2wg Zm9yd2FyZCk7CitXS19FWFBPUlQgdm9pZCBXS1ZpZXdTZXRTY3JvbGxPZmZzZXRPbk5leHRSZXNp emUoV0tWaWV3UmVmIHZpZXcsIFdLU2l6ZSBzY3JvbGxPZmZzZXQpOwogCiB0eXBlZGVmIHZvaWQg KCpXS1ZpZXdGaW5kSW5kaWNhdG9yQ2FsbGJhY2spKFdLVmlld1JlZiwgSEJJVE1BUCBzZWxlY3Rp b25CaXRtYXAsIFJFQ1Qgc2VsZWN0aW9uUmVjdEluV2luZG93Q29vcmRpbmF0ZXMsIGJvb2wgZmFk ZW91dCwgdm9pZCopOwogV0tfRVhQT1JUIHZvaWQgV0tWaWV3U2V0RmluZEluZGljYXRvckNhbGxi YWNrKFdLVmlld1JlZiB2aWV3LCBXS1ZpZXdGaW5kSW5kaWNhdG9yQ2FsbGJhY2sgY2FsbGJhY2ss IHZvaWQqIGNvbnRleHQpOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJW aWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZp ZXcuY3BwCShyZXZpc2lvbiA4MTAyNCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4v V2ViVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ5Nyw4ICs0OTcsMTAgQEAgTFJFU1VMVCBX ZWJWaWV3OjpvblNpemVFdmVudChIV05ELCBVSU5ULAogICAgIGludCB3aWR0aCA9IExPV09SRChs UGFyYW0pOwogICAgIGludCBoZWlnaHQgPSBISVdPUkQobFBhcmFtKTsKIAotICAgIGlmIChtX3Bh Z2UgJiYgbV9wYWdlLT5kcmF3aW5nQXJlYSgpKQotICAgICAgICBtX3BhZ2UtPmRyYXdpbmdBcmVh KCktPnNldFNpemUoSW50U2l6ZSh3aWR0aCwgaGVpZ2h0KSwgSW50U2l6ZSgpKTsKKyAgICBpZiAo bV9wYWdlICYmIG1fcGFnZS0+ZHJhd2luZ0FyZWEoKSkgeworICAgICAgICBtX3BhZ2UtPmRyYXdp bmdBcmVhKCktPnNldFNpemUoSW50U2l6ZSh3aWR0aCwgaGVpZ2h0KSwgbV9uZXh0UmVzaXplU2Ny b2xsT2Zmc2V0KTsKKyAgICAgICAgbV9uZXh0UmVzaXplU2Nyb2xsT2Zmc2V0ID0gSW50U2l6ZSgp OworICAgIH0KIAogICAgIGhhbmRsZWQgPSB0cnVlOwogICAgIHJldHVybiAwOwpAQCAtNzk3LDYg Kzc5OSwxMiBAQCB2b2lkIFdlYlZpZXc6OnNldEluaXRpYWxGb2N1cyhib29sIGZvcndhCiAgICAg bV9wYWdlLT5zZXRJbml0aWFsRm9jdXMoZm9yd2FyZCk7CiB9CiAKK3ZvaWQgV2ViVmlldzo6c2V0 U2Nyb2xsT2Zmc2V0T25OZXh0UmVzaXplKGNvbnN0IEludFNpemUmIHNjcm9sbE9mZnNldCkKK3sK KyAgICAvLyBUaGUgbmV4dCB0aW1lIHdlIGdldCBhIFdNX1NJWkUgbWVzc2FnZSwgc2Nyb2xsIGJ5 IHRoZSBzcGVjaWZpZWQgYW1vdW50IGluIG9uU2l6ZUV2ZW50KCkuCisgICAgbV9uZXh0UmVzaXpl U2Nyb2xsT2Zmc2V0ID0gc2Nyb2xsT2Zmc2V0OworfQorCiB2b2lkIFdlYlZpZXc6OnNldFZpZXdw b3J0QXJndW1lbnRzKGNvbnN0IFdlYkNvcmU6OlZpZXdwb3J0QXJndW1lbnRzJikKIHsKIH0KSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5oCShyZXZpc2lvbiA4MTAyNCkK KysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5oCSh3b3JraW5nIGNvcHkp CkBAIC02Miw2ICs2Miw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldElzSW5XaW5kb3coYm9vbCk7 CiAgICAgdm9pZCBzZXRPdmVycmlkZUN1cnNvcihIQ1VSU09SKTsKICAgICB2b2lkIHNldEluaXRp YWxGb2N1cyhib29sIGZvcndhcmQpOworICAgIHZvaWQgc2V0U2Nyb2xsT2Zmc2V0T25OZXh0UmVz aXplKGNvbnN0IFdlYkNvcmU6OkludFNpemUmKTsKICAgICB2b2lkIHNldEZpbmRJbmRpY2F0b3JD YWxsYmFjayhXS1ZpZXdGaW5kSW5kaWNhdG9yQ2FsbGJhY2ssIHZvaWQqKTsKICAgICBXS1ZpZXdG aW5kSW5kaWNhdG9yQ2FsbGJhY2sgZ2V0RmluZEluZGljYXRvckNhbGxiYWNrKHZvaWQqKik7CiAg ICAgdm9pZCBpbml0aWFsaXplKCk7CkBAIC0xODQsNiArMTg1LDggQEAgcHJpdmF0ZToKICAgICBI V05EIG1fd2luZG93OwogICAgIEhXTkQgbV90b3BMZXZlbFBhcmVudFdpbmRvdzsKICAgICBIV05E IG1fdG9vbFRpcFdpbmRvdzsKKyAgICAKKyAgICBXZWJDb3JlOjpJbnRTaXplIG1fbmV4dFJlc2l6 ZVNjcm9sbE9mZnNldDsKIAogICAgIEhDVVJTT1IgbV9sYXN0Q3Vyc29yU2V0OwogICAgIEhDVVJT T1IgbV93ZWJDb3JlQ3Vyc29yOwo=