72030 2011-11-10 08:47:12 -0800 [Qt] the QQuickWebView should support double-tap to zoom 2011-11-14 04:15:53 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kenneth kenneth hausmann kling webkit.review.bot zeno zoltan oldest_to_newest 499950 0 kenneth 2011-11-10 08:47:12 -0800 SSIA 499957 1 114510 kenneth 2011-11-10 08:52:00 -0800 Created attachment 114510 Patch 499962 2 114510 zeno 2011-11-10 08:56:38 -0800 Comment on attachment 114510 Patch looks awesome to me :) 499969 3 114515 kenneth 2011-11-10 09:03:18 -0800 Created attachment 114515 Rebased 499992 4 114515 kling 2011-11-10 09:18:47 -0800 Comment on attachment 114515 Rebased View in context: https://bugs.webkit.org/attachment.cgi?id=114515&action=review r=me with some cool stories, bro. > Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp:251 > + if (scrollAnimationActive() || scaleAnimationActive()) > + return; > + > + if (!targetArea.isValid()) > + return; Nit: I'd put the !targetArea.isValid() check first, since it's inline. > Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp:253 > + int margin = 10; // We want at least a little bit or margin. This variable should be const. > Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp:273 > + QRectF endPosRange = computePosRangeForItemAtScale(endItemScale); endPositionRange would be a better name I think. Actually, thinking about it, I personally prefer "final" to "end" in this context, but maybe "end" is an existing QtQuick convention. Regardless, NABD. 500168 5 kenneth 2011-11-10 12:56:45 -0800 (In reply to comment #4) > (From update of attachment 114515 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=114515&action=review > > r=me with some cool stories, bro. > > > Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp:251 > > + if (scrollAnimationActive() || scaleAnimationActive()) > > + return; > > + > > + if (!targetArea.isValid()) > > + return; > > Nit: I'd put the !targetArea.isValid() check first, since it's inline. Good point > > Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp:253 > > + int margin = 10; // We want at least a little bit or margin. > > This variable should be const. Sure > > Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp:273 > > + QRectF endPosRange = computePosRangeForItemAtScale(endItemScale); > > endPositionRange would be a better name I think. It is, but Pos was choosed to be similar to the QQuick API :-) setPosRange() *hint* > Actually, thinking about it, I personally prefer "final" to "end" in this context, but maybe "end" is an existing QtQuick convention. Regardless, NABD. Yeah that is used all over in the API (and in our code) 501786 6 114515 kenneth 2011-11-14 04:15:45 -0800 Comment on attachment 114515 Rebased Landed in 100125 114510 2011-11-10 08:52:00 -0800 2011-11-10 09:03:18 -0800 Patch 0001-Qt-the-QQuickWebView-should-support-double-tap-to-zo.patch text/plain 9626 kenneth RnJvbSBlMzJkZTgxZGNiZTZmZGQ5OWYyZTgxYzE5ZmI5YmI4ZjQ5MzRiODFkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiA8a2VubmV0aEB3 ZWJraXQub3JnPgpEYXRlOiBUaHUsIDEwIE5vdiAyMDExIDE3OjQ3OjQxICswMTAwClN1YmplY3Q6 IFtQQVRDSF0gW1F0XSB0aGUgUVF1aWNrV2ViVmlldyBzaG91bGQgc3VwcG9ydCBkb3VibGUtdGFw IHRvIHpvb20KIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MjAzMAoK UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgoqIFVJUHJvY2Vzcy9xdC9RdFZpZXdJbnRlcmZh Y2UuY3BwOgoqIFVJUHJvY2Vzcy9xdC9RdFZpZXdJbnRlcmZhY2UuaDoKKiBVSVByb2Nlc3MvcXQv UXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmNwcDoKKFdlYktpdDo6UXRWaWV3cG9ydEludGVy YWN0aW9uRW5naW5lOjphbmltYXRlSXRlbVJlY3RWaXNpYmxlKToKKFdlYktpdDo6UXRWaWV3cG9y dEludGVyYWN0aW9uRW5naW5lOjp6b29tVG9BcmVhR2VzdHVyZUVuZGVkKToKKFdlYktpdDo6UXRW aWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjplbnN1cmVDb250ZW50V2l0aGluVmlld3BvcnRCb3Vu ZGFyeSk6CiogVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oOgoqIFVJ UHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5jcHA6CihRdFdlYlBhZ2VQcm94eTo6ZGlkRmluZFpv b21hYmxlQXJlYSk6Ci0tLQogU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nICAgICAgICAgICAgICAg ICAgICAgICAgICAgfCAgIDE3ICsrKysrCiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRW aWV3SW50ZXJmYWNlLmNwcCAgICB8ICAgIDQgLQogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0 L1F0Vmlld0ludGVyZmFjZS5oICAgICAgfCAgICAyIC0KIC4uLi9VSVByb2Nlc3MvcXQvUXRWaWV3 cG9ydEludGVyYWN0aW9uRW5naW5lLmNwcCAgIHwgICA2NSArKysrKysrKysrKysrKysrLS0tCiAu Li4vVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oICAgICB8ICAgIDQg KwogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmNwcCAgICAgfCAg ICA0ICstCiA2IGZpbGVzIGNoYW5nZWQsIDc4IGluc2VydGlvbnMoKyksIDE4IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZwppbmRleCAwMzNhYjIyLi5jNjg5YTQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEs MjIgQEAKIDIwMTEtMTEtMTAgIEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuICA8a2VubmV0aEB3 ZWJraXQub3JnPgogCisgICAgICAgIFtRdF0gdGhlIFFRdWlja1dlYlZpZXcgc2hvdWxkIHN1cHBv cnQgZG91YmxlLXRhcCB0byB6b29tCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD03MjAzMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0Vmlld0ludGVyZmFjZS5jcHA6CisgICAgICAg ICogVUlQcm9jZXNzL3F0L1F0Vmlld0ludGVyZmFjZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9x dC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpRdFZp ZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OmFuaW1hdGVJdGVtUmVjdFZpc2libGUpOgorICAgICAg ICAoV2ViS2l0OjpRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6Onpvb21Ub0FyZWFHZXN0dXJl RW5kZWQpOgorICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OmVu c3VyZUNvbnRlbnRXaXRoaW5WaWV3cG9ydEJvdW5kYXJ5KToKKyAgICAgICAgKiBVSVByb2Nlc3Mv cXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmg6CisgICAgICAgICogVUlQcm9jZXNzL3F0 L1F0V2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFF0V2ViUGFnZVByb3h5OjpkaWRGaW5kWm9v bWFibGVBcmVhKToKKworMjAxMS0xMS0xMCAgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4gIDxr ZW5uZXRoQHdlYmtpdC5vcmc+CisKICAgICAgICAgW1F0XSBDbGVhbiB1cCBob3cgc2luZ2UgLyBk b3VibGUgdGFwcyBhcmUgaGFuZGxlZAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NzIwMjQKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL3F0L1F0Vmlld0ludGVyZmFjZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQv UXRWaWV3SW50ZXJmYWNlLmNwcAppbmRleCBmYzdjMjU2Li42ZDgzMjliIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3SW50ZXJmYWNlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3SW50ZXJmYWNlLmNwcApAQCAtNDIsMTAgKzQy LDYgQEAgUXRWaWV3SW50ZXJmYWNlOjpRdFZpZXdJbnRlcmZhY2UoUVF1aWNrV2ViVmlldyogdmll d3BvcnRWaWV3LCBRUXVpY2tXZWJQYWdlKiBwYWcKICAgICBRX0FTU0VSVChtX3BhZ2VWaWV3KTsK IH0KIAotdm9pZCBRdFZpZXdJbnRlcmZhY2U6OmRpZEZpbmRab29tYWJsZUFyZWEoY29uc3QgUVBv aW50JiwgY29uc3QgUVJlY3QmKQotewotfQotCiBRdFNHVXBkYXRlUXVldWUqIFF0Vmlld0ludGVy ZmFjZTo6c2NlbmVHcmFwaFVwZGF0ZVF1ZXVlKCkgY29uc3QKIHsKICAgICByZXR1cm4gJm1fcGFn ZVZpZXctPmQtPnNnVXBkYXRlUXVldWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvcXQvUXRWaWV3SW50ZXJmYWNlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQv UXRWaWV3SW50ZXJmYWNlLmgKaW5kZXggYjA3ODk5MC4uNTRjODM0MSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld0ludGVyZmFjZS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdJbnRlcmZhY2UuaApAQCAtNzUsOCArNzUsNiBAQCBw dWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHN0YXJ0RHJhZyhRdDo6RHJvcEFjdGlvbnMgc3VwcG9y dGVkRHJvcEFjdGlvbnMsIGNvbnN0IFFJbWFnZSYgZHJhZ0ltYWdlLCBRTWltZURhdGEqLCBRUG9p bnQqIGNsaWVudFBvc2l0aW9uLCBRUG9pbnQqIGdsb2JhbFBvc2l0aW9uLCBRdDo6RHJvcEFjdGlv biopOwogICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFuZ2VWaWV3cG9ydFByb3BlcnRpZXMoY29uc3Qg V2ViQ29yZTo6Vmlld3BvcnRBcmd1bWVudHMmKTsKIAotICAgIHZpcnR1YWwgdm9pZCBkaWRGaW5k Wm9vbWFibGVBcmVhKGNvbnN0IFFQb2ludCYsIGNvbnN0IFFSZWN0Jik7Ci0KICAgICB2aXJ0dWFs IHZvaWQgZGlkQ2hhbmdlVXJsKGNvbnN0IFFVcmwmKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkQ2hh bmdlVGl0bGUoY29uc3QgUVN0cmluZyYpOwogICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFuZ2VUb29s VGlwKGNvbnN0IFFTdHJpbmcmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHAKaW5kZXggMDdlOWI0MC4u ZDAxZGViNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3Bv cnRJbnRlcmFjdGlvbkVuZ2luZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0 L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHAKQEAgLTE0Myw2ICsxNDMsMjEgQEAgdm9p ZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnNldEl0ZW1SZWN0VmlzaWJsZShjb25zdCBR UmVjdEYmIGl0ZW1SZWN0KQogICAgIG1fY29udGVudC0+c2V0UG9zKC0gaXRlbVJlY3QudG9wTGVm dCgpICogaXRlbVNjYWxlKTsKIH0KIAordm9pZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6 OmFuaW1hdGVJdGVtUmVjdFZpc2libGUoY29uc3QgUVJlY3RGJiBpdGVtUmVjdCkKK3sKKyAgICBR UmVjdEYgY3VycmVudEl0ZW1SZWN0VmlzaWJsZSA9IG1fY29udGVudC0+bWFwUmVjdEZyb21JdGVt KG1fdmlld3BvcnQsIG1fdmlld3BvcnQtPmJvdW5kaW5nUmVjdCgpKTsKKyAgICBpZiAoaXRlbVJl Y3QgPT0gY3VycmVudEl0ZW1SZWN0VmlzaWJsZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9z Y2FsZUFuaW1hdGlvbi0+c2V0RHVyYXRpb24oa1NjYWxlQW5pbWF0aW9uRHVyYXRpb25NaWxsaXMp OworICAgIG1fc2NhbGVBbmltYXRpb24tPnNldEVhc2luZ0N1cnZlKFFFYXNpbmdDdXJ2ZTo6T3V0 Q3ViaWMpOworCisgICAgbV9zY2FsZUFuaW1hdGlvbi0+c2V0U3RhcnRWYWx1ZShjdXJyZW50SXRl bVJlY3RWaXNpYmxlKTsKKyAgICBtX3NjYWxlQW5pbWF0aW9uLT5zZXRFbmRWYWx1ZShpdGVtUmVj dCk7CisKKyAgICBtX3NjYWxlQW5pbWF0aW9uLT5zdGFydCgpOworfQorCiB2b2lkIFF0Vmlld3Bv cnRJbnRlcmFjdGlvbkVuZ2luZTo6c2NhbGVBbmltYXRpb25TdGF0ZUNoYW5nZWQoUUFic3RyYWN0 QW5pbWF0aW9uOjpTdGF0ZSBuZXdTdGF0ZSwgUUFic3RyYWN0QW5pbWF0aW9uOjpTdGF0ZSAvKm9s ZFN0YXRlKi8pCiB7CiAgICAgc3dpdGNoIChuZXdTdGF0ZSkgewpAQCAtMjI3LDYgKzI0Miw0MiBA QCBRUmVjdEYgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpjb21wdXRlUG9zUmFuZ2VGb3JJ dGVtQXRTY2FsZShxcmVhbCBpdGVtU2NhbAogICAgIHJldHVybiBRUmVjdEYoUVBvaW50RigwLCAw KSwgUVNpemVGKGhvcml6b250YWxSYW5nZSwgdmVydGljYWxSYW5nZSkpOwogfQogCit2b2lkIFF0 Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6em9vbVRvQXJlYUdlc3R1cmVFbmRlZChjb25zdCBR UG9pbnRGJiB0b3VjaFBvaW50LCBjb25zdCBRUmVjdEYmIHRhcmdldEFyZWEpCit7CisgICAgaWYg KHNjcm9sbEFuaW1hdGlvbkFjdGl2ZSgpIHx8IHNjYWxlQW5pbWF0aW9uQWN0aXZlKCkpCisgICAg ICAgIHJldHVybjsKKworICAgIGlmICghdGFyZ2V0QXJlYS5pc1ZhbGlkKCkpCisgICAgICAgIHJl dHVybjsKKworICAgIGludCBtYXJnaW4gPSAxMDsgLy8gV2Ugd2FudCBhdCBsZWFzdCBhIGxpdHRs ZSBiaXQgb3IgbWFyZ2luLgorICAgIFFSZWN0RiBlbmRBcmVhID0gdGFyZ2V0QXJlYS5hZGp1c3Rl ZCgtbWFyZ2luLCAtbWFyZ2luLCBtYXJnaW4sIG1hcmdpbik7CisgICAgZW5kQXJlYS5zZXRYKGVu ZEFyZWEueCgpICogbV9jb25zdHJhaW50cy5kZXZpY2VQaXhlbFJhdGlvKTsKKyAgICBlbmRBcmVh LnNldFkoZW5kQXJlYS55KCkgKiBtX2NvbnN0cmFpbnRzLmRldmljZVBpeGVsUmF0aW8pOworICAg IGVuZEFyZWEuc2V0V2lkdGgoZW5kQXJlYS53aWR0aCgpICogbV9jb25zdHJhaW50cy5kZXZpY2VQ aXhlbFJhdGlvKTsKKyAgICBlbmRBcmVhLnNldEhlaWdodChlbmRBcmVhLmhlaWdodCgpICogbV9j b25zdHJhaW50cy5kZXZpY2VQaXhlbFJhdGlvKTsKKworICAgIGNvbnN0IFFSZWN0RiB2aWV3cG9y dFJlY3QgPSBtX3ZpZXdwb3J0LT5ib3VuZGluZ1JlY3QoKTsKKworICAgIHFyZWFsIHRhcmdldENT U1NjYWxlID0gY3NzU2NhbGVGcm9tSXRlbSh2aWV3cG9ydFJlY3Quc2l6ZSgpLndpZHRoKCkgLyBl bmRBcmVhLnNpemUoKS53aWR0aCgpKTsKKyAgICBxcmVhbCBlbmRJdGVtU2NhbGUgPSBpdGVtU2Nh bGVGcm9tQ1NTKGlubmVyQm91bmRlZENTU1NjYWxlKHFNaW4odGFyZ2V0Q1NTU2NhbGUsIHFyZWFs KDIuNSkpKSk7CisKKyAgICAvLyBXZSB3YW50IHRvIGVuZCB1cCB3aXRoIHRoZSB0YXJnZXQgYXJl YSBmaWxsaW5nIHRoZSB3aG9sZSB3aWR0aCBvZiB0aGUgdmlld3BvcnQgKGlmIHBvc3NpYmxlKSwK KyAgICAvLyBhbmQgY2VudHJhbGl6ZWQgdmVydGljYWxseSB3aGVyZSB0aGUgdXNlciByZXF1ZXN0 ZWQgem9vbS4gVGh1cyBvdXIgaG90c3BvdCBpcyB0aGUgY2VudGVyIG9mCisgICAgLy8gdGhlIHRh cmdldEFyZWEgeC13aXNlIGFuZCB0aGUgcmVxdWVzdGVkIHpvb20gcG9zaXRpb24sIHktd2lzZS4K KyAgICBjb25zdCBRUG9pbnRGIGhvdHNwb3QgPSBRUG9pbnRGKGVuZEFyZWEuY2VudGVyKCkueCgp LCB0b3VjaFBvaW50LnkoKSAqIG1fY29uc3RyYWludHMuZGV2aWNlUGl4ZWxSYXRpbyk7CisgICAg Y29uc3QgUVBvaW50RiB2aWV3cG9ydEhvdHNwb3QgPSB2aWV3cG9ydFJlY3QuY2VudGVyKCk7CisK KyAgICBRUG9pbnRGIGVuZFBvc2l0aW9uID0gaG90c3BvdCAqIGVuZEl0ZW1TY2FsZSAtIHZpZXdw b3J0SG90c3BvdDsKKworICAgIFFSZWN0RiBlbmRQb3NSYW5nZSA9IGNvbXB1dGVQb3NSYW5nZUZv ckl0ZW1BdFNjYWxlKGVuZEl0ZW1TY2FsZSk7CisgICAgZW5kUG9zaXRpb24gPSBib3VuZFBvc2l0 aW9uKGVuZFBvc1JhbmdlLnRvcExlZnQoKSwgZW5kUG9zaXRpb24sIGVuZFBvc1JhbmdlLmJvdHRv bVJpZ2h0KCkpOworCisgICAgUVJlY3RGIGVuZFZpc2libGVDb250ZW50UmVjdChlbmRQb3NpdGlv biAvIGVuZEl0ZW1TY2FsZSwgdmlld3BvcnRSZWN0LnNpemUoKSAvIGVuZEl0ZW1TY2FsZSk7CisK KyAgICBhbmltYXRlSXRlbVJlY3RWaXNpYmxlKGVuZFZpc2libGVDb250ZW50UmVjdCk7Cit9CisK IHZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjplbnN1cmVDb250ZW50V2l0aGluVmll d3BvcnRCb3VuZGFyeSgpCiB7CiAgICAgaWYgKHNjcm9sbEFuaW1hdGlvbkFjdGl2ZSgpIHx8IHNj YWxlQW5pbWF0aW9uQWN0aXZlKCkpCkBAIC0yNDgsMjAgKzI5OSwxMiBAQCB2b2lkIFF0Vmlld3Bv cnRJbnRlcmFjdGlvbkVuZ2luZTo6ZW5zdXJlQ29udGVudFdpdGhpblZpZXdwb3J0Qm91bmRhcnko KQogICAgIFFSZWN0RiBlbmRQb3NSYW5nZSA9IGNvbXB1dGVQb3NSYW5nZUZvckl0ZW1BdFNjYWxl KGVuZEl0ZW1TY2FsZSk7CiAgICAgZW5kUG9zaXRpb24gPSBib3VuZFBvc2l0aW9uKGVuZFBvc1Jh bmdlLnRvcExlZnQoKSwgZW5kUG9zaXRpb24sIGVuZFBvc1JhbmdlLmJvdHRvbVJpZ2h0KCkpOwog Ci0gICAgUVJlY3RGIHN0YXJ0VmlzaWJsZUNvbnRlbnRSZWN0ID0gbV9jb250ZW50LT5tYXBSZWN0 RnJvbUl0ZW0obV92aWV3cG9ydCwgdmlld3BvcnRSZWN0KTsKICAgICBRUmVjdEYgZW5kVmlzaWJs ZUNvbnRlbnRSZWN0KGVuZFBvc2l0aW9uIC8gZW5kSXRlbVNjYWxlLCB2aWV3cG9ydFJlY3Quc2l6 ZSgpIC8gZW5kSXRlbVNjYWxlKTsKIAotICAgIGlmIChlbmRWaXNpYmxlQ29udGVudFJlY3QgPT0g c3RhcnRWaXNpYmxlQ29udGVudFJlY3QpCi0gICAgICAgIHJldHVybjsKLQotICAgIGlmICh1c2Vy SGFzU2NhbGVkQ29udGVudCkgewotICAgICAgICBtX3NjYWxlQW5pbWF0aW9uLT5zZXREdXJhdGlv bihrU2NhbGVBbmltYXRpb25EdXJhdGlvbk1pbGxpcyk7Ci0gICAgICAgIG1fc2NhbGVBbmltYXRp b24tPnNldEVhc2luZ0N1cnZlKFFFYXNpbmdDdXJ2ZTo6T3V0Q3ViaWMpOwotICAgICAgICBtX3Nj YWxlQW5pbWF0aW9uLT5zZXRTdGFydFZhbHVlKHN0YXJ0VmlzaWJsZUNvbnRlbnRSZWN0KTsKLSAg ICAgICAgbV9zY2FsZUFuaW1hdGlvbi0+c2V0RW5kVmFsdWUoZW5kVmlzaWJsZUNvbnRlbnRSZWN0 KTsKLSAgICAgICAgbV9zY2FsZUFuaW1hdGlvbi0+c3RhcnQoKTsKLSAgICB9IGVsc2UKKyAgICBp ZiAoIXVzZXJIYXNTY2FsZWRDb250ZW50KQogICAgICAgICBzZXRJdGVtUmVjdFZpc2libGUoZW5k VmlzaWJsZUNvbnRlbnRSZWN0KTsKKyAgICBlbHNlCisgICAgICAgIGFuaW1hdGVJdGVtUmVjdFZp c2libGUoZW5kVmlzaWJsZUNvbnRlbnRSZWN0KTsKIH0KIAogdm9pZCBRdFZpZXdwb3J0SW50ZXJh Y3Rpb25FbmdpbmU6OnJlc2V0KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaAppbmRleCA0YjRmYzdlLi45ZjUy OGQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydElu dGVyYWN0aW9uRW5naW5lLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmll d3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oCkBAIC02Niw3ICs2Niw5IEBAIHB1YmxpYzoKIAogICAg IHZvaWQgcmVzZXQoKTsKICAgICB2b2lkIHNldENvbnN0cmFpbnRzKGNvbnN0IENvbnN0cmFpbnRz Jik7CisKICAgICB2b2lkIHNldEl0ZW1SZWN0VmlzaWJsZShjb25zdCBRUmVjdEYmKTsKKyAgICB2 b2lkIGFuaW1hdGVJdGVtUmVjdFZpc2libGUoY29uc3QgUVJlY3RGJik7CiAKICAgICB2b2lkIHBh Z2VQb3NpdGlvblJlcXVlc3QoY29uc3QgUVBvaW50JiBwb3MpOwogCkBAIC04Nyw2ICs4OSw4IEBA IHB1YmxpYzoKICAgICB2b2lkIHBpbmNoR2VzdHVyZVJlcXVlc3RVcGRhdGUoY29uc3QgUVBvaW50 RiYgcGluY2hDZW50ZXJJbkNvbnRlbnRDb29yZGluYXRlcywgcXJlYWwgdG90YWxTY2FsZUZhY3Rv cik7CiAgICAgdm9pZCBwaW5jaEdlc3R1cmVFbmRlZCgpOwogCisgICAgdm9pZCB6b29tVG9BcmVh R2VzdHVyZUVuZGVkKGNvbnN0IFFQb2ludEYmIHRvdWNoUG9pbnQsIGNvbnN0IFFSZWN0RiYgZW5k QXJlYSk7CisKIFFfU0lHTkFMUzoKICAgICB2b2lkIHZpZXdwb3J0VXBkYXRlUmVxdWVzdGVkKCk7 CiAgICAgdm9pZCB2aWV3cG9ydFRyYWplY3RvcnlWZWN0b3JDaGFuZ2VkKGNvbnN0IFFQb2ludEYm KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94 eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3BwCmlu ZGV4IGVlMzc4ZDEuLjU2ZDM0MjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9xdC9RdFdlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0 L1F0V2ViUGFnZVByb3h5LmNwcApAQCAtNTQ4LDcgKzU0OCw5IEBAIFdLUGFnZVJlZiBRdFdlYlBh Z2VQcm94eTo6cGFnZVJlZigpIGNvbnN0CiAKIHZvaWQgUXRXZWJQYWdlUHJveHk6OmRpZEZpbmRa b29tYWJsZUFyZWEoY29uc3QgSW50UG9pbnQmIHRhcmdldCwgY29uc3QgSW50UmVjdCYgYXJlYSkK IHsKLSAgICBtX3ZpZXdJbnRlcmZhY2UtPmRpZEZpbmRab29tYWJsZUFyZWEoUVBvaW50KHRhcmdl dCksIFFSZWN0KGFyZWEpKTsKKyAgICAvLyBGSVhNRTogQXMgdGhlIGZpbmQgbWV0aG9kIG1pZ2h0 IG5vdCByZXNwb25kIGltbWVkaWF0ZWx5IGR1cmluZyBsb2FkIGV0YywKKyAgICAvLyB3ZSBzaG91 bGQgaWdub3JlIGFsbCBidXQgdGhlIGxhdGVzdCByZXF1ZXN0LgorICAgIG1faW50ZXJhY3Rpb25F bmdpbmUtPnpvb21Ub0FyZWFHZXN0dXJlRW5kZWQoUVBvaW50Rih0YXJnZXQpLCBRUmVjdEYoYXJl YSkpOwogfQogCiB2b2lkIFF0V2ViUGFnZVByb3h5OjpkaWRSZWNlaXZlTWVzc2FnZUZyb21OYXZp Z2F0b3JRdE9iamVjdChjb25zdCBTdHJpbmcmIG1lc3NhZ2UpCi0tIAoxLjcuNC4xCgo= 114515 2011-11-10 09:03:18 -0800 2011-11-14 04:15:45 -0800 Rebased 0001-Qt-the-QQuickWebView-should-support-double-tap-to-zo.patch text/plain 9626 kenneth RnJvbSAwMTM2OTdmOWZiMTQxNGZlNmZmYmUxOWE2MWVmODgxNzViOGFlZGFiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiA8a2VubmV0aEB3 ZWJraXQub3JnPgpEYXRlOiBUaHUsIDEwIE5vdiAyMDExIDE3OjQ3OjQxICswMTAwClN1YmplY3Q6 IFtQQVRDSF0gW1F0XSB0aGUgUVF1aWNrV2ViVmlldyBzaG91bGQgc3VwcG9ydCBkb3VibGUtdGFw IHRvIHpvb20KIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MjAzMAoK UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgoqIFVJUHJvY2Vzcy9xdC9RdFZpZXdJbnRlcmZh Y2UuY3BwOgoqIFVJUHJvY2Vzcy9xdC9RdFZpZXdJbnRlcmZhY2UuaDoKKiBVSVByb2Nlc3MvcXQv UXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmNwcDoKKFdlYktpdDo6UXRWaWV3cG9ydEludGVy YWN0aW9uRW5naW5lOjphbmltYXRlSXRlbVJlY3RWaXNpYmxlKToKKFdlYktpdDo6UXRWaWV3cG9y dEludGVyYWN0aW9uRW5naW5lOjp6b29tVG9BcmVhR2VzdHVyZUVuZGVkKToKKFdlYktpdDo6UXRW aWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjplbnN1cmVDb250ZW50V2l0aGluVmlld3BvcnRCb3Vu ZGFyeSk6CiogVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oOgoqIFVJ UHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5jcHA6CihRdFdlYlBhZ2VQcm94eTo6ZGlkRmluZFpv b21hYmxlQXJlYSk6Ci0tLQogU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nICAgICAgICAgICAgICAg ICAgICAgICAgICAgfCAgIDE3ICsrKysrCiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRW aWV3SW50ZXJmYWNlLmNwcCAgICB8ICAgIDQgLQogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0 L1F0Vmlld0ludGVyZmFjZS5oICAgICAgfCAgICAyIC0KIC4uLi9VSVByb2Nlc3MvcXQvUXRWaWV3 cG9ydEludGVyYWN0aW9uRW5naW5lLmNwcCAgIHwgICA2NSArKysrKysrKysrKysrKysrLS0tCiAu Li4vVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oICAgICB8ICAgIDQg KwogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmNwcCAgICAgfCAg ICA0ICstCiA2IGZpbGVzIGNoYW5nZWQsIDc4IGluc2VydGlvbnMoKyksIDE4IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZwppbmRleCBlNjUzOTY0Li5kNTQwMDBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEs MjIgQEAKIDIwMTEtMTEtMTAgIEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuICA8a2VubmV0aEB3 ZWJraXQub3JnPgogCisgICAgICAgIFtRdF0gdGhlIFFRdWlja1dlYlZpZXcgc2hvdWxkIHN1cHBv cnQgZG91YmxlLXRhcCB0byB6b29tCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD03MjAzMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0Vmlld0ludGVyZmFjZS5jcHA6CisgICAgICAg ICogVUlQcm9jZXNzL3F0L1F0Vmlld0ludGVyZmFjZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9x dC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpRdFZp ZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OmFuaW1hdGVJdGVtUmVjdFZpc2libGUpOgorICAgICAg ICAoV2ViS2l0OjpRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6Onpvb21Ub0FyZWFHZXN0dXJl RW5kZWQpOgorICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OmVu c3VyZUNvbnRlbnRXaXRoaW5WaWV3cG9ydEJvdW5kYXJ5KToKKyAgICAgICAgKiBVSVByb2Nlc3Mv cXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmg6CisgICAgICAgICogVUlQcm9jZXNzL3F0 L1F0V2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFF0V2ViUGFnZVByb3h5OjpkaWRGaW5kWm9v bWFibGVBcmVhKToKKworMjAxMS0xMS0xMCAgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4gIDxr ZW5uZXRoQHdlYmtpdC5vcmc+CisKICAgICAgICAgW1F0XSBDbGVhbiB1cCBob3cgc2luZ2UgLyBk b3VibGUgdGFwcyBhcmUgaGFuZGxlZAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NzIwMjQKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL3F0L1F0Vmlld0ludGVyZmFjZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQv UXRWaWV3SW50ZXJmYWNlLmNwcAppbmRleCBmYzdjMjU2Li42ZDgzMjliIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3SW50ZXJmYWNlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3SW50ZXJmYWNlLmNwcApAQCAtNDIsMTAgKzQy LDYgQEAgUXRWaWV3SW50ZXJmYWNlOjpRdFZpZXdJbnRlcmZhY2UoUVF1aWNrV2ViVmlldyogdmll d3BvcnRWaWV3LCBRUXVpY2tXZWJQYWdlKiBwYWcKICAgICBRX0FTU0VSVChtX3BhZ2VWaWV3KTsK IH0KIAotdm9pZCBRdFZpZXdJbnRlcmZhY2U6OmRpZEZpbmRab29tYWJsZUFyZWEoY29uc3QgUVBv aW50JiwgY29uc3QgUVJlY3QmKQotewotfQotCiBRdFNHVXBkYXRlUXVldWUqIFF0Vmlld0ludGVy ZmFjZTo6c2NlbmVHcmFwaFVwZGF0ZVF1ZXVlKCkgY29uc3QKIHsKICAgICByZXR1cm4gJm1fcGFn ZVZpZXctPmQtPnNnVXBkYXRlUXVldWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvcXQvUXRWaWV3SW50ZXJmYWNlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQv UXRWaWV3SW50ZXJmYWNlLmgKaW5kZXggYjA3ODk5MC4uNTRjODM0MSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld0ludGVyZmFjZS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdJbnRlcmZhY2UuaApAQCAtNzUsOCArNzUsNiBAQCBw dWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHN0YXJ0RHJhZyhRdDo6RHJvcEFjdGlvbnMgc3VwcG9y dGVkRHJvcEFjdGlvbnMsIGNvbnN0IFFJbWFnZSYgZHJhZ0ltYWdlLCBRTWltZURhdGEqLCBRUG9p bnQqIGNsaWVudFBvc2l0aW9uLCBRUG9pbnQqIGdsb2JhbFBvc2l0aW9uLCBRdDo6RHJvcEFjdGlv biopOwogICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFuZ2VWaWV3cG9ydFByb3BlcnRpZXMoY29uc3Qg V2ViQ29yZTo6Vmlld3BvcnRBcmd1bWVudHMmKTsKIAotICAgIHZpcnR1YWwgdm9pZCBkaWRGaW5k Wm9vbWFibGVBcmVhKGNvbnN0IFFQb2ludCYsIGNvbnN0IFFSZWN0Jik7Ci0KICAgICB2aXJ0dWFs IHZvaWQgZGlkQ2hhbmdlVXJsKGNvbnN0IFFVcmwmKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkQ2hh bmdlVGl0bGUoY29uc3QgUVN0cmluZyYpOwogICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFuZ2VUb29s VGlwKGNvbnN0IFFTdHJpbmcmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHAKaW5kZXggMDdlOWI0MC4u ZDAxZGViNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3Bv cnRJbnRlcmFjdGlvbkVuZ2luZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0 L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHAKQEAgLTE0Myw2ICsxNDMsMjEgQEAgdm9p ZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnNldEl0ZW1SZWN0VmlzaWJsZShjb25zdCBR UmVjdEYmIGl0ZW1SZWN0KQogICAgIG1fY29udGVudC0+c2V0UG9zKC0gaXRlbVJlY3QudG9wTGVm dCgpICogaXRlbVNjYWxlKTsKIH0KIAordm9pZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6 OmFuaW1hdGVJdGVtUmVjdFZpc2libGUoY29uc3QgUVJlY3RGJiBpdGVtUmVjdCkKK3sKKyAgICBR UmVjdEYgY3VycmVudEl0ZW1SZWN0VmlzaWJsZSA9IG1fY29udGVudC0+bWFwUmVjdEZyb21JdGVt KG1fdmlld3BvcnQsIG1fdmlld3BvcnQtPmJvdW5kaW5nUmVjdCgpKTsKKyAgICBpZiAoaXRlbVJl Y3QgPT0gY3VycmVudEl0ZW1SZWN0VmlzaWJsZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9z Y2FsZUFuaW1hdGlvbi0+c2V0RHVyYXRpb24oa1NjYWxlQW5pbWF0aW9uRHVyYXRpb25NaWxsaXMp OworICAgIG1fc2NhbGVBbmltYXRpb24tPnNldEVhc2luZ0N1cnZlKFFFYXNpbmdDdXJ2ZTo6T3V0 Q3ViaWMpOworCisgICAgbV9zY2FsZUFuaW1hdGlvbi0+c2V0U3RhcnRWYWx1ZShjdXJyZW50SXRl bVJlY3RWaXNpYmxlKTsKKyAgICBtX3NjYWxlQW5pbWF0aW9uLT5zZXRFbmRWYWx1ZShpdGVtUmVj dCk7CisKKyAgICBtX3NjYWxlQW5pbWF0aW9uLT5zdGFydCgpOworfQorCiB2b2lkIFF0Vmlld3Bv cnRJbnRlcmFjdGlvbkVuZ2luZTo6c2NhbGVBbmltYXRpb25TdGF0ZUNoYW5nZWQoUUFic3RyYWN0 QW5pbWF0aW9uOjpTdGF0ZSBuZXdTdGF0ZSwgUUFic3RyYWN0QW5pbWF0aW9uOjpTdGF0ZSAvKm9s ZFN0YXRlKi8pCiB7CiAgICAgc3dpdGNoIChuZXdTdGF0ZSkgewpAQCAtMjI3LDYgKzI0Miw0MiBA QCBRUmVjdEYgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpjb21wdXRlUG9zUmFuZ2VGb3JJ dGVtQXRTY2FsZShxcmVhbCBpdGVtU2NhbAogICAgIHJldHVybiBRUmVjdEYoUVBvaW50RigwLCAw KSwgUVNpemVGKGhvcml6b250YWxSYW5nZSwgdmVydGljYWxSYW5nZSkpOwogfQogCit2b2lkIFF0 Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6em9vbVRvQXJlYUdlc3R1cmVFbmRlZChjb25zdCBR UG9pbnRGJiB0b3VjaFBvaW50LCBjb25zdCBRUmVjdEYmIHRhcmdldEFyZWEpCit7CisgICAgaWYg KHNjcm9sbEFuaW1hdGlvbkFjdGl2ZSgpIHx8IHNjYWxlQW5pbWF0aW9uQWN0aXZlKCkpCisgICAg ICAgIHJldHVybjsKKworICAgIGlmICghdGFyZ2V0QXJlYS5pc1ZhbGlkKCkpCisgICAgICAgIHJl dHVybjsKKworICAgIGludCBtYXJnaW4gPSAxMDsgLy8gV2Ugd2FudCBhdCBsZWFzdCBhIGxpdHRs ZSBiaXQgb3IgbWFyZ2luLgorICAgIFFSZWN0RiBlbmRBcmVhID0gdGFyZ2V0QXJlYS5hZGp1c3Rl ZCgtbWFyZ2luLCAtbWFyZ2luLCBtYXJnaW4sIG1hcmdpbik7CisgICAgZW5kQXJlYS5zZXRYKGVu ZEFyZWEueCgpICogbV9jb25zdHJhaW50cy5kZXZpY2VQaXhlbFJhdGlvKTsKKyAgICBlbmRBcmVh LnNldFkoZW5kQXJlYS55KCkgKiBtX2NvbnN0cmFpbnRzLmRldmljZVBpeGVsUmF0aW8pOworICAg IGVuZEFyZWEuc2V0V2lkdGgoZW5kQXJlYS53aWR0aCgpICogbV9jb25zdHJhaW50cy5kZXZpY2VQ aXhlbFJhdGlvKTsKKyAgICBlbmRBcmVhLnNldEhlaWdodChlbmRBcmVhLmhlaWdodCgpICogbV9j b25zdHJhaW50cy5kZXZpY2VQaXhlbFJhdGlvKTsKKworICAgIGNvbnN0IFFSZWN0RiB2aWV3cG9y dFJlY3QgPSBtX3ZpZXdwb3J0LT5ib3VuZGluZ1JlY3QoKTsKKworICAgIHFyZWFsIHRhcmdldENT U1NjYWxlID0gY3NzU2NhbGVGcm9tSXRlbSh2aWV3cG9ydFJlY3Quc2l6ZSgpLndpZHRoKCkgLyBl bmRBcmVhLnNpemUoKS53aWR0aCgpKTsKKyAgICBxcmVhbCBlbmRJdGVtU2NhbGUgPSBpdGVtU2Nh bGVGcm9tQ1NTKGlubmVyQm91bmRlZENTU1NjYWxlKHFNaW4odGFyZ2V0Q1NTU2NhbGUsIHFyZWFs KDIuNSkpKSk7CisKKyAgICAvLyBXZSB3YW50IHRvIGVuZCB1cCB3aXRoIHRoZSB0YXJnZXQgYXJl YSBmaWxsaW5nIHRoZSB3aG9sZSB3aWR0aCBvZiB0aGUgdmlld3BvcnQgKGlmIHBvc3NpYmxlKSwK KyAgICAvLyBhbmQgY2VudHJhbGl6ZWQgdmVydGljYWxseSB3aGVyZSB0aGUgdXNlciByZXF1ZXN0 ZWQgem9vbS4gVGh1cyBvdXIgaG90c3BvdCBpcyB0aGUgY2VudGVyIG9mCisgICAgLy8gdGhlIHRh cmdldEFyZWEgeC13aXNlIGFuZCB0aGUgcmVxdWVzdGVkIHpvb20gcG9zaXRpb24sIHktd2lzZS4K KyAgICBjb25zdCBRUG9pbnRGIGhvdHNwb3QgPSBRUG9pbnRGKGVuZEFyZWEuY2VudGVyKCkueCgp LCB0b3VjaFBvaW50LnkoKSAqIG1fY29uc3RyYWludHMuZGV2aWNlUGl4ZWxSYXRpbyk7CisgICAg Y29uc3QgUVBvaW50RiB2aWV3cG9ydEhvdHNwb3QgPSB2aWV3cG9ydFJlY3QuY2VudGVyKCk7CisK KyAgICBRUG9pbnRGIGVuZFBvc2l0aW9uID0gaG90c3BvdCAqIGVuZEl0ZW1TY2FsZSAtIHZpZXdw b3J0SG90c3BvdDsKKworICAgIFFSZWN0RiBlbmRQb3NSYW5nZSA9IGNvbXB1dGVQb3NSYW5nZUZv ckl0ZW1BdFNjYWxlKGVuZEl0ZW1TY2FsZSk7CisgICAgZW5kUG9zaXRpb24gPSBib3VuZFBvc2l0 aW9uKGVuZFBvc1JhbmdlLnRvcExlZnQoKSwgZW5kUG9zaXRpb24sIGVuZFBvc1JhbmdlLmJvdHRv bVJpZ2h0KCkpOworCisgICAgUVJlY3RGIGVuZFZpc2libGVDb250ZW50UmVjdChlbmRQb3NpdGlv biAvIGVuZEl0ZW1TY2FsZSwgdmlld3BvcnRSZWN0LnNpemUoKSAvIGVuZEl0ZW1TY2FsZSk7CisK KyAgICBhbmltYXRlSXRlbVJlY3RWaXNpYmxlKGVuZFZpc2libGVDb250ZW50UmVjdCk7Cit9CisK IHZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjplbnN1cmVDb250ZW50V2l0aGluVmll d3BvcnRCb3VuZGFyeSgpCiB7CiAgICAgaWYgKHNjcm9sbEFuaW1hdGlvbkFjdGl2ZSgpIHx8IHNj YWxlQW5pbWF0aW9uQWN0aXZlKCkpCkBAIC0yNDgsMjAgKzI5OSwxMiBAQCB2b2lkIFF0Vmlld3Bv cnRJbnRlcmFjdGlvbkVuZ2luZTo6ZW5zdXJlQ29udGVudFdpdGhpblZpZXdwb3J0Qm91bmRhcnko KQogICAgIFFSZWN0RiBlbmRQb3NSYW5nZSA9IGNvbXB1dGVQb3NSYW5nZUZvckl0ZW1BdFNjYWxl KGVuZEl0ZW1TY2FsZSk7CiAgICAgZW5kUG9zaXRpb24gPSBib3VuZFBvc2l0aW9uKGVuZFBvc1Jh bmdlLnRvcExlZnQoKSwgZW5kUG9zaXRpb24sIGVuZFBvc1JhbmdlLmJvdHRvbVJpZ2h0KCkpOwog Ci0gICAgUVJlY3RGIHN0YXJ0VmlzaWJsZUNvbnRlbnRSZWN0ID0gbV9jb250ZW50LT5tYXBSZWN0 RnJvbUl0ZW0obV92aWV3cG9ydCwgdmlld3BvcnRSZWN0KTsKICAgICBRUmVjdEYgZW5kVmlzaWJs ZUNvbnRlbnRSZWN0KGVuZFBvc2l0aW9uIC8gZW5kSXRlbVNjYWxlLCB2aWV3cG9ydFJlY3Quc2l6 ZSgpIC8gZW5kSXRlbVNjYWxlKTsKIAotICAgIGlmIChlbmRWaXNpYmxlQ29udGVudFJlY3QgPT0g c3RhcnRWaXNpYmxlQ29udGVudFJlY3QpCi0gICAgICAgIHJldHVybjsKLQotICAgIGlmICh1c2Vy SGFzU2NhbGVkQ29udGVudCkgewotICAgICAgICBtX3NjYWxlQW5pbWF0aW9uLT5zZXREdXJhdGlv bihrU2NhbGVBbmltYXRpb25EdXJhdGlvbk1pbGxpcyk7Ci0gICAgICAgIG1fc2NhbGVBbmltYXRp b24tPnNldEVhc2luZ0N1cnZlKFFFYXNpbmdDdXJ2ZTo6T3V0Q3ViaWMpOwotICAgICAgICBtX3Nj YWxlQW5pbWF0aW9uLT5zZXRTdGFydFZhbHVlKHN0YXJ0VmlzaWJsZUNvbnRlbnRSZWN0KTsKLSAg ICAgICAgbV9zY2FsZUFuaW1hdGlvbi0+c2V0RW5kVmFsdWUoZW5kVmlzaWJsZUNvbnRlbnRSZWN0 KTsKLSAgICAgICAgbV9zY2FsZUFuaW1hdGlvbi0+c3RhcnQoKTsKLSAgICB9IGVsc2UKKyAgICBp ZiAoIXVzZXJIYXNTY2FsZWRDb250ZW50KQogICAgICAgICBzZXRJdGVtUmVjdFZpc2libGUoZW5k VmlzaWJsZUNvbnRlbnRSZWN0KTsKKyAgICBlbHNlCisgICAgICAgIGFuaW1hdGVJdGVtUmVjdFZp c2libGUoZW5kVmlzaWJsZUNvbnRlbnRSZWN0KTsKIH0KIAogdm9pZCBRdFZpZXdwb3J0SW50ZXJh Y3Rpb25FbmdpbmU6OnJlc2V0KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaAppbmRleCA0YjRmYzdlLi45ZjUy OGQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydElu dGVyYWN0aW9uRW5naW5lLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmll d3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oCkBAIC02Niw3ICs2Niw5IEBAIHB1YmxpYzoKIAogICAg IHZvaWQgcmVzZXQoKTsKICAgICB2b2lkIHNldENvbnN0cmFpbnRzKGNvbnN0IENvbnN0cmFpbnRz Jik7CisKICAgICB2b2lkIHNldEl0ZW1SZWN0VmlzaWJsZShjb25zdCBRUmVjdEYmKTsKKyAgICB2 b2lkIGFuaW1hdGVJdGVtUmVjdFZpc2libGUoY29uc3QgUVJlY3RGJik7CiAKICAgICB2b2lkIHBh Z2VQb3NpdGlvblJlcXVlc3QoY29uc3QgUVBvaW50JiBwb3MpOwogCkBAIC04Nyw2ICs4OSw4IEBA IHB1YmxpYzoKICAgICB2b2lkIHBpbmNoR2VzdHVyZVJlcXVlc3RVcGRhdGUoY29uc3QgUVBvaW50 RiYgcGluY2hDZW50ZXJJbkNvbnRlbnRDb29yZGluYXRlcywgcXJlYWwgdG90YWxTY2FsZUZhY3Rv cik7CiAgICAgdm9pZCBwaW5jaEdlc3R1cmVFbmRlZCgpOwogCisgICAgdm9pZCB6b29tVG9BcmVh R2VzdHVyZUVuZGVkKGNvbnN0IFFQb2ludEYmIHRvdWNoUG9pbnQsIGNvbnN0IFFSZWN0RiYgZW5k QXJlYSk7CisKIFFfU0lHTkFMUzoKICAgICB2b2lkIHZpZXdwb3J0VXBkYXRlUmVxdWVzdGVkKCk7 CiAgICAgdm9pZCB2aWV3cG9ydFRyYWplY3RvcnlWZWN0b3JDaGFuZ2VkKGNvbnN0IFFQb2ludEYm KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94 eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3BwCmlu ZGV4IGVlMzc4ZDEuLjU2ZDM0MjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9xdC9RdFdlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0 L1F0V2ViUGFnZVByb3h5LmNwcApAQCAtNTQ4LDcgKzU0OCw5IEBAIFdLUGFnZVJlZiBRdFdlYlBh Z2VQcm94eTo6cGFnZVJlZigpIGNvbnN0CiAKIHZvaWQgUXRXZWJQYWdlUHJveHk6OmRpZEZpbmRa b29tYWJsZUFyZWEoY29uc3QgSW50UG9pbnQmIHRhcmdldCwgY29uc3QgSW50UmVjdCYgYXJlYSkK IHsKLSAgICBtX3ZpZXdJbnRlcmZhY2UtPmRpZEZpbmRab29tYWJsZUFyZWEoUVBvaW50KHRhcmdl dCksIFFSZWN0KGFyZWEpKTsKKyAgICAvLyBGSVhNRTogQXMgdGhlIGZpbmQgbWV0aG9kIG1pZ2h0 IG5vdCByZXNwb25kIGltbWVkaWF0ZWx5IGR1cmluZyBsb2FkIGV0YywKKyAgICAvLyB3ZSBzaG91 bGQgaWdub3JlIGFsbCBidXQgdGhlIGxhdGVzdCByZXF1ZXN0LgorICAgIG1faW50ZXJhY3Rpb25F bmdpbmUtPnpvb21Ub0FyZWFHZXN0dXJlRW5kZWQoUVBvaW50Rih0YXJnZXQpLCBRUmVjdEYoYXJl YSkpOwogfQogCiB2b2lkIFF0V2ViUGFnZVByb3h5OjpkaWRSZWNlaXZlTWVzc2FnZUZyb21OYXZp Z2F0b3JRdE9iamVjdChjb25zdCBTdHJpbmcmIG1lc3NhZ2UpCi0tIAoxLjcuNC4xCgo=