64541 2011-07-14 10:39:06 -0700 [Qt] Consider the scale of the page view when scrolling QTouchWebView. 2011-07-18 06:48:56 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jturcotte jturcotte benjamin oldest_to_newest 437183 0 jturcotte 2011-07-14 10:39:06 -0700 [Qt] Consider the scale of the page view when scrolling QTouchWebView. 437186 1 100829 jturcotte 2011-07-14 10:42:18 -0700 Created attachment 100829 Patch 437767 2 100829 benjamin 2011-07-15 08:42:52 -0700 Comment on attachment 100829 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=100829&action=review > Source/WebKit2/UIProcess/API/qt/qtouchwebview.cpp:42 > + pageView->moveBy(deltaX * pageView->scale(), deltaY * pageView->scale()); I think TouchViewInterface::panGestureRequestScroll() should use m_viewportView->mapFromItem() and send the coordinate in the right space to the viewport. QTouchWebViewPrivate::scroll(qreal deltaX, qreal deltaY) should be in viewport coordinate. 437791 3 100993 jturcotte 2011-07-15 09:25:52 -0700 Created attachment 100993 Patch Use item mapping functions instead. 437792 4 jturcotte 2011-07-15 09:31:49 -0700 (In reply to comment #2) > I think TouchViewInterface::panGestureRequestScroll() should use m_viewportView->mapFromItem() and send the coordinate in the right space to the viewport. > > QTouchWebViewPrivate::scroll(qreal deltaX, qreal deltaY) should be in viewport coordinate. Humm didn't see your comment, since the method is on the viewport it would make sense to give it viewport coordinates. Cooking a new patch. 437818 5 101001 jturcotte 2011-07-15 10:19:03 -0700 Created attachment 101001 Patch Move the mapping to TouchViewInterface 437826 6 101001 benjamin 2011-07-15 10:35:13 -0700 Comment on attachment 101001 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=101001&action=review > Source/WebKit2/UIProcess/qt/TouchViewInterface.cpp:51 > + // This assumes that m_viewportView's and m_pageView parent's coordinate systems match. > + QPointF destInViewportCoords = m_pageView->mapToParent(m_pageView->mapFromParent(m_pageView->pos()) + QPointF(deltaX, deltaY)); > + QPointF offsetInViewportCoords = destInViewportCoords - m_pageView->pos(); I don't understand why you do all this. Isn't it QPointF destInViewportCoords = m_viewportView->mapFromItem(m_pageView, QPointF(deltaX, deltaY)); ? The 2 delta is like a vector, you can just multiply it by the combined transformation matrix of a subtree to get the transformed vector. Or am I missing something? 437837 7 jturcotte 2011-07-15 11:10:17 -0700 (In reply to comment #6) > I don't understand why you do all this. > Isn't it > QPointF destInViewportCoords = m_viewportView->mapFromItem(m_pageView, QPointF(deltaX, deltaY)); ? > > The 2 delta is like a vector, you can just multiply it by the combined transformation matrix of a subtree to get the transformed vector. Or am I missing something? I tried but it's not enough when there is also a translation transform. i.e. a (1,2) delta is mapped to (11,12) if there is a (10,10) translation on top. 437844 8 101001 benjamin 2011-07-15 11:19:21 -0700 Comment on attachment 101001 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=101001&action=review Isn't m_pageView->mapFromParent(m_pageView->pos()) always gonna be zero though? In page view coordinate, its own position would be the top left corner. > Source/WebKit2/UIProcess/qt/TouchViewInterface.cpp:49 > + // This assumes that m_viewportView's and m_pageView parent's coordinate systems match. Personnally I would remove that comment and remove the assumption by using mapFromItem instead of mapFromParent :) 437998 9 jturcotte 2011-07-15 14:49:57 -0700 (In reply to comment #8) > (From update of attachment 101001 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=101001&action=review > > Isn't m_pageView->mapFromParent(m_pageView->pos()) always gonna be zero though? > In page view coordinate, its own position would be the top left corner. > That's a good point, and along that your code seems right in comment 6, but what you get is a vector from the viewport's origin toward the applied vector on the page view's origin. I didn't realize that this is the final destination in viewport coordinate and was trying to apply it as a vector again by sending it as the delta values. > > Source/WebKit2/UIProcess/qt/TouchViewInterface.cpp:49 > > + // This assumes that m_viewportView's and m_pageView parent's coordinate systems match. > > Personnally I would remove that comment and remove the assumption by using mapFromItem instead of mapFromParent :) That sounds like a good idea too, would also help fixing my assumptions instead of spreading them around :) 438409 10 101149 jturcotte 2011-07-18 05:21:28 -0700 Created attachment 101149 Patch New patch using mapFromItem instead of mapToParent. I tried assuming that mapFromParent(pos()) and remove the call, but the assumption wouldn't hold when scaling the item, event though the documentation says it should (it might not help that we set a different transform origin on that item.). 438411 11 101149 benjamin 2011-07-18 05:24:46 -0700 Comment on attachment 101149 Patch Great. 438441 12 jturcotte 2011-07-18 06:48:56 -0700 Committed r91183: <http://trac.webkit.org/changeset/91183> 100829 2011-07-14 10:42:18 -0700 2011-07-15 09:25:46 -0700 Patch bug-64541-20110714194217.patch text/plain 1498 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogOTA4OTkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBjYzI1YWFjMTNlMzNhYzE3 ZDUwMzhkZjhmNzk2ZDNjYjYwNzMzZGI2Li41Yzc3YzdhMzA5NzgwN2MwYjFmMzUwMGMzN2NlMmU1 M2YzZGFkNjQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDctMTQgIEpvY2Vs eW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lhLmNvbT4KKworICAgICAgICBbUXRd IENvbnNpZGVyIHRoZSBzY2FsZSBvZiB0aGUgcGFnZSB2aWV3IHdoZW4gc2Nyb2xsaW5nIFFUb3Vj aFdlYlZpZXcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02NDU0MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFNjcm9sbCBkZWx0YXMgYXJlIHJlY2VpdmVkIGluIHBhZ2UgY29vcmRpbmF0ZXMsIHdoaWxlIG1v dmVCeSBpcyBwZXJmb3JtZWQKKyAgICAgICAgaW4gdGhlIGl0ZW0ncyBwYXJlbnQgY29vcmRpbmF0 ZXMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnZpZXcuY3BwOgorICAg ICAgICAoUVRvdWNoV2ViVmlld1ByaXZhdGU6OnNjcm9sbCk6CisKIDIwMTEtMDctMTIgIEpvY2Vs eW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lhLmNvbT4KIAogICAgICAgICBbUXRd IEFsc28gc3RvcCB0aGUgc2NhbGUgY29tbWl0IHRpbWVyIHdoZW4gY29tbWl0U2NhbGVDaGFuZ2Ug aXMgY2FsbGVkIGV4cGxpY2l0bHkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL3F0L3F0b3VjaHdlYnZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9xdC9xdG91Y2h3ZWJ2aWV3LmNwcAppbmRleCA3NTk2NWQ3NWM3YzY5ODVlYTJlYzZjM2ZmNmFj N2Q1NGQ5NGMzYTM4Li4wYjhiZDk4ZGRmYjI4ZGJkYjJjMzVhMGUzNjY3ZmI2YzkyN2U1ZmUyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnZpZXcu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRvdWNod2Vidmlldy5j cHAKQEAgLTM5LDcgKzM5LDcgQEAgUVRvdWNoV2ViVmlld1ByaXZhdGU6OlFUb3VjaFdlYlZpZXdQ cml2YXRlKFFUb3VjaFdlYlZpZXcqIHEpCiAKIHZvaWQgUVRvdWNoV2ViVmlld1ByaXZhdGU6OnNj cm9sbChxcmVhbCBkZWx0YVgsIHFyZWFsIGRlbHRhWSkKIHsKLSAgICBwYWdlVmlldy0+bW92ZUJ5 KGRlbHRhWCwgZGVsdGFZKTsKKyAgICBwYWdlVmlldy0+bW92ZUJ5KGRlbHRhWCAqIHBhZ2VWaWV3 LT5zY2FsZSgpLCBkZWx0YVkgKiBwYWdlVmlldy0+c2NhbGUoKSk7CiAgICAgdmlld3BvcnRSZWN0 VXBkYXRlZCgpOwogfQogCg== 100993 2011-07-15 09:25:52 -0700 2011-07-15 09:33:40 -0700 Patch bug-64541-20110715182550.patch text/plain 1525 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogOTA4OTkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBjYzI1YWFjMTNlMzNhYzE3 ZDUwMzhkZjhmNzk2ZDNjYjYwNzMzZGI2Li5kM2RkZjEwM2ZhZjJjMzMwZDUzMDU0MGVjYWQzODg0 ZDIyYjQ4MDVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDctMTQgIEpvY2Vs eW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lhLmNvbT4KKworICAgICAgICBbUXRd IENvbnNpZGVyIHRoZSBpdGVtIHRyYW5zZm9ybSB3aGVuIHNjcm9sbGluZyBRVG91Y2hXZWJWaWV3 LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjQ1NDEK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTY3JvbGwg ZGVsdGFzIGFyZSByZWNlaXZlZCBpbiBwYWdlIGNvb3JkaW5hdGVzLCB3aGlsZSBtb3ZlQnkgaXMg cGVyZm9ybWVkCisgICAgICAgIGluIHRoZSBpdGVtJ3MgcGFyZW50IGNvb3JkaW5hdGVzLgorCisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKFFU b3VjaFdlYlZpZXdQcml2YXRlOjpzY3JvbGwpOgorCiAyMDExLTA3LTEyICBKb2NlbHluIFR1cmNv dHRlICA8am9jZWx5bi50dXJjb3R0ZUBub2tpYS5jb20+CiAKICAgICAgICAgW1F0XSBBbHNvIHN0 b3AgdGhlIHNjYWxlIGNvbW1pdCB0aW1lciB3aGVuIGNvbW1pdFNjYWxlQ2hhbmdlIGlzIGNhbGxl ZCBleHBsaWNpdGx5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9x dC9xdG91Y2h3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXRv dWNod2Vidmlldy5jcHAKaW5kZXggNzU5NjVkNzVjN2M2OTg1ZWEyZWM2YzNmZjZhYzdkNTRkOTRj M2EzOC4uMGM0ZDAzMTMwZGYzZGNiY2E5MjRiNzk5YzNjMGUyNzQ3YWY0NmY4MiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xdG91Y2h3ZWJ2aWV3LmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F0b3VjaHdlYnZpZXcuY3BwCkBAIC0z OSw3ICszOSw3IEBAIFFUb3VjaFdlYlZpZXdQcml2YXRlOjpRVG91Y2hXZWJWaWV3UHJpdmF0ZShR VG91Y2hXZWJWaWV3KiBxKQogCiB2b2lkIFFUb3VjaFdlYlZpZXdQcml2YXRlOjpzY3JvbGwocXJl YWwgZGVsdGFYLCBxcmVhbCBkZWx0YVkpCiB7Ci0gICAgcGFnZVZpZXctPm1vdmVCeShkZWx0YVgs IGRlbHRhWSk7CisgICAgcGFnZVZpZXctPnNldFBvcyhwYWdlVmlldy0+bWFwVG9QYXJlbnQocGFn ZVZpZXctPm1hcEZyb21QYXJlbnQocGFnZVZpZXctPnBvcygpKSArIFFQb2ludEYoZGVsdGFYLCBk ZWx0YVkpKSk7CiAgICAgdmlld3BvcnRSZWN0VXBkYXRlZCgpOwogfQogCg== 101001 2011-07-15 10:19:03 -0700 2011-07-18 05:21:21 -0700 Patch bug-64541-20110715191901.patch text/plain 2021 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogOTA4OTkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBjYzI1YWFjMTNlMzNhYzE3 ZDUwMzhkZjhmNzk2ZDNjYjYwNzMzZGI2Li41OWEwOTRkODU4MjAxMTc5N2VmODlhODY3YzQ0YWFi ZjExOWE4OWRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDctMTUgIEpvY2Vs eW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lhLmNvbT4KKworICAgICAgICBbUXRd IENvbnNpZGVyIFFUb3VjaFdlYlBhZ2UncyB0cmFuc2Zvcm0gd2hlbiBzY3JvbGxpbmcgdGhlIHZp ZXdwb3J0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NjQ1NDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBD dXJyZW50bHkgdGhlIHNjcm9sbCBkZWx0YSBhcmUgZ2l2ZW4gdG8gbW92ZUJ5IGluIHBhZ2UgY29v cmRpbmF0ZXMKKyAgICAgICAgd2hpY2ggZG9lc24ndCBtYXRjaCB3aGVuIHRoZSBwYWdlIHZpZXcg aXMgc2NhbGxlZC4KKyAgICAgICAgVGhpcyBwYXRjaCBnaXZlcyB0aGUgc2Nyb2xsIGRlbHRhIHRv IHRoZSB2aWV3cG9ydCBpbiBpdCdzIG93biBjb29yZGluYXRlcy4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9xdC9Ub3VjaFZpZXdJbnRlcmZhY2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpUb3VjaFZp ZXdJbnRlcmZhY2U6OnBhbkdlc3R1cmVSZXF1ZXN0U2Nyb2xsKToKKwogMjAxMS0wNy0xMiAgSm9j ZWx5biBUdXJjb3R0ZSAgPGpvY2VseW4udHVyY290dGVAbm9raWEuY29tPgogCiAgICAgICAgIFtR dF0gQWxzbyBzdG9wIHRoZSBzY2FsZSBjb21taXQgdGltZXIgd2hlbiBjb21taXRTY2FsZUNoYW5n ZSBpcyBjYWxsZWQgZXhwbGljaXRseS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9xdC9Ub3VjaFZpZXdJbnRlcmZhY2UuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L3F0L1RvdWNoVmlld0ludGVyZmFjZS5jcHAKaW5kZXggN2VjODRkZTA4YTExZThkMGQxZGIzOTFj MmMxYmE1N2QxMzljOWU4MS4uZDJjYmNkZjUzYTA0MjlmYWRiYjMzYjEwZmUwOTZjMDA3YzczMjM2 YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1RvdWNoVmlld0ludGVy ZmFjZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1RvdWNoVmlld0ludGVy ZmFjZS5jcHAKQEAgLTQ1LDcgKzQ1LDExIEBAIHZvaWQgVG91Y2hWaWV3SW50ZXJmYWNlOjpwYW5H ZXN0dXJlU3RhcnRlZCgpCiAKIHZvaWQgVG91Y2hWaWV3SW50ZXJmYWNlOjpwYW5HZXN0dXJlUmVx dWVzdFNjcm9sbChxcmVhbCBkZWx0YVgsIHFyZWFsIGRlbHRhWSkKIHsKLSAgICBtX3ZpZXdwb3J0 Vmlldy0+ZC0+c2Nyb2xsKGRlbHRhWCwgZGVsdGFZKTsKKyAgICAvLyBUcmFuc2xhdGUgdGhlIGRl bHRhIGZyb20gcGFnZSB0byB2aWV3cG9ydCBjb29yZGluYXRlcy4KKyAgICAvLyBUaGlzIGFzc3Vt ZXMgdGhhdCBtX3ZpZXdwb3J0VmlldydzIGFuZCBtX3BhZ2VWaWV3IHBhcmVudCdzIGNvb3JkaW5h dGUgc3lzdGVtcyBtYXRjaC4KKyAgICBRUG9pbnRGIGRlc3RJblZpZXdwb3J0Q29vcmRzID0gbV9w YWdlVmlldy0+bWFwVG9QYXJlbnQobV9wYWdlVmlldy0+bWFwRnJvbVBhcmVudChtX3BhZ2VWaWV3 LT5wb3MoKSkgKyBRUG9pbnRGKGRlbHRhWCwgZGVsdGFZKSk7CisgICAgUVBvaW50RiBvZmZzZXRJ blZpZXdwb3J0Q29vcmRzID0gZGVzdEluVmlld3BvcnRDb29yZHMgLSBtX3BhZ2VWaWV3LT5wb3Mo KTsKKyAgICBtX3ZpZXdwb3J0Vmlldy0+ZC0+c2Nyb2xsKG9mZnNldEluVmlld3BvcnRDb29yZHMu eCgpLCBvZmZzZXRJblZpZXdwb3J0Q29vcmRzLnkoKSk7CiB9CiAKIHZvaWQgVG91Y2hWaWV3SW50 ZXJmYWNlOjpwYW5HZXN0dXJlRW5kZWQoKQo= 101149 2011-07-18 05:21:28 -0700 2011-07-18 05:24:46 -0700 Patch bug-64541-20110718142126.patch text/plain 2000 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogOTA4OTkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBjYzI1YWFjMTNlMzNhYzE3 ZDUwMzhkZjhmNzk2ZDNjYjYwNzMzZGI2Li44NzkyMzRjNDk0MjMzNDYzYmY4N2RmM2FkODU2MWZm NjI2NjBiNjFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDctMTUgIEpvY2Vs eW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lhLmNvbT4KKworICAgICAgICBbUXRd IENvbnNpZGVyIFFUb3VjaFdlYlBhZ2UncyB0cmFuc2Zvcm0gd2hlbiBzY3JvbGxpbmcgdGhlIHZp ZXdwb3J0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NjQ1NDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBD dXJyZW50bHkgdGhlIHNjcm9sbCBkZWx0YXMgYXJlIGdpdmVuIHRvIG1vdmVCeSBpbiBwYWdlIGNv b3JkaW5hdGVzCisgICAgICAgIHdoaWNoIGRvZXNuJ3QgbWF0Y2ggd2hlbiB0aGUgcGFnZSB2aWV3 IGlzIHNjYWxsZWQuCisgICAgICAgIFRoaXMgcGF0Y2ggZ2l2ZXMgdGhlIHNjcm9sbCBkZWx0YSB0 byB0aGUgdmlld3BvcnQgaW4gaXQncyBvd24gY29vcmRpbmF0ZXMuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvcXQvVG91Y2hWaWV3SW50ZXJmYWNlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6VG91Y2hW aWV3SW50ZXJmYWNlOjpwYW5HZXN0dXJlUmVxdWVzdFNjcm9sbCk6CisKIDIwMTEtMDctMTIgIEpv Y2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lhLmNvbT4KIAogICAgICAgICBb UXRdIEFsc28gc3RvcCB0aGUgc2NhbGUgY29tbWl0IHRpbWVyIHdoZW4gY29tbWl0U2NhbGVDaGFu Z2UgaXMgY2FsbGVkIGV4cGxpY2l0bHkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvcXQvVG91Y2hWaWV3SW50ZXJmYWNlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9xdC9Ub3VjaFZpZXdJbnRlcmZhY2UuY3BwCmluZGV4IDdlYzg0ZGUwOGExMWU4ZDBkMWRiMzkx YzJjMWJhNTdkMTM5YzllODEuLmRjODhhOGZmNGQzZmRiMmQ4YTYzNzgzOGYwZWYwZDVhYzQyMmEx ODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9Ub3VjaFZpZXdJbnRl cmZhY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9Ub3VjaFZpZXdJbnRl cmZhY2UuY3BwCkBAIC00NSw3ICs0NSwxMCBAQCB2b2lkIFRvdWNoVmlld0ludGVyZmFjZTo6cGFu R2VzdHVyZVN0YXJ0ZWQoKQogCiB2b2lkIFRvdWNoVmlld0ludGVyZmFjZTo6cGFuR2VzdHVyZVJl cXVlc3RTY3JvbGwocXJlYWwgZGVsdGFYLCBxcmVhbCBkZWx0YVkpCiB7Ci0gICAgbV92aWV3cG9y dFZpZXctPmQtPnNjcm9sbChkZWx0YVgsIGRlbHRhWSk7CisgICAgLy8gVHJhbnNsYXRlIHRoZSBk ZWx0YSBmcm9tIHBhZ2UgdG8gdmlld3BvcnQgY29vcmRpbmF0ZXMuCisgICAgUVBvaW50RiBkZXN0 SW5WaWV3cG9ydENvb3JkcyA9IG1fdmlld3BvcnRWaWV3LT5tYXBGcm9tSXRlbShtX3BhZ2VWaWV3 LCBtX3BhZ2VWaWV3LT5tYXBGcm9tUGFyZW50KG1fcGFnZVZpZXctPnBvcygpKSArIFFQb2ludEYo ZGVsdGFYLCBkZWx0YVkpKTsKKyAgICBRUG9pbnRGIG9mZnNldEluVmlld3BvcnRDb29yZHMgPSBk ZXN0SW5WaWV3cG9ydENvb3JkcyAtIG1fdmlld3BvcnRWaWV3LT5tYXBGcm9tSXRlbShtX3BhZ2VW aWV3LT5wYXJlbnRJdGVtKCksIG1fcGFnZVZpZXctPnBvcygpKTsKKyAgICBtX3ZpZXdwb3J0Vmll dy0+ZC0+c2Nyb2xsKG9mZnNldEluVmlld3BvcnRDb29yZHMueCgpLCBvZmZzZXRJblZpZXdwb3J0 Q29vcmRzLnkoKSk7CiB9CiAKIHZvaWQgVG91Y2hWaWV3SW50ZXJmYWNlOjpwYW5HZXN0dXJlRW5k ZWQoKQo=