91801 2012-07-19 16:58:35 -0700 [Chromium] Add WebView::zoomToFindInPageRect for Android 2012-07-20 12:08:05 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 91661 1 abarth abarth dglazkov eric fishd jamesr tkent+wkapi tony webkit.review.bot oldest_to_newest 674082 0 abarth 2012-07-19 16:58:35 -0700 [Chromium] Add WebView::zoomToFindInPageRect for Android 674084 1 153380 abarth 2012-07-19 17:01:16 -0700 Created attachment 153380 Patch 674111 2 webkit.review.bot 2012-07-19 21:06:31 -0700 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 674659 3 abarth 2012-07-20 09:54:22 -0700 Anyone care to review this patch? It's relatively straightforward. 674665 4 153380 tony 2012-07-20 10:06:02 -0700 Comment on attachment 153380 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=153380&action=review > Source/WebKit/chromium/src/WebViewImpl.cpp:1087 > + double durationSec = isDoubleTap ? 0.25 : 0; Nit: Should we move .25 into a named constant? Also, durationSec -> durationSeconds 674668 5 153380 fishd 2012-07-20 10:10:18 -0700 Comment on attachment 153380 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=153380&action=review > Source/WebKit/chromium/src/WebViewImpl.cpp:1076 > +void WebViewImpl::animateZoomAroundPoint(const IntPoint& point, AutoZoomType zoomType) nit: methods defined in the .cpp file should be listed in the same order as they appear in the .h file :-) 674675 6 abarth 2012-07-20 10:15:59 -0700 (In reply to comment #5) > (From update of attachment 153380 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=153380&action=review > > > Source/WebKit/chromium/src/WebViewImpl.cpp:1076 > > +void WebViewImpl::animateZoomAroundPoint(const IntPoint& point, AutoZoomType zoomType) > > nit: methods defined in the .cpp file should be listed in the same order as they appear in the .h file :-) I was afraid you were going to say that. That's a big job for WebViewImpl.cpp. :) I've tried to put these diffs in the same location in the file as they exist in the chromium-android branch to make it easier for the folks doing the merges from trunk to the branch. I'll make you a deal: once we've unforked WebViewImpl.cpp, I'll fix the function ordering for the entire file. 674707 7 153537 abarth 2012-07-20 10:35:23 -0700 Created attachment 153537 Patch for landing 674775 8 153537 webkit.review.bot 2012-07-20 11:19:56 -0700 Comment on attachment 153537 Patch for landing Clearing flags on attachment: 153537 Committed r123241: <http://trac.webkit.org/changeset/123241> 674776 9 webkit.review.bot 2012-07-20 11:20:01 -0700 All reviewed patches have been landed. Closing bug. 674820 10 fishd 2012-07-20 12:08:05 -0700 (In reply to comment #6) > I'll make you a deal: once we've unforked WebViewImpl.cpp, I'll fix the function ordering for the entire file. OK, no worries. 153380 2012-07-19 17:01:16 -0700 2012-07-20 10:35:18 -0700 Patch bug-91801-20120719170115.patch text/plain 4214 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzMTM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDVmZDZjNmJiYjc5NThmOGU3N2ExYWFmYjQxNjY1MWE5NzNiMzA0MGIuLjdiMmI0N2EzMjAxZjUx MTAyZDc3ZDExNzZlYTk1YzBmYTdkM2ZkMmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDUgKzEsMjggQEAKIDIwMTItMDctMTkgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9y Zz4KIAorICAgICAgICBbQ2hyb21pdW1dIEFkZCBXZWJWaWV3Ojp6b29tVG9GaW5kSW5QYWdlUmVj dCBmb3IgQW5kcm9pZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9OTE4MDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBPbiBBbmRyb2lkLCB3aGVuIHlvdSBmaW5kIGluIHBhZ2UsIHdlIHNjYWxlIHRoZSB2aWV3 cG9ydCB0byByZXZlYWwgd2hhdAorICAgICAgICB5b3UndmUgZm91bmQgKGJlY2F1c2UgdGhlIHNj cmVlbiBpcyBzbWFsbCkuIFRoaXMgZnVuY3Rpb24gaW5zdHJ1Y3RzIHRoZQorICAgICAgICBXZWJW aWV3IHRvIHpvb20gdG8gZGlzcGxheSBhIGdpdmVuIHJlY3QuCisKKyAgICAgICAgKiBwdWJsaWMv V2ViVmlldy5oOgorICAgICAgICAoV2ViVmlldyk6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBs LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmFuaW1hdGVab29tQXJvdW5kUG9p bnQpOgorICAgICAgICAgICAgLSBUaGlzIGZ1bmN0aW9uIGlzIGEgYml0IG1vcmUgZ2VuZXJhbCB0 aGFuIG5lY2Vzc2FyeSBmb3IgdGhpcyBwYXRjaAorICAgICAgICAgICAgICBiZWNhdXNlIGl0IGlz IGFsc28gdXNlZCBpbiBvdGhlciBjYXNlcyBmb3IgYW5pbWF0aW5nIGEgem9vbQorICAgICAgICAg ICAgICBhcm91bmQgYSBnaXZlbiBwb2ludCAoZS5nLiwgZG91YmxlLXRhcCB0byB6b29tKS4gVGhl c2UgdXNlcyB3aWxsCisgICAgICAgICAgICAgIGJlIHVwc3RyZWFtZWQgaW4gbGF0ZXIgcGF0Y2hl cy4KKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6Onpvb21Ub0ZpbmRJblBhZ2VSZWN0KToK KyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuaDoKKyAgICAgICAgKFdlYlZpZXdJbXBsKToKKwor MjAxMi0wNy0xOSAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgorCiAgICAgICAgIFtD aHJvbWl1bV0gV2ViVmlldyBpcyBtaXNzaW5nIGlzU2VsZWN0aW9uRWRpdGFibGUgYW5kIGJhY2tn cm91bmRDb2xvciB3aGljaCBhcmUgdXNlZCBieSBjaHJvbWl1bS1hbmRyb2lkCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTY3MQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3LmggYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3LmgKaW5kZXggN2RiNjg3YTZlMDYyMDM1OTBiYTYzMzdm YTczNWExMjA3OGJlMDM3OC4uMDljOTI5YzBjN2ExMjkzMDJjZWFkNjc1ZWFiZmYxZGY1NTExZjE5 YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlldy5oCisr KyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXcuaApAQCAtMTk2LDYgKzE5 Niw5IEBAIHB1YmxpYzoKICAgICAvLyBwcmV2aW91cyBlbGVtZW50IGluIHRoZSB0YWIgc2VxdWVu Y2UgKGlmIHJldmVyc2UgaXMgdHJ1ZSkuCiAgICAgdmlydHVhbCB2b2lkIGFkdmFuY2VGb2N1cyhi b29sIHJldmVyc2UpIHsgfQogCisgICAgLy8gQW5pbWF0ZSBhIHNjYWxlIGludG8gdGhlIHNwZWNp ZmllZCBmaW5kLWluLXBhZ2UgcmVjdC4KKyAgICB2aXJ0dWFsIHZvaWQgem9vbVRvRmluZEluUGFn ZVJlY3QoY29uc3QgV2ViUmVjdCYpID0gMDsKKwogCiAgICAgLy8gWm9vbSAtLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcCBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAppbmRleCBhYzE4ODdmMjAy YTU1ZmU1NjljNjM3ZTc4MGUwZDE5ZTRkYTRiYjM0Li43ZmU1ZjdhMmI5NmQ1ZDhhYWJlY2RmZmRh OTQ3Y2I1YmY0NGFjZDQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9X ZWJWaWV3SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0lt cGwuY3BwCkBAIC0xMDczLDYgKzEwNzMsMjcgQEAgdm9pZCBXZWJWaWV3SW1wbDo6Y29tcHV0ZVNj YWxlQW5kU2Nyb2xsRm9ySGl0UmVjdChjb25zdCBXZWJSZWN0JiBoaXRSZWN0LCBBdXRvWm8KIH0K ICNlbmRpZgogCit2b2lkIFdlYlZpZXdJbXBsOjphbmltYXRlWm9vbUFyb3VuZFBvaW50KGNvbnN0 IEludFBvaW50JiBwb2ludCwgQXV0b1pvb21UeXBlIHpvb21UeXBlKQoreworI2lmIEVOQUJMRShH RVNUVVJFX0VWRU5UUykKKyAgICBpZiAoIW1haW5GcmFtZUltcGwoKSkKKyAgICAgICAgcmV0dXJu OworCisgICAgZmxvYXQgc2NhbGU7CisgICAgV2ViUG9pbnQgc2Nyb2xsOworICAgIGNvbXB1dGVT Y2FsZUFuZFNjcm9sbEZvckhpdFJlY3QoV2ViUmVjdChwb2ludC54KCksIHBvaW50LnkoKSwgMCwg MCksIHpvb21UeXBlLCBzY2FsZSwgc2Nyb2xsKTsKKworICAgIGJvb2wgaXNEb3VibGVUYXAgPSAo em9vbVR5cGUgPT0gRG91YmxlVGFwKTsKKyAgICBkb3VibGUgZHVyYXRpb25TZWMgPSBpc0RvdWJs ZVRhcCA/IDAuMjUgOiAwOworICAgIHN0YXJ0UGFnZVNjYWxlQW5pbWF0aW9uKHNjcm9sbCwgaXNE b3VibGVUYXAsIHNjYWxlLCBkdXJhdGlvblNlYyk7CisjZW5kaWYKK30KKwordm9pZCBXZWJWaWV3 SW1wbDo6em9vbVRvRmluZEluUGFnZVJlY3QoY29uc3QgV2ViUmVjdCYgcmVjdCkKK3sKKyAgICBh bmltYXRlWm9vbUFyb3VuZFBvaW50KEludFJlY3QocmVjdCkuY2VudGVyKCksIEZpbmRJblBhZ2Up OworfQorCiB2b2lkIFdlYlZpZXdJbXBsOjpudW1iZXJPZldoZWVsRXZlbnRIYW5kbGVyc0NoYW5n ZWQodW5zaWduZWQgbnVtYmVyT2ZXaGVlbEhhbmRsZXJzKQogewogICAgIGlmIChtX2NsaWVudCkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmggYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCmluZGV4IDZlNmViNzViMDUx OTMwNjFmMTVjNmY2MzYzZDdlNWM4NDEwYWQ1YjAuLjdlOWFlZWRhYjAwYTcxNGYxNzBjMmQ5N2Jk NTU4NjgzNjM4OWVjNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YlZpZXdJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwu aApAQCAtMjA1LDYgKzIwNSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgY2xlYXJGb2N1 c2VkTm9kZSgpOwogICAgIHZpcnR1YWwgdm9pZCBzY3JvbGxGb2N1c2VkTm9kZUludG9WaWV3KCk7 CiAgICAgdmlydHVhbCB2b2lkIHNjcm9sbEZvY3VzZWROb2RlSW50b1JlY3QoY29uc3QgV2ViUmVj dCYpOworICAgIHZpcnR1YWwgdm9pZCB6b29tVG9GaW5kSW5QYWdlUmVjdChjb25zdCBXZWJSZWN0 Jik7CiAgICAgdmlydHVhbCB2b2lkIGFkdmFuY2VGb2N1cyhib29sIHJldmVyc2UpOwogICAgIHZp cnR1YWwgZG91YmxlIHpvb21MZXZlbCgpOwogICAgIHZpcnR1YWwgZG91YmxlIHNldFpvb21MZXZl bChib29sIHRleHRPbmx5LCBkb3VibGUgem9vbUxldmVsKTsKQEAgLTU0Niw2ICs1NDcsNyBAQCBw dWJsaWM6CiAjaWYgRU5BQkxFKEdFU1RVUkVfRVZFTlRTKQogICAgIHZvaWQgY29tcHV0ZVNjYWxl QW5kU2Nyb2xsRm9ySGl0UmVjdChjb25zdCBXZWJSZWN0JiBoaXRSZWN0LCBBdXRvWm9vbVR5cGUs IGZsb2F0JiBzY2FsZSwgV2ViUG9pbnQmIHNjcm9sbCk7CiAjZW5kaWYKKyAgICB2b2lkIGFuaW1h dGVab29tQXJvdW5kUG9pbnQoY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmLCBBdXRvWm9vbVR5cGUp OwogCiAgICAgdm9pZCBsb3NlQ29tcG9zaXRvckNvbnRleHQoaW50IG51bVRpbWVzKTsKIAo= 153537 2012-07-20 10:35:23 -0700 2012-07-20 11:19:56 -0700 Patch for landing bug-91801-20120720103519.patch text/plain 5738 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzMTM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDVmZDZjNmJiYjc5NThmOGU3N2ExYWFmYjQxNjY1MWE5NzNiMzA0MGIuLjFhZmM3OWU0MzViNzhj OGQ5Y2Y4M2U4ZTRmNTNiMjliZDEzOTgxZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDUgKzEsMjggQEAKIDIwMTItMDctMTkgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9y Zz4KIAorICAgICAgICBbQ2hyb21pdW1dIEFkZCBXZWJWaWV3Ojp6b29tVG9GaW5kSW5QYWdlUmVj dCBmb3IgQW5kcm9pZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9OTE4MDEKKworICAgICAgICBSZXZpZXdlZCBieSBUb255IENoYW5nLgorCisgICAgICAg IE9uIEFuZHJvaWQsIHdoZW4geW91IGZpbmQgaW4gcGFnZSwgd2Ugc2NhbGUgdGhlIHZpZXdwb3J0 IHRvIHJldmVhbCB3aGF0CisgICAgICAgIHlvdSd2ZSBmb3VuZCAoYmVjYXVzZSB0aGUgc2NyZWVu IGlzIHNtYWxsKS4gVGhpcyBmdW5jdGlvbiBpbnN0cnVjdHMgdGhlCisgICAgICAgIFdlYlZpZXcg dG8gem9vbSB0byBkaXNwbGF5IGEgZ2l2ZW4gcmVjdC4KKworICAgICAgICAqIHB1YmxpYy9XZWJW aWV3Lmg6CisgICAgICAgIChXZWJWaWV3KToKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6YW5pbWF0ZVpvb21Bcm91bmRQb2ludCk6 CisgICAgICAgICAgICAtIFRoaXMgZnVuY3Rpb24gaXMgYSBiaXQgbW9yZSBnZW5lcmFsIHRoYW4g bmVjZXNzYXJ5IGZvciB0aGlzIHBhdGNoCisgICAgICAgICAgICAgIGJlY2F1c2UgaXQgaXMgYWxz byB1c2VkIGluIG90aGVyIGNhc2VzIGZvciBhbmltYXRpbmcgYSB6b29tCisgICAgICAgICAgICAg IGFyb3VuZCBhIGdpdmVuIHBvaW50IChlLmcuLCBkb3VibGUtdGFwIHRvIHpvb20pLiBUaGVzZSB1 c2VzIHdpbGwKKyAgICAgICAgICAgICAgYmUgdXBzdHJlYW1lZCBpbiBsYXRlciBwYXRjaGVzLgor ICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6em9vbVRvRmluZEluUGFnZVJlY3QpOgorICAg ICAgICAqIHNyYy9XZWJWaWV3SW1wbC5oOgorICAgICAgICAoV2ViVmlld0ltcGwpOgorCisyMDEy LTA3LTE5ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKICAgICAgICAgW0Nocm9t aXVtXSBXZWJWaWV3IGlzIG1pc3NpbmcgaXNTZWxlY3Rpb25FZGl0YWJsZSBhbmQgYmFja2dyb3Vu ZENvbG9yIHdoaWNoIGFyZSB1c2VkIGJ5IGNocm9taXVtLWFuZHJvaWQKICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkxNjcxCiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXcuaCBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vcHVibGljL1dlYlZpZXcuaAppbmRleCA3ZGI2ODdhNmUwNjIwMzU5MGJhNjMzN2ZhNzM1 YTEyMDc4YmUwMzc4Li4wOWM5MjljMGM3YTEyOTMwMmNlYWQ2NzVlYWJmZjFkZjU1MTFmMTliIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3LmgKKysrIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlldy5oCkBAIC0xOTYsNiArMTk2LDkg QEAgcHVibGljOgogICAgIC8vIHByZXZpb3VzIGVsZW1lbnQgaW4gdGhlIHRhYiBzZXF1ZW5jZSAo aWYgcmV2ZXJzZSBpcyB0cnVlKS4KICAgICB2aXJ0dWFsIHZvaWQgYWR2YW5jZUZvY3VzKGJvb2wg cmV2ZXJzZSkgeyB9CiAKKyAgICAvLyBBbmltYXRlIGEgc2NhbGUgaW50byB0aGUgc3BlY2lmaWVk IGZpbmQtaW4tcGFnZSByZWN0LgorICAgIHZpcnR1YWwgdm9pZCB6b29tVG9GaW5kSW5QYWdlUmVj dChjb25zdCBXZWJSZWN0JikgPSAwOworCiAKICAgICAvLyBab29tIC0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCmluZGV4IGFjMTg4N2YyMDJhNTVm ZTU2OWM2MzdlNzgwZTBkMTllNGRhNGJiMzQuLjRiMjQ0M2UzODg3MWYyZWJmMmMwYWYyZWY3YTJl NjI0NjVkMzEwMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZp ZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5j cHAKQEAgLTE5NSw2ICsxOTUsOCBAQCBzdGF0aWMgY29uc3QgaW50IHRvdWNoUG9pbnRQYWRkaW5n ID0gMzI7CiBzdGF0aWMgY29uc3QgZmxvYXQgbWluU2NhbGVEaWZmZXJlbmNlID0gMC4wMWY7CiBz dGF0aWMgY29uc3QgZmxvYXQgZG91YmxlVGFwWm9vbUNvbnRlbnREZWZhdWx0TWFyZ2luID0gNTsK IHN0YXRpYyBjb25zdCBmbG9hdCBkb3VibGVUYXBab29tQ29udGVudE1pbmltdW1NYXJnaW4gPSAy Oworc3RhdGljIGNvbnN0IGRvdWJsZSBkb3VibGVUYWJab29tQW5pbWF0aW9uRHVyYXRpb25JblNl Y29uZHMgPSAwLjI1OworCiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCkBAIC03NDUsMTAgKzc0Nywx MCBAQCB2b2lkIFdlYlZpZXdJbXBsOjpyZW5kZXJpbmdTdGF0cyhXZWJSZW5kZXJpbmdTdGF0cyYg c3RhdHMpIGNvbnN0CiAgICAgICAgIG1fbGF5ZXJUcmVlVmlldy5yZW5kZXJpbmdTdGF0cyhzdGF0 cyk7CiB9CiAKLXZvaWQgV2ViVmlld0ltcGw6OnN0YXJ0UGFnZVNjYWxlQW5pbWF0aW9uKGNvbnN0 IEludFBvaW50JiBzY3JvbGwsIGJvb2wgdXNlQW5jaG9yLCBmbG9hdCBuZXdTY2FsZSwgZG91Ymxl IGR1cmF0aW9uU2VjKQordm9pZCBXZWJWaWV3SW1wbDo6c3RhcnRQYWdlU2NhbGVBbmltYXRpb24o Y29uc3QgSW50UG9pbnQmIHNjcm9sbCwgYm9vbCB1c2VBbmNob3IsIGZsb2F0IG5ld1NjYWxlLCBk b3VibGUgZHVyYXRpb25JblNlY29uZHMpCiB7CiAgICAgaWYgKCFtX2xheWVyVHJlZVZpZXcuaXNO dWxsKCkpCi0gICAgICAgIG1fbGF5ZXJUcmVlVmlldy5zdGFydFBhZ2VTY2FsZUFuaW1hdGlvbihz Y3JvbGwsIHVzZUFuY2hvciwgbmV3U2NhbGUsIGR1cmF0aW9uU2VjKTsKKyAgICAgICAgbV9sYXll clRyZWVWaWV3LnN0YXJ0UGFnZVNjYWxlQW5pbWF0aW9uKHNjcm9sbCwgdXNlQW5jaG9yLCBuZXdT Y2FsZSwgZHVyYXRpb25JblNlY29uZHMpOwogfQogI2VuZGlmCiAKQEAgLTEwNzMsNiArMTA3NSwy NyBAQCB2b2lkIFdlYlZpZXdJbXBsOjpjb21wdXRlU2NhbGVBbmRTY3JvbGxGb3JIaXRSZWN0KGNv bnN0IFdlYlJlY3QmIGhpdFJlY3QsIEF1dG9abwogfQogI2VuZGlmCiAKK3ZvaWQgV2ViVmlld0lt cGw6OmFuaW1hdGVab29tQXJvdW5kUG9pbnQoY29uc3QgSW50UG9pbnQmIHBvaW50LCBBdXRvWm9v bVR5cGUgem9vbVR5cGUpCit7CisjaWYgRU5BQkxFKEdFU1RVUkVfRVZFTlRTKQorICAgIGlmICgh bWFpbkZyYW1lSW1wbCgpKQorICAgICAgICByZXR1cm47CisKKyAgICBmbG9hdCBzY2FsZTsKKyAg ICBXZWJQb2ludCBzY3JvbGw7CisgICAgY29tcHV0ZVNjYWxlQW5kU2Nyb2xsRm9ySGl0UmVjdChX ZWJSZWN0KHBvaW50LngoKSwgcG9pbnQueSgpLCAwLCAwKSwgem9vbVR5cGUsIHNjYWxlLCBzY3Jv bGwpOworCisgICAgYm9vbCBpc0RvdWJsZVRhcCA9ICh6b29tVHlwZSA9PSBEb3VibGVUYXApOwor ICAgIGRvdWJsZSBkdXJhdGlvbkluU2Vjb25kcyA9IGlzRG91YmxlVGFwID8gZG91YmxlVGFiWm9v bUFuaW1hdGlvbkR1cmF0aW9uSW5TZWNvbmRzIDogMDsKKyAgICBzdGFydFBhZ2VTY2FsZUFuaW1h dGlvbihzY3JvbGwsIGlzRG91YmxlVGFwLCBzY2FsZSwgZHVyYXRpb25JblNlY29uZHMpOworI2Vu ZGlmCit9CisKK3ZvaWQgV2ViVmlld0ltcGw6Onpvb21Ub0ZpbmRJblBhZ2VSZWN0KGNvbnN0IFdl YlJlY3QmIHJlY3QpCit7CisgICAgYW5pbWF0ZVpvb21Bcm91bmRQb2ludChJbnRSZWN0KHJlY3Qp LmNlbnRlcigpLCBGaW5kSW5QYWdlKTsKK30KKwogdm9pZCBXZWJWaWV3SW1wbDo6bnVtYmVyT2ZX aGVlbEV2ZW50SGFuZGxlcnNDaGFuZ2VkKHVuc2lnbmVkIG51bWJlck9mV2hlZWxIYW5kbGVycykK IHsKICAgICBpZiAobV9jbGllbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0lt cGwuaAppbmRleCA2ZTZlYjc1YjA1MTkzMDYxZjE1YzZmNjM2M2Q3ZTVjODQxMGFkNWIwLi4yZjdh ZWE3NTU4ZDcxMjQ2NzAyNTRiNzAyZDY4Y2UyM2Y5NWRlNDM5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKQEAgLTIwNSw2ICsyMDUsNyBAQCBwdWJsaWM6CiAgICAg dmlydHVhbCB2b2lkIGNsZWFyRm9jdXNlZE5vZGUoKTsKICAgICB2aXJ0dWFsIHZvaWQgc2Nyb2xs Rm9jdXNlZE5vZGVJbnRvVmlldygpOwogICAgIHZpcnR1YWwgdm9pZCBzY3JvbGxGb2N1c2VkTm9k ZUludG9SZWN0KGNvbnN0IFdlYlJlY3QmKTsKKyAgICB2aXJ0dWFsIHZvaWQgem9vbVRvRmluZElu UGFnZVJlY3QoY29uc3QgV2ViUmVjdCYpOwogICAgIHZpcnR1YWwgdm9pZCBhZHZhbmNlRm9jdXMo Ym9vbCByZXZlcnNlKTsKICAgICB2aXJ0dWFsIGRvdWJsZSB6b29tTGV2ZWwoKTsKICAgICB2aXJ0 dWFsIGRvdWJsZSBzZXRab29tTGV2ZWwoYm9vbCB0ZXh0T25seSwgZG91YmxlIHpvb21MZXZlbCk7 CkBAIC0zNzUsNyArMzc2LDcgQEAgcHVibGljOgogICAgIC8vIEV2ZW50IHJlbGF0ZWQgbWV0aG9k czoKICAgICB2b2lkIG1vdXNlQ29udGV4dE1lbnUoY29uc3QgV2ViTW91c2VFdmVudCYpOwogICAg IHZvaWQgbW91c2VEb3VibGVDbGljayhjb25zdCBXZWJNb3VzZUV2ZW50Jik7Ci0gICAgdm9pZCBz dGFydFBhZ2VTY2FsZUFuaW1hdGlvbihjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgdGFyZ2V0UG9z aXRpb24sIGJvb2wgdXNlQW5jaG9yLCBmbG9hdCBuZXdTY2FsZSwgZG91YmxlIGR1cmF0aW9uU2Vj KTsKKyAgICB2b2lkIHN0YXJ0UGFnZVNjYWxlQW5pbWF0aW9uKGNvbnN0IFdlYkNvcmU6OkludFBv aW50JiB0YXJnZXRQb3NpdGlvbiwgYm9vbCB1c2VBbmNob3IsIGZsb2F0IG5ld1NjYWxlLCBkb3Vi bGUgZHVyYXRpb25JblNlY29uZHMpOwogCiAgICAgdm9pZCBudW1iZXJPZldoZWVsRXZlbnRIYW5k bGVyc0NoYW5nZWQodW5zaWduZWQpOwogICAgIHZvaWQgbnVtYmVyT2ZUb3VjaEV2ZW50SGFuZGxl cnNDaGFuZ2VkKHVuc2lnbmVkKTsKQEAgLTU0Niw2ICs1NDcsNyBAQCBwdWJsaWM6CiAjaWYgRU5B QkxFKEdFU1RVUkVfRVZFTlRTKQogICAgIHZvaWQgY29tcHV0ZVNjYWxlQW5kU2Nyb2xsRm9ySGl0 UmVjdChjb25zdCBXZWJSZWN0JiBoaXRSZWN0LCBBdXRvWm9vbVR5cGUsIGZsb2F0JiBzY2FsZSwg V2ViUG9pbnQmIHNjcm9sbCk7CiAjZW5kaWYKKyAgICB2b2lkIGFuaW1hdGVab29tQXJvdW5kUG9p bnQoY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmLCBBdXRvWm9vbVR5cGUpOwogCiAgICAgdm9pZCBs b3NlQ29tcG9zaXRvckNvbnRleHQoaW50IG51bVRpbWVzKTsKIAo=