73292 2011-11-29 00:49:17 -0800 [Qt] QQuickWebView gets wrong position after reload 2011-12-07 03:44:22 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 70236 1 kenneth kenneth hausmann ossy webkit.review.bot zalan zoltan oldest_to_newest 510570 0 kenneth 2011-11-29 00:49:17 -0800 SSIA 510572 1 116913 kenneth 2011-11-29 00:52:24 -0800 Created attachment 116913 Patch 510581 2 116913 hausmann 2011-11-29 01:11:03 -0800 Comment on attachment 116913 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=116913&action=review r=me, but ChangeLog fixes would be nice for landing :) > Source/WebKit2/ChangeLog:8 > + The ensureContentWithinViewportBoundary, animates the current viewport Comma not needed here :) > Source/WebKit2/ChangeLog:9 > + item into boundaries. That ofcourse breaks when we try to animate it, ofcourse -> of course 510583 3 116913 kenneth 2011-11-29 01:16:09 -0800 Comment on attachment 116913 Patch Landed in r101339 511616 4 ossy 2011-11-30 03:58:28 -0800 Reopen, because it broke Qt-WK2 API tests. before this patch: "TOTALS: 64 passed, 0 failed, 3 skipped" - http://build.webkit.sed.hu/builders/x86-32%20Linux%20Qt%20Release%20WebKit2/builds/16034/steps/API%20tests/logs/stdio after this patch: "TOTALS: 3 passed, 1 failed, 0 skipped" - http://build.webkit.sed.hu/builders/x86-32%20Linux%20Qt%20Release%20WebKit2/builds/16035/steps/API%20tests/logs/stdio It seems tst_qmltests exits without creating summary. 511693 5 hausmann 2011-11-30 06:10:40 -0800 (In reply to comment #4) > Reopen, because it broke Qt-WK2 API tests. > > before this patch: "TOTALS: 64 passed, 0 failed, 3 skipped" - http://build.webkit.sed.hu/builders/x86-32%20Linux%20Qt%20Release%20WebKit2/builds/16034/steps/API%20tests/logs/stdio > after this patch: "TOTALS: 3 passed, 1 failed, 0 skipped" - http://build.webkit.sed.hu/builders/x86-32%20Linux%20Qt%20Release%20WebKit2/builds/16035/steps/API%20tests/logs/stdio > > It seems tst_qmltests exits without creating summary. I can't reproduce that. I get 63 passed, 2 failed, 4 skipped with ToT. Could this be something fishy on the bot? 511707 6 ossy 2011-11-30 06:36:24 -0800 $ WebKitBuild/Release/Source/WebKit2/UIProcess/API/qt/tests/qmltests/tst_qmltests I got the following error on my Ubuntu 11.10 VM: PASS : qmltests::WebViewLoadProgress::cleanupTestCase() Segmentation fault ... Unfortunately I can't produce debug backtrace, because it is a 32 bit machine, and debug build on 32 bit is impossible long time ago. Maybe a release gdb backrace help you: Program received signal SIGSEGV, Segmentation fault. 0x03134657 in QtWebPageProxy::setVisibleContentRectAndScale(QRectF const&, float) () from /storage/WebKit/WebKitBuild/Release/imports/QtWebKit/../../lib/libQtWebKit.so.4 (gdb) bt #0 0x03134657 in QtWebPageProxy::setVisibleContentRectAndScale(QRectF const&, float) () from /storage/WebKit/WebKitBuild/Release/imports/QtWebKit/../../lib/libQtWebKit.so.4 #1 0x030bdf26 in QQuickWebViewPrivate::updateVisibleContentRect() () from /storage/WebKit/WebKitBuild/Release/imports/QtWebKit/../../lib/libQtWebKit.so.4 #2 0x030bdf6b in QQuickWebViewPrivate::_q_resume() () from /storage/WebKit/WebKitBuild/Release/imports/QtWebKit/../../lib/libQtWebKit.so.4 #3 0x030c08c0 in QQuickWebView::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) () from /storage/WebKit/WebKitBuild/Release/imports/QtWebKit/../../lib/libQtWebKit.so.4 #4 0x009e58ab in QMetaObject::activate(QObject*, QMetaObject const*, int, void**) () from /usr/local/Trolltech/Qt5/Qt-5.0.0-r13/lib/libQtCore.so.5 #5 0x03138d15 in WebKit::QtViewportInteractionEngine::contentResumeRequested() () from /storage/WebKit/WebKitBuild/Release/imports/QtWebKit/../../lib/libQtWebKit.so.4 #6 0x0313a6fa in WebKit::QtViewportInteractionEngine::~QtViewportInteractionEngine() () from /storage/WebKit/WebKitBuild/Release/imports/QtWebKit/../../lib/libQtWebKit.so.4 #7 0x0313a792 in WebKit::QtViewportInteractionEngine::~QtViewportInteractionEngine() () from /storage/WebKit/WebKitBuild/Release/imports/QtWebKit/../../lib/libQtWebKit.so.4 #8 0x030c0000 in QQuickWebViewPrivate::~QQuickWebViewPrivate() () from /storage/WebKit/WebKitBuild/Release/imports/QtWebKit/../../lib/libQtWebKit.so.4 #9 0x030bd86c in QQuickWebView::~QQuickWebView() () from /storage/WebKit/WebKitBuild/Release/imports/QtWebKit/../../lib/libQtWebKit.so.4 #10 0x02e652ba in QDeclarativePrivate::QDeclarativeElement<QQuickWebView>::~QDeclarativeElement() () from /storage/WebKit/WebKitBuild/Release/imports/QtWebKit/libqmlwebkitplugin.so #11 0x013fb3f7 in ?? () from /usr/local/Trolltech/Qt5/Qt-5.0.0-r13/lib/libQtDeclarative.so.5 #12 0x0013860e in quick_test_main(int, char**, char const*, QWidget* (*)(), char const*) () from /usr/local/Trolltech/Qt5/Qt-5.0.0-r13/lib/libQtQuickTest.so.5 #13 0x080492eb in main () 516580 7 ossy 2011-12-07 03:44:22 -0800 This regression was fixed by http://trac.webkit.org/changeset/102142 ( https://bugs.webkit.org/show_bug.cgi?id=73907 ) 116913 2011-11-29 00:52:24 -0800 2011-11-30 04:48:21 -0800 Patch 0001-Qt-QQuickWebView-gets-wrong-position-after-reload.patch text/plain 8165 kenneth RnJvbSA5YWY4NmRlY2I1N2UyNDVmOTIzY2JlYmQzNzU3MDNiYjFmOTM0YjY5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiA8a2VubmV0aEB3 ZWJraXQub3JnPgpEYXRlOiBUdWUsIDI5IE5vdiAyMDExIDA5OjQ2OjUwICswMTAwClN1YmplY3Q6 IFtQQVRDSF0gW1F0XSBRUXVpY2tXZWJWaWV3IGdldHMgd3JvbmcgcG9zaXRpb24gYWZ0ZXIgcmVs b2FkCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzMyOTIKClJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKVGhlIGVuc3VyZUNvbnRlbnRXaXRoaW5WaWV3cG9ydEJv dW5kYXJ5LCBhbmltYXRlcyB0aGUgY3VycmVudCB2aWV3cG9ydAppdGVtIGludG8gYm91bmRhcmll cy4gVGhhdCBvZmNvdXJzZSBicmVha3Mgd2hlbiB3ZSB0cnkgdG8gYW5pbWF0ZSBpdCwKZ2l2ZW4g dGhlIGluaXRpYWwtc2NhbGUgd2hpY2ggaGFzbid0IGJlZW4gYXBwbGllZDsgc28gYXBwbHkgaXQu CgpBbHNvIHB1dCB0aGUgUVNjcm9sbGVyIHNldHRpbmdzIGNvZGUgaW4gdGhlIGN0b3IgYXMgaXQg bmV2ZXIgY2hhbmdlcy4KCiogVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2lu ZS5jcHA6CihXZWJLaXQ6OlF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6UXRWaWV3cG9ydElu dGVyYWN0aW9uRW5naW5lKToKKFdlYktpdDo6UXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpl bnN1cmVDb250ZW50V2l0aGluVmlld3BvcnRCb3VuZGFyeSk6CihXZWJLaXQ6OlF0Vmlld3BvcnRJ bnRlcmFjdGlvbkVuZ2luZTo6cmVzZXQpOgooV2ViS2l0OjpRdFZpZXdwb3J0SW50ZXJhY3Rpb25F bmdpbmU6OmFwcGx5Q29uc3RyYWludHMpOgoqIFVJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJh Y3Rpb25FbmdpbmUuaDoKLS0tCiBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgICAgICAgICAgICAg ICAgICAgICAgICAgICB8ICAgMjAgKysrKysrKwogLi4uL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0 SW50ZXJhY3Rpb25FbmdpbmUuY3BwICAgfCAgIDUzICsrKysrKysrKysrLS0tLS0tLS0tCiAuLi4v VUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oICAgICB8ICAgIDIgKy0K IDMgZmlsZXMgY2hhbmdlZCwgNTAgaW5zZXJ0aW9ucygrKSwgMjUgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCmluZGV4IDBjYTI0NjkuLmY0Y2VjZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAor MjAxMS0xMS0yOSAgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4gIDxrZW5uZXRoQHdlYmtpdC5v cmc+CisKKyAgICAgICAgW1F0XSBRUXVpY2tXZWJWaWV3IGdldHMgd3JvbmcgcG9zaXRpb24gYWZ0 ZXIgcmVsb2FkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD03MzI5MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRoZSBlbnN1cmVDb250ZW50V2l0aGluVmlld3BvcnRCb3VuZGFyeSwgYW5pbWF0ZXMgdGhlIGN1 cnJlbnQgdmlld3BvcnQKKyAgICAgICAgaXRlbSBpbnRvIGJvdW5kYXJpZXMuIFRoYXQgb2Zjb3Vy c2UgYnJlYWtzIHdoZW4gd2UgdHJ5IHRvIGFuaW1hdGUgaXQsCisgICAgICAgIGdpdmVuIHRoZSBp bml0aWFsLXNjYWxlIHdoaWNoIGhhc24ndCBiZWVuIGFwcGxpZWQ7IHNvIGFwcGx5IGl0LgorCisg ICAgICAgIEFsc28gcHV0IHRoZSBRU2Nyb2xsZXIgc2V0dGluZ3MgY29kZSBpbiB0aGUgY3RvciBh cyBpdCBuZXZlciBjaGFuZ2VzLgorCisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJ bnRlcmFjdGlvbkVuZ2luZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlF0Vmlld3BvcnRJbnRlcmFj dGlvbkVuZ2luZTo6UXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lKToKKyAgICAgICAgKFdlYktp dDo6UXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjplbnN1cmVDb250ZW50V2l0aGluVmlld3Bv cnRCb3VuZGFyeSk6CisgICAgICAgIChXZWJLaXQ6OlF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2lu ZTo6cmVzZXQpOgorICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6 OmFwcGx5Q29uc3RyYWludHMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50 ZXJhY3Rpb25FbmdpbmUuaDoKKwogMjAxMS0xMS0yOCAgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5z ZW4gIDxrZW5uZXRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgTWFrZSBzdXJlIHRoZSB1c2VGaXhl ZExheW91dCBmZWF0dXJlIGlzIGNvbnNpc3RlbnRseSBoYW5kbGVkCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmNwcCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUu Y3BwCmluZGV4IGI5NWQ1NDcuLjQyMDVlZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwCkBAIC0x MDIsNiArMTAyLDIyIEBAIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6UXRWaWV3cG9ydElu dGVyYWN0aW9uRW5naW5lKGNvbnN0IFFRdWlja0l0ZW0qIHZpZXdwCiB7CiAgICAgcmVzZXQoKTsK IAorICAgIFFTY3JvbGxlclByb3BlcnRpZXMgcHJvcGVydGllcyA9IHNjcm9sbGVyKCktPnNjcm9s bGVyUHJvcGVydGllcygpOworCisgICAgLy8gVGhlIFF0UGFuR2VzdHVyZVJlY29nbml6ZXIgaXMg cmVzcG9uc2libGUgZm9yIHJlY29nbml6aW5nIHRoZSBnZXN0dXJlCisgICAgLy8gdGh1cyB3ZSBu ZWVkIHRvIGRpc2FibGUgdGhlIGRyYWcgc3RhcnQgZGlzdGFuY2UuCisgICAgcHJvcGVydGllcy5z ZXRTY3JvbGxNZXRyaWMoUVNjcm9sbGVyUHJvcGVydGllczo6RHJhZ1N0YXJ0RGlzdGFuY2UsIDAu MCk7CisKKyAgICAvLyBTZXQgc29tZSBkZWZhdWx0IFFTY3JvbGxlciBjb25zdHJhaW5zIHRvIG1p bWljIHRoZSBwaHlzaWNzIGVuZ2luZSBvZiB0aGUgTjkgYnJvd3Nlci4KKyAgICBwcm9wZXJ0aWVz LnNldFNjcm9sbE1ldHJpYyhRU2Nyb2xsZXJQcm9wZXJ0aWVzOjpBeGlzTG9ja1RocmVzaG9sZCwg MC42Nik7CisgICAgcHJvcGVydGllcy5zZXRTY3JvbGxNZXRyaWMoUVNjcm9sbGVyUHJvcGVydGll czo6U2Nyb2xsaW5nQ3VydmUsIFFFYXNpbmdDdXJ2ZShRRWFzaW5nQ3VydmU6Ok91dEV4cG8pKTsK KyAgICBwcm9wZXJ0aWVzLnNldFNjcm9sbE1ldHJpYyhRU2Nyb2xsZXJQcm9wZXJ0aWVzOjpEZWNl bGVyYXRpb25GYWN0b3IsIDAuMDUpOworICAgIHByb3BlcnRpZXMuc2V0U2Nyb2xsTWV0cmljKFFT Y3JvbGxlclByb3BlcnRpZXM6Ok1heGltdW1WZWxvY2l0eSwgMC42MzUpOworICAgIHByb3BlcnRp ZXMuc2V0U2Nyb2xsTWV0cmljKFFTY3JvbGxlclByb3BlcnRpZXM6Ok92ZXJzaG9vdERyYWdSZXNp c3RhbmNlRmFjdG9yLCAwLjMzKTsKKyAgICBwcm9wZXJ0aWVzLnNldFNjcm9sbE1ldHJpYyhRU2Ny b2xsZXJQcm9wZXJ0aWVzOjpPdmVyc2hvb3RTY3JvbGxEaXN0YW5jZUZhY3RvciwgMC4zMyk7CisK KyAgICBzY3JvbGxlcigpLT5zZXRTY3JvbGxlclByb3BlcnRpZXMocHJvcGVydGllcyk7CisKICAg ICBjb25uZWN0KG1fY29udGVudCwgU0lHTkFMKHdpZHRoQ2hhbmdlZCgpKSwgdGhpcywgU0xPVChp dGVtU2l6ZUNoYW5nZWQoKSksIFF0OjpEaXJlY3RDb25uZWN0aW9uKTsKICAgICBjb25uZWN0KG1f Y29udGVudCwgU0lHTkFMKGhlaWdodENoYW5nZWQoKSksIHRoaXMsIFNMT1QoaXRlbVNpemVDaGFu Z2VkKCkpLCBRdDo6RGlyZWN0Q29ubmVjdGlvbik7CiAKQEAgLTMwOCwyMSArMzI0LDE3IEBAIHZv aWQgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjp6b29tVG9BcmVhR2VzdHVyZUVuZGVkKGNv bnN0IFFQb2ludEYmIHRvdWNoUG9pCiAgICAgYW5pbWF0ZUl0ZW1SZWN0VmlzaWJsZShlbmRWaXNp YmxlQ29udGVudFJlY3QpOwogfQogCi12b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6 ZW5zdXJlQ29udGVudFdpdGhpblZpZXdwb3J0Qm91bmRhcnkoKQordm9pZCBRdFZpZXdwb3J0SW50 ZXJhY3Rpb25FbmdpbmU6OmVuc3VyZUNvbnRlbnRXaXRoaW5WaWV3cG9ydEJvdW5kYXJ5KGJvb2wg aW1tZWRpYXRlKQogewogICAgIGlmIChzY3JvbGxBbmltYXRpb25BY3RpdmUoKSB8fCBzY2FsZUFu aW1hdGlvbkFjdGl2ZSgpKQogICAgICAgICByZXR1cm47CiAKICAgICBxcmVhbCBjdXJyZW50Q1NT U2NhbGUgPSBjc3NTY2FsZUZyb21JdGVtKG1fY29udGVudC0+c2NhbGUoKSk7Ci0gICAgYm9vbCB1 c2VySGFzU2NhbGVkQ29udGVudCA9IG1fdXNlckludGVyYWN0aW9uRmxhZ3MgJiBVc2VySGFzU2Nh bGVkQ29udGVudDsKLQotICAgIGlmICghdXNlckhhc1NjYWxlZENvbnRlbnQpCi0gICAgICAgIGN1 cnJlbnRDU1NTY2FsZSA9IG1fY29uc3RyYWludHMuaW5pdGlhbFNjYWxlOwogCiAgICAgcXJlYWwg ZW5kSXRlbVNjYWxlID0gaXRlbVNjYWxlRnJvbUNTUyhpbm5lckJvdW5kZWRDU1NTY2FsZShjdXJy ZW50Q1NTU2NhbGUpKTsKIAogICAgIGNvbnN0IFFSZWN0RiB2aWV3cG9ydFJlY3QgPSBtX3ZpZXdw b3J0LT5ib3VuZGluZ1JlY3QoKTsKLSAgICBjb25zdCBRUG9pbnRGIHZpZXdwb3J0SG90c3BvdCA9 IHZpZXdwb3J0UmVjdC5jZW50ZXIoKTsKKyAgICBRUG9pbnRGIHZpZXdwb3J0SG90c3BvdCA9IHZp ZXdwb3J0UmVjdC5jZW50ZXIoKTsKIAogICAgIFFQb2ludEYgZW5kUG9zaXRpb24gPSBtX2NvbnRl bnQtPm1hcEZyb21JdGVtKG1fdmlld3BvcnQsIHZpZXdwb3J0SG90c3BvdCkgKiBlbmRJdGVtU2Nh bGUgLSB2aWV3cG9ydEhvdHNwb3Q7CiAKQEAgLTMzMSw3ICszNDMsNyBAQCB2b2lkIFF0Vmlld3Bv cnRJbnRlcmFjdGlvbkVuZ2luZTo6ZW5zdXJlQ29udGVudFdpdGhpblZpZXdwb3J0Qm91bmRhcnko KQogCiAgICAgUVJlY3RGIGVuZFZpc2libGVDb250ZW50UmVjdChlbmRQb3NpdGlvbiAvIGVuZEl0 ZW1TY2FsZSwgdmlld3BvcnRSZWN0LnNpemUoKSAvIGVuZEl0ZW1TY2FsZSk7CiAKLSAgICBpZiAo IXVzZXJIYXNTY2FsZWRDb250ZW50KQorICAgIGlmIChpbW1lZGlhdGUpCiAgICAgICAgIHNldEl0 ZW1SZWN0VmlzaWJsZShlbmRWaXNpYmxlQ29udGVudFJlY3QpOwogICAgIGVsc2UKICAgICAgICAg YW5pbWF0ZUl0ZW1SZWN0VmlzaWJsZShlbmRWaXNpYmxlQ29udGVudFJlY3QpOwpAQCAtMzQwLDI2 ICszNTIsMTEgQEAgdm9pZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OmVuc3VyZUNvbnRl bnRXaXRoaW5WaWV3cG9ydEJvdW5kYXJ5KCkKIHZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5n aW5lOjpyZXNldCgpCiB7CiAgICAgVmlld3BvcnRVcGRhdGVHdWFyZCBndWFyZCh0aGlzKTsKKwog ICAgIG1fdXNlckludGVyYWN0aW9uRmxhZ3MgPSBVc2VySGFzTm90SW50ZXJhY3RlZFdpdGhDb250 ZW50OwogCiAgICAgc2Nyb2xsZXIoKS0+c3RvcCgpOwogICAgIG1fc2NhbGVBbmltYXRpb24tPnN0 b3AoKTsKLQotICAgIFFTY3JvbGxlclByb3BlcnRpZXMgcHJvcGVydGllcyA9IHNjcm9sbGVyKCkt PnNjcm9sbGVyUHJvcGVydGllcygpOwotCi0gICAgLy8gVGhlIFF0UGFuR2VzdHVyZVJlY29nbml6 ZXIgaXMgcmVzcG9uc2libGUgZm9yIHJlY29nbml6aW5nIHRoZSBnZXN0dXJlCi0gICAgLy8gdGh1 cyB3ZSBuZWVkIHRvIGRpc2FibGUgdGhlIGRyYWcgc3RhcnQgZGlzdGFuY2UuCi0gICAgcHJvcGVy dGllcy5zZXRTY3JvbGxNZXRyaWMoUVNjcm9sbGVyUHJvcGVydGllczo6RHJhZ1N0YXJ0RGlzdGFu Y2UsIDAuMCk7Ci0KLSAgICAvLyBTZXQgc29tZSBkZWZhdWx0IFFTY3JvbGxlciBjb25zdHJhaW5z IHRvIG1pbWljIHRoZSBwaHlzaWNzIGVuZ2luZSBvZiB0aGUgTjkgYnJvd3Nlci4KLSAgICBwcm9w ZXJ0aWVzLnNldFNjcm9sbE1ldHJpYyhRU2Nyb2xsZXJQcm9wZXJ0aWVzOjpBeGlzTG9ja1RocmVz aG9sZCwgMC42Nik7Ci0gICAgcHJvcGVydGllcy5zZXRTY3JvbGxNZXRyaWMoUVNjcm9sbGVyUHJv cGVydGllczo6U2Nyb2xsaW5nQ3VydmUsIFFFYXNpbmdDdXJ2ZShRRWFzaW5nQ3VydmU6Ok91dEV4 cG8pKTsKLSAgICBwcm9wZXJ0aWVzLnNldFNjcm9sbE1ldHJpYyhRU2Nyb2xsZXJQcm9wZXJ0aWVz OjpEZWNlbGVyYXRpb25GYWN0b3IsIDAuMDUpOwotICAgIHByb3BlcnRpZXMuc2V0U2Nyb2xsTWV0 cmljKFFTY3JvbGxlclByb3BlcnRpZXM6Ok1heGltdW1WZWxvY2l0eSwgMC42MzUpOwotICAgIHBy b3BlcnRpZXMuc2V0U2Nyb2xsTWV0cmljKFFTY3JvbGxlclByb3BlcnRpZXM6Ok92ZXJzaG9vdERy YWdSZXNpc3RhbmNlRmFjdG9yLCAwLjMzKTsKLSAgICBwcm9wZXJ0aWVzLnNldFNjcm9sbE1ldHJp YyhRU2Nyb2xsZXJQcm9wZXJ0aWVzOjpPdmVyc2hvb3RTY3JvbGxEaXN0YW5jZUZhY3RvciwgMC4z Myk7Ci0KLSAgICBzY3JvbGxlcigpLT5zZXRTY3JvbGxlclByb3BlcnRpZXMocHJvcGVydGllcyk7 CiB9CiAKIHZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjphcHBseUNvbnN0cmFpbnRz KGNvbnN0IENvbnN0cmFpbnRzJiBjb25zdHJhaW50cykKQEAgLTM3MCw3ICszNjcsMTUgQEAgdm9p ZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OmFwcGx5Q29uc3RyYWludHMoY29uc3QgQ29u c3RyYWludHMmIGNvbnN0cmFpbnQKICAgICBWaWV3cG9ydFVwZGF0ZUd1YXJkIGd1YXJkKHRoaXMp OwogICAgIG1fY29uc3RyYWludHMgPSBjb25zdHJhaW50czsKIAotICAgIGVuc3VyZUNvbnRlbnRX aXRoaW5WaWV3cG9ydEJvdW5kYXJ5KCk7CisgICAgYm9vbCB1c2VySGFzU2NhbGVkQ29udGVudCA9 IG1fdXNlckludGVyYWN0aW9uRmxhZ3MgJiBVc2VySGFzU2NhbGVkQ29udGVudDsKKyAgICBpZiAo IXVzZXJIYXNTY2FsZWRDb250ZW50KSB7CisgICAgICAgIHFyZWFsIGluaXRpYWxTY2FsZSA9IGlu bmVyQm91bmRlZENTU1NjYWxlKG1fY29uc3RyYWludHMuaW5pdGlhbFNjYWxlKTsKKyAgICAgICAg bV9jb250ZW50LT5zZXRTY2FsZShpdGVtU2NhbGVGcm9tQ1NTKGluaXRpYWxTY2FsZSkpOworICAg IH0KKworICAgIC8vIElmIHRoZSB3ZWIgYXBwIGNoYW5nZXMgc3VjY2Vzc2l2ZWx5IGNoYW5nZXMg dGhlIHZpZXdwb3J0IG9uIHB1cnBvc2UKKyAgICAvLyBpdCB3YW50cyB0byBiZSBpbiBjb250cm9s IGFuZCB3ZSBzaG91bGQgZGlzYWJsZSBhbmltYXRpb25zLgorICAgIGVuc3VyZUNvbnRlbnRXaXRo aW5WaWV3cG9ydEJvdW5kYXJ5KC8qIGltbWVkaWF0ZSAqLyB0cnVlKTsKIH0KIAogYm9vbCBRdFZp ZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnNjcm9sbEFuaW1hdGlvbkFjdGl2ZSgpIGNvbnN0CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0 aW9uRW5naW5lLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVy YWN0aW9uRW5naW5lLmgKaW5kZXggNTQ2NDczOC4uZDQzNmViNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUu aApAQCAtMTExLDcgKzExMSw3IEBAIHByaXZhdGU6CiAgICAgcXJlYWwgb3V0ZXJCb3VuZGVkQ1NT U2NhbGUocXJlYWwpOwogCiAgICAgUVJlY3RGIGNvbXB1dGVQb3NSYW5nZUZvckl0ZW1BdFNjYWxl KHFyZWFsIGl0ZW1TY2FsZSkgY29uc3Q7Ci0gICAgdm9pZCBlbnN1cmVDb250ZW50V2l0aGluVmll d3BvcnRCb3VuZGFyeSgpOworICAgIHZvaWQgZW5zdXJlQ29udGVudFdpdGhpblZpZXdwb3J0Qm91 bmRhcnkoYm9vbCBpbW1lZGlhdGUgPSBmYWxzZSk7CiAKICAgICB2b2lkIHNjYWxlQ29udGVudChj b25zdCBRUG9pbnRGJiBjZW50ZXJJbkNvbnRlbnRDb29yZGluYXRlcywgcXJlYWwgc2NhbGUpOwog Ci0tIAoxLjcuNC4xCgo=