108386 2013-01-30 14:36:54 -0800 [Chromium] WebWidget::selectionBounds should return the bounds in document space 2013-02-01 16:01:11 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 cjhopman webkit-unassigned abarth aelias dglazkov fishd jamesr tkent+wkapi webkit.review.bot oldest_to_newest 820591 0 cjhopman 2013-01-30 14:36:54 -0800 [Chromium] WebWidget::selectionBounds should return the bounds in document space 820609 1 185583 cjhopman 2013-01-30 14:43:53 -0800 Created attachment 185583 Patch 820619 2 webkit.review.bot 2013-01-30 14:47:20 -0800 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. 821148 3 abarth 2013-01-30 23:50:44 -0800 Does this fix a specific problem? 821218 4 185583 fishd 2013-01-31 00:41:32 -0800 Comment on attachment 185583 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=185583&action=review > Source/WebKit/chromium/public/WebWidget.h:204 > + virtual bool documentSelectionBounds(WebRect& anchor, WebRect& focus) const { return false; } nit: WebWidget as an interface generally isn't supposed to know about DOM-related concepts. this method name seems to suggest that coordinates are returning in document space instead of viewport space? such a method probably belongs on WebView instead. 821671 5 cjhopman 2013-01-31 10:51:42 -0800 (In reply to comment #3) > Does this fix a specific problem? So here's the issue: when page scale is applied in the compositor, there are essentially 2 different window spaces, the scaled one and the unscaled one. WebKit deals with the unscaled and then when points or rects are passed between WebKit and the renderer, if they are passed in window space, they need to be scaled or unscaled. It is unclear (at least to me) whose responsibility this is (i.e. at what boundary should it be done). Currently, it looks like we do this in WebKit (look for applyPageScaleFactorInCompositor in WebFrameImpl.cpp or WebViewImpl.cpp). I don't like this because it becomes confusing when a public API is called within WebKit. For example, WebWidget::selectionBounds() returns two rects. If WebKit applies the pagescale, then when selectionBounds is used in WebKit (for example WebViewImpl::computeSCaleAndScrollForFocusedNode) you have to know that the rects are not actually in WebKit's viewport space, they are in this other scaled space. And so now, we have this layer that needs to know all about an extra space. My thought was that document space could be this common language that could be used across the boundary into and out of WebKit, so that neither side needed to know about the other's viewport space (and thus never had to distinguish between points in unscaled vs scaled viewport space). I guess I can just switch to what we've already done in other places and make selectionBounds instead scale these rects when necessary (and its users in WebKit can be updated to know that the rects are scaled). 821677 6 jamesr 2013-01-31 10:54:47 -0800 +cc aelias for the scaling questions 821896 7 185849 cjhopman 2013-01-31 13:38:09 -0800 Created attachment 185849 Patch 821899 8 cjhopman 2013-01-31 13:39:59 -0800 (In reply to comment #7) > Created an attachment (id=185849) [details] > Patch This second patch is following our current approach of having WebKit scale/unscale points when they are returned from/passed to the public API. This works for me and fixes the immediate problem, but I think longer-term we may want to reconsider how we are handling this issue. What do you think? 821999 9 aelias 2013-01-31 14:59:48 -0800 LGTM. In the long run the correct solution is to push up all coordinates out of WebKit in absolute coordinates. But that will be a more involved multi-sided fix and this quick fix doesn't make it harder to do that later. 823392 10 185849 webkit.review.bot 2013-02-01 16:01:05 -0800 Comment on attachment 185849 Patch Clearing flags on attachment: 185849 Committed r141657: <http://trac.webkit.org/changeset/141657> 823394 11 webkit.review.bot 2013-02-01 16:01:11 -0800 All reviewed patches have been landed. Closing bug. 185583 2013-01-30 14:43:53 -0800 2013-01-31 13:38:07 -0800 Patch bug-108386-20130130144038.patch text/plain 3823 cjhopman U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxMTYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGI2Y2VjNzU5NmQ3MjJmYWMwMDJmMGI1ZWMzYTc1YzFjYmYwNTNjYWQuLmFlODcxMGFiMTZjMTQ2 M2M5MzgxODExMmRjOGU2YWIwNTIwZmI5ZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjYgQEAKKzIwMTMtMDEtMzAgIENocmlzIEhvcG1hbiAgPGNqaG9wbWFuQGNocm9t aXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIFdlYldpZGdldDo6c2VsZWN0aW9uQm91bmRz IHNob3VsZCByZXR1cm4gdGhlIGJvdW5kcyBpbiBkb2N1bWVudCBzcGFjZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4Mzg2CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRGVhbGluZyB3aXRoIHBvaW50cyBp biB3aW5kb3cgc3BhY2UgKHBhcnRpY3VsYXJseSB3aGVuIHBhZ2VTY2FsZSBpcworICAgICAgICBh cHBsaWVkIGluIHRoZSBjb21wb3NpdG9yIGFuZCB3aGVuIHBhaW50aW5nIGlzIGRvbmUgaW1wbC1z aWRlKSBpcyB2ZXJ5CisgICAgICAgIGVycm9yLXByb25lLiBJbnN0ZWFkLCB0aGUgcHVibGljIEFQ SSBzaG91bGQgbW9zdGx5IGRlYWwgaW4KKyAgICAgICAgZG9jdW1lbnQtc3BhY2UgcG9pbnRzL3Jl Y3RzL2V0YyBpbnN0ZWFkIG9mIHdpbmRvdy1zcGFjZS4KKworICAgICAgICBBZGQgV2ViV2lkZ2V0 Ojpkb2N1bWVudFNlbGVjdGlvbkJvdW5kcyB0aGF0IHJldHVybnMgc2VsZWN0aW9uQm91bmRzIGlu CisgICAgICAgIGRvY3VtZW50LXNwYWNlLgorCisgICAgICAgICogcHVibGljL1dlYldpZGdldC5o OgorICAgICAgICAoV2ViS2l0OjpXZWJXaWRnZXQ6OmRvY3VtZW50U2VsZWN0aW9uQm91bmRzKToK KyAgICAgICAgKFdlYldpZGdldCk6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmRvY3VtZW50U2VsZWN0aW9uQm91bmRzKToKKyAg ICAgICAgKFdlYktpdCk6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmg6CisKIDIwMTMtMDEt MjUgIENocmlzIEhvcG1hbiAgPGNqaG9wbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBNYWtl IHNlbGVjdGlvbiBoYW5kbGluZyB3b3JrIGluIGFwcGx5UGFnZVNjYWxlSW5Db21wb3NpdG9yIG1v ZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYldpZGdldC5o IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViV2lkZ2V0LmgKaW5kZXggYTM4OWJl ZjU0YjRlMGU3Yzc3MTdiNzA4ODc1MmUwNzU0MTRhN2YyYS4uZWRiZjYzZjNhOTg5MDNmMmQzMDgw ODMwNjFkNzc0Yzk5MWQ2ZjNmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViV2lkZ2V0LmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi V2lkZ2V0LmgKQEAgLTIwMSw2ICsyMDEsOSBAQCBwdWJsaWM6CiAKICAgICAvLyBSZXR1cm5zIHRo ZSBhbmNob3IgYW5kIGZvY3VzIGJvdW5kcyBvZiB0aGUgY3VycmVudCBzZWxlY3Rpb24uCiAgICAg Ly8gSWYgdGhlIHNlbGVjdGlvbiByYW5nZSBpcyBlbXB0eSwgaXQgcmV0dXJucyB0aGUgY2FyZXQg Ym91bmRzLgorICAgIHZpcnR1YWwgYm9vbCBkb2N1bWVudFNlbGVjdGlvbkJvdW5kcyhXZWJSZWN0 JiBhbmNob3IsIFdlYlJlY3QmIGZvY3VzKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQorICAgIC8v IEZJWE1FOiBSZW1vdmUgdGhpcyBmcm9tIHRoZSBwdWJsaWMgQVBJIGFuZCBvbmx5IGV4cG9zZQor ICAgIC8vIGRvY3VtZW50U2VsZWN0aW9uQm91bmRzLgogICAgIHZpcnR1YWwgYm9vbCBzZWxlY3Rp b25Cb3VuZHMoV2ViUmVjdCYgYW5jaG9yLCBXZWJSZWN0JiBmb2N1cykgY29uc3QgeyByZXR1cm4g ZmFsc2U7IH0KIAogICAgIC8vIFJldHVybnMgdGhlIHRleHQgZGlyZWN0aW9uIGF0IHRoZSBzdGFy dCBhbmQgZW5kIGJvdW5kcyBvZiB0aGUgY3VycmVudCBzZWxlY3Rpb24uCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKaW5kZXggYTlhOTE5MTEwZWNiNzMyMTgwZjU3 OTE4YzNjYTU0YTkzM2ExNDQzZS4uMmY1NzAwZGZlN2QxZWI1NThmN2YyZTJkOTk3MTliMzcxOGE1 NjZhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcApAQCAt MjQyNCw2ICsyNDI0LDE1IEBAIGJvb2wgV2ViVmlld0ltcGw6OnNlbGVjdGlvbkJvdW5kcyhXZWJS ZWN0JiBhbmNob3IsIFdlYlJlY3QmIGZvY3VzKSBjb25zdAogICAgIHJldHVybiB0cnVlOwogfQog Citib29sIFdlYlZpZXdJbXBsOjpkb2N1bWVudFNlbGVjdGlvbkJvdW5kcyhXZWJSZWN0JiBhbmNo b3IsIFdlYlJlY3QmIGZvY3VzKSBjb25zdAoreworICAgIGlmICghc2VsZWN0aW9uQm91bmRzKGFu Y2hvciwgZm9jdXMpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgYW5jaG9yID0gbV9wYWdl LT5tYWluRnJhbWUoKS0+dmlldygpLT53aW5kb3dUb0NvbnRlbnRzKGFuY2hvcik7CisgICAgZm9j dXMgPSBtX3BhZ2UtPm1haW5GcmFtZSgpLT52aWV3KCktPndpbmRvd1RvQ29udGVudHMoZm9jdXMp OworICAgIHJldHVybiB0cnVlOworfQorCiBib29sIFdlYlZpZXdJbXBsOjpzZWxlY3Rpb25UZXh0 RGlyZWN0aW9uKFdlYlRleHREaXJlY3Rpb24mIHN0YXJ0LCBXZWJUZXh0RGlyZWN0aW9uJiBlbmQp IGNvbnN0CiB7CiAgICAgY29uc3QgRnJhbWUqIGZyYW1lID0gZm9jdXNlZFdlYkNvcmVGcmFtZSgp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaCBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKaW5kZXggNjdkNmJhNjVj NmYzMDMzYWI4ZDQ3MWQxMTcyYzc2ZGNlNTY3YWE2Ni4uMWFhYmUzYzlkZGQyZjg1NDBhYTA2Mjlh YTBjMTc4M2MzYjcyZjBmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViVmlld0ltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1w bC5oCkBAIC0xNzMsNiArMTczLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBpc1NlbGVj dGlvbkVkaXRhYmxlKCkgY29uc3Q7CiAgICAgdmlydHVhbCBXZWJDb2xvciBiYWNrZ3JvdW5kQ29s b3IoKSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgc2VsZWN0aW9uQm91bmRzKFdlYlJlY3QmIGFu Y2hvciwgV2ViUmVjdCYgZm9jdXMpIGNvbnN0OworICAgIHZpcnR1YWwgYm9vbCBkb2N1bWVudFNl bGVjdGlvbkJvdW5kcyhXZWJSZWN0JiBhbmNob3IsIFdlYlJlY3QmIGZvY3VzKSBjb25zdDsKICAg ICB2aXJ0dWFsIGJvb2wgc2VsZWN0aW9uVGV4dERpcmVjdGlvbihXZWJUZXh0RGlyZWN0aW9uJiBz dGFydCwgV2ViVGV4dERpcmVjdGlvbiYgZW5kKSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgY2Fy ZXRPclNlbGVjdGlvblJhbmdlKHNpemVfdCogbG9jYXRpb24sIHNpemVfdCogbGVuZ3RoKTsKICAg ICB2aXJ0dWFsIHZvaWQgc2V0VGV4dERpcmVjdGlvbihXZWJUZXh0RGlyZWN0aW9uIGRpcmVjdGlv bik7Cg== 185849 2013-01-31 13:38:09 -0800 2013-02-01 16:01:05 -0800 Patch bug-108386-20130131133453.patch text/plain 4712 cjhopman U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxMjkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGQyNmE2MzcyMjVhZDc2YmMxODFlNTVmZmZlZDNhYzRjY2JiMWI0ODMuLjJhYTc4NmVlMGQ4YzAy MTQwODRmNjY1YjY2MzU0OGE5ZmI0MzlkY2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTMtMDEtMzEgIENocmlzIEhvcG1hbiAgPGNqaG9wbWFuQGNocm9t aXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIFdlYldpZGdldDo6c2VsZWN0aW9uQm91bmRz IHNob3VsZCByZXR1cm4gdGhlIGJvdW5kcyBpbiBkb2N1bWVudCBzcGFjZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4Mzg2CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBpbiBhcHBseVBhZ2VTY2Fs ZUZhY3RvckluQ29tcG9zaXRvciBtb2RlLCBzZWxlY3Rpb25Cb3VuZHMgbmVlZHMKKyAgICAgICAg dG8gc2NhbGUgdGhlIGFuY2hvci9mb2N1cyB3aW5kb3cgcG9pbnRzIGJ5IHRoZSBwYWdlU2NhbGVG YWN0b3IuCisKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJWaWV3SW1wbDo6c2VsZWN0aW9uQm91bmRzKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmll d0ltcGw6OmNvbXB1dGVTY2FsZUFuZFNjcm9sbEZvckZvY3VzZWROb2RlKToKKwogMjAxMy0wMS0z MCAgSm9obiBLbm90dGVuYmVsdCAgPGprbm90dGVuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBb Q2hyb21pdW1dIEZpeCBmaW5kIGluIHBhZ2UgcmVjdHMgZm9yIG92ZXJmbG93aW5nIGNvbnRlbnQu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKaW5kZXggYTRmMzA4 ZDA3ZGE2MjJkM2E5YzEzZjg5ZDQxMDZiZWE4ZDY4N2ZlZi4uNmU5YjNjYzk1MGE5NjM0M2RhZGRk YTQ0NWY2NDA4MzQ2MTA1Y2YwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViVmlld0ltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZp ZXdJbXBsLmNwcApAQCAtMjM5MywzMSArMjM5MywzNiBAQCBib29sIFdlYlZpZXdJbXBsOjpzZWxl Y3Rpb25Cb3VuZHMoV2ViUmVjdCYgYW5jaG9yLCBXZWJSZWN0JiBmb2N1cykgY29uc3QKICAgICBp ZiAoIXNlbGVjdGlvbikKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaWYgKHNlbGVjdGlv bi0+aXNDYXJldCgpKSB7Ci0gICAgICAgIGFuY2hvciA9IGZvY3VzID0gZnJhbWUtPnZpZXcoKS0+ Y29udGVudHNUb1dpbmRvdyhzZWxlY3Rpb24tPmFic29sdXRlQ2FyZXRCb3VuZHMoKSk7Ci0gICAg ICAgIHJldHVybiB0cnVlOwotICAgIH0KLQotICAgIFJlZlB0cjxSYW5nZT4gc2VsZWN0ZWRSYW5n ZSA9IGZyYW1lLT5zZWxlY3Rpb24oKS0+dG9Ob3JtYWxpemVkUmFuZ2UoKTsKLSAgICBpZiAoIXNl bGVjdGVkUmFuZ2UpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIFJlZlB0cjxSYW5nZT4g cmFuZ2UoUmFuZ2U6OmNyZWF0ZShzZWxlY3RlZFJhbmdlLT5zdGFydENvbnRhaW5lcigpLT5kb2N1 bWVudCgpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxlY3RlZFJh bmdlLT5zdGFydENvbnRhaW5lcigpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBzZWxlY3RlZFJhbmdlLT5zdGFydE9mZnNldCgpLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBzZWxlY3RlZFJhbmdlLT5zdGFydENvbnRhaW5lcigpLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxlY3RlZFJhbmdlLT5zdGFydE9mZnNl dCgpKSk7Ci0gICAgYW5jaG9yID0gZnJhbWUtPmVkaXRvcigpLT5maXJzdFJlY3RGb3JSYW5nZShy YW5nZS5nZXQoKSk7CisgICAgaWYgKHNlbGVjdGlvbi0+aXNDYXJldCgpKQorICAgICAgICBhbmNo b3IgPSBmb2N1cyA9IHNlbGVjdGlvbi0+YWJzb2x1dGVDYXJldEJvdW5kcygpOworICAgIGVsc2Ug eworICAgICAgICBSZWZQdHI8UmFuZ2U+IHNlbGVjdGVkUmFuZ2UgPSBmcmFtZS0+c2VsZWN0aW9u KCktPnRvTm9ybWFsaXplZFJhbmdlKCk7CisgICAgICAgIGlmICghc2VsZWN0ZWRSYW5nZSkKKyAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIHJhbmdlID0gUmFuZ2U6OmNyZWF0ZShzZWxl Y3RlZFJhbmdlLT5lbmRDb250YWluZXIoKS0+ZG9jdW1lbnQoKSwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgc2VsZWN0ZWRSYW5nZS0+ZW5kQ29udGFpbmVyKCksCi0gICAgICAgICAgICAgICAg ICAgICAgICAgIHNlbGVjdGVkUmFuZ2UtPmVuZE9mZnNldCgpLAotICAgICAgICAgICAgICAgICAg ICAgICAgICBzZWxlY3RlZFJhbmdlLT5lbmRDb250YWluZXIoKSwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgc2VsZWN0ZWRSYW5nZS0+ZW5kT2Zmc2V0KCkpOwotICAgIGZvY3VzID0gZnJhbWUt PmVkaXRvcigpLT5maXJzdFJlY3RGb3JSYW5nZShyYW5nZS5nZXQoKSk7CisgICAgICAgIFJlZlB0 cjxSYW5nZT4gcmFuZ2UoUmFuZ2U6OmNyZWF0ZShzZWxlY3RlZFJhbmdlLT5zdGFydENvbnRhaW5l cigpLT5kb2N1bWVudCgpLAorICAgICAgICAgICAgc2VsZWN0ZWRSYW5nZS0+c3RhcnRDb250YWlu ZXIoKSwKKyAgICAgICAgICAgIHNlbGVjdGVkUmFuZ2UtPnN0YXJ0T2Zmc2V0KCksCisgICAgICAg ICAgICBzZWxlY3RlZFJhbmdlLT5zdGFydENvbnRhaW5lcigpLAorICAgICAgICAgICAgc2VsZWN0 ZWRSYW5nZS0+c3RhcnRPZmZzZXQoKSkpOworICAgICAgICBhbmNob3IgPSBmcmFtZS0+ZWRpdG9y KCktPmZpcnN0UmVjdEZvclJhbmdlKHJhbmdlLmdldCgpKTsKKworICAgICAgICByYW5nZSA9IFJh bmdlOjpjcmVhdGUoc2VsZWN0ZWRSYW5nZS0+ZW5kQ29udGFpbmVyKCktPmRvY3VtZW50KCksCisg ICAgICAgICAgICBzZWxlY3RlZFJhbmdlLT5lbmRDb250YWluZXIoKSwKKyAgICAgICAgICAgIHNl bGVjdGVkUmFuZ2UtPmVuZE9mZnNldCgpLAorICAgICAgICAgICAgc2VsZWN0ZWRSYW5nZS0+ZW5k Q29udGFpbmVyKCksCisgICAgICAgICAgICBzZWxlY3RlZFJhbmdlLT5lbmRPZmZzZXQoKSk7Cisg ICAgICAgIGZvY3VzID0gZnJhbWUtPmVkaXRvcigpLT5maXJzdFJlY3RGb3JSYW5nZShyYW5nZS5n ZXQoKSk7CisgICAgfQogCi0gICAgYW5jaG9yID0gZnJhbWUtPnZpZXcoKS0+Y29udGVudHNUb1dp bmRvdyhhbmNob3IpOwotICAgIGZvY3VzID0gZnJhbWUtPnZpZXcoKS0+Y29udGVudHNUb1dpbmRv dyhmb2N1cyk7CisgICAgSW50UmVjdCBzY2FsZWRBbmNob3IoZnJhbWUtPnZpZXcoKS0+Y29udGVu dHNUb1dpbmRvdyhhbmNob3IpKTsKKyAgICBJbnRSZWN0IHNjYWxlZEZvY3VzKGZyYW1lLT52aWV3 KCktPmNvbnRlbnRzVG9XaW5kb3coZm9jdXMpKTsKKyAgICBpZiAobV93ZWJTZXR0aW5ncy0+YXBw bHlQYWdlU2NhbGVGYWN0b3JJbkNvbXBvc2l0b3IoKSkgeworICAgICAgICBzY2FsZWRBbmNob3Iu c2NhbGUocGFnZVNjYWxlRmFjdG9yKCkpOworICAgICAgICBzY2FsZWRGb2N1cy5zY2FsZShwYWdl U2NhbGVGYWN0b3IoKSk7CisgICAgfQorICAgIGFuY2hvciA9IHNjYWxlZEFuY2hvcjsKKyAgICBm b2N1cyA9IHNjYWxlZEZvY3VzOwogCiAgICAgaWYgKCFmcmFtZS0+c2VsZWN0aW9uKCktPnNlbGVj dGlvbigpLmlzQmFzZUZpcnN0KCkpCiAgICAgICAgIHN0ZDo6c3dhcChhbmNob3IsIGZvY3VzKTsK QEAgLTI4MDQsOCArMjgwOSwxMyBAQCB2b2lkIFdlYlZpZXdJbXBsOjpjb21wdXRlU2NhbGVBbmRT Y3JvbGxGb3JGb2N1c2VkTm9kZShOb2RlKiBmb2N1c2VkTm9kZSwgZmxvYXQmCiAKICAgICAvLyAn Y2FyZXQnIGlzIHJlY3QgZW5jb21wYXNzaW5nIHRoZSBibGlua2luZyBjdXJzb3IuCiAgICAgSW50 UmVjdCB0ZXh0Ym94UmVjdCA9IGZvY3VzZWROb2RlLT5kb2N1bWVudCgpLT52aWV3KCktPmNvbnRl bnRzVG9XaW5kb3cocGl4ZWxTbmFwcGVkSW50UmVjdChmb2N1c2VkTm9kZS0+Tm9kZTo6Ym91bmRp bmdCb3goKSkpOwotICAgIFdlYlJlY3QgY2FyZXQsIGVuZDsKLSAgICBzZWxlY3Rpb25Cb3VuZHMo Y2FyZXQsIGVuZCk7CisgICAgV2ViUmVjdCBjYXJldCwgdW51c2VkRW5kOworICAgIHNlbGVjdGlv bkJvdW5kcyhjYXJldCwgdW51c2VkRW5kKTsKKyAgICBpZiAoc2V0dGluZ3NJbXBsKCktPmFwcGx5 UGFnZVNjYWxlRmFjdG9ySW5Db21wb3NpdG9yKCkpIHsKKyAgICAgICAgSW50UmVjdCB1bnNjYWxl ZENhcmV0ID0gY2FyZXQ7CisgICAgICAgIHVuc2NhbGVkQ2FyZXQuc2NhbGUoMSAvIHBhZ2VTY2Fs ZUZhY3RvcigpKTsKKyAgICAgICAgY2FyZXQgPSB1bnNjYWxlZENhcmV0OworICAgIH0KIAogICAg IC8vIFBpY2sgYSBzY2FsZSB3aGljaCBpcyByZWFzb25hYmx5IHJlYWRhYmxlLiBUaGlzIGlzIHRo ZSBzY2FsZSBhdCB3aGljaAogICAgIC8vIHRoZSBjYXJldCBoZWlnaHQgd2lsbCBiZWNvbWUgbWlu UmVhZGFibGVDYXJldEhlaWdodCAoYWRqdXN0ZWQgZm9yIGRwaQo=