125943 2013-12-18 13:36:20 -0800 [CoordinatedGraphics] Regressions in WebView's contentScaleFactor/contentPosition 2013-12-19 08:27:37 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 118548 124396 1 nick.diego nick.diego cdumez cmarcelo commit-queue enmi.lee gyuyoung.kim luciano.wolf luiz marcelo.lira noam rakuco rogerzanoni thiago.lacerda zeno oldest_to_newest 961081 0 nick.diego 2013-12-18 13:36:20 -0800 Bug 118548 changed the way contentScaleFactor and contentPosition are manipulated in WebView. After that, we've been dealing with some unexpected behaviors in contentPosition-related stuff. Some Nix API tests are failing and we got some regressions in panning and zoom features of Nix's MiniBrowser. It seems like whenever we set WebView's contentPosition we have to multiply/scale it by the current scale factor explictly, that "solved" most of those issues mentioned before, but I suppose that is not intended. We should make sure we really need to store contentPosition as a scaled value, as it's being done in https://github.com/WebKitNix/webkitnix/blob/master/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp#L515. Besides that, WebView::pageDidRequestScroll is passing the non-scaled value to client callback, that is at least weird, maybe a separate issue. Macelo Lira and Thiago Lacerda are currently working on some API/Layout tests to make sure this kind of regression won't be missed in future changes. It would be good to have some feedback from Noam and some EFL guys using CoordinatedGraphics and contentScaleFactor related stuff. 961166 1 219584 nick.diego 2013-12-18 16:25:53 -0800 Created attachment 219584 Proposed Patch This patch modifies WebView to store contentPosition as a non-scaled value and refactor EFL functions functions that use contentPosition API to do not assume it is stored scaled anymore. 961194 2 219584 enmi.lee 2013-12-18 17:27:11 -0800 Comment on attachment 219584 Proposed Patch View in context: https://bugs.webkit.org/attachment.cgi?id=219584&action=review This patch is LGTM. I added patch in Bug 118548 to make usage of contentPosition consistent by regarding it as scaled value. But as you mentioned, we have to multiply it by the current scale factor whenever set WebView's contentPosition. Codes are more simple after changing contentPosition as a non-scaled value :) > Source/WebKit2/UIProcess/API/efl/EwkView.cpp:1403 > FloatPoint newPosition(oldPosition.x + offset.width(), oldPosition.y + offset.height()); If we divide offset with contentScale, we don't have to multiply oldPosition and divide newPosition. 961349 3 nick.diego 2013-12-19 05:11:41 -0800 (In reply to comment #2) > (From update of attachment 219584 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=219584&action=review > > This patch is LGTM. > I added patch in Bug 118548 to make usage of contentPosition consistent by regarding it as scaled value. > But as you mentioned, we have to multiply it by the current scale factor whenever set WebView's contentPosition. > Codes are more simple after changing contentPosition as a non-scaled value :) > > > Source/WebKit2/UIProcess/API/efl/EwkView.cpp:1403 > > FloatPoint newPosition(oldPosition.x + offset.width(), oldPosition.y + offset.height()); > > If we divide offset with contentScale, we don't have to multiply oldPosition and divide newPosition. Thanks for the suggestion, indeed that will remove some redundancy from that calculation, I'll send an updated patch applying this change. 961371 4 219649 nick.diego 2013-12-19 06:38:44 -0800 Created attachment 219649 Proposed patch Simplifies calculations of newPosition when scrolling in EwkView, as suggested by Eummi. 961388 5 219649 commit-queue 2013-12-19 07:57:29 -0800 Comment on attachment 219649 Proposed patch Rejecting attachment 219649 from commit-queue. nick.yamane@openbossa.org does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/contributors.json. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/contributors.json by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 961389 6 219649 commit-queue 2013-12-19 07:58:05 -0800 Comment on attachment 219649 Proposed patch Rejecting attachment 219649 from commit-queue. nick.yamane@openbossa.org does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/contributors.json. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/contributors.json by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 961390 7 219649 commit-queue 2013-12-19 07:59:13 -0800 Comment on attachment 219649 Proposed patch Rejecting attachment 219649 from commit-queue. nick.yamane@openbossa.org does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/contributors.json. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/contributors.json by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 961394 8 219649 commit-queue 2013-12-19 08:27:33 -0800 Comment on attachment 219649 Proposed patch Clearing flags on attachment: 219649 Committed r160833: <http://trac.webkit.org/changeset/160833> 961395 9 commit-queue 2013-12-19 08:27:37 -0800 All reviewed patches have been landed. Closing bug. 219584 2013-12-18 16:25:53 -0800 2013-12-19 06:38:35 -0800 Proposed Patch bug-125943-20131218213411.patch text/plain 6135 nick.diego U3VidmVyc2lvbiBSZXZpc2lvbjogMTYwNzk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjY2OTU5YWNhYjg3NDhl OGU2Y2M2ODY4YjdlYjA0MmIxM2FmMDI1ZC4uNzdmYTY0MjRmZjg3YTRlNzcyYzkyYmJmNDMxZGQ5 YTA5YjcwODU0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEzLTEyLTE4ICBOaWNr IERpZWdvIFlhbWFuZSAgPG5pY2sueWFtYW5lQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgW0Nv b3JkaW5hdGVkR3JhcGhpY3NdIFJlZ3Jlc3Npb25zIGluIFdlYlZpZXcncyBjb250ZW50U2NhbGVG YWN0b3IvY29udGVudFBvc2l0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjU5NDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBXaGVuIFdlYlZpZXc6OnBhZ2VEaWRSZXF1ZXN0U2Nyb2xsIGlzIGNhbGxl ZCBpdCBpcyBzY2FsaW5nIHBvc2l0aW9uIHJlcXVlc3RlZAorICAgICAgICB0byBzY3JvbGwgYmVm b3JlIHN0b3JlIGl0IGFzIGNvbnRlbnRQb3NpdGlvbiwgdGhhdCBpcyBub3QgbmVjZXNzYXJ5IHNp bmNlIFdlYlZpZXcKKyAgICAgICAgYWxyZWFkeSBzdG9yZXMgdGhlIHJlcXVlc3RlZCBjb250ZW50 U2NhbGVGYWN0b3Igc28gaXQncyBhYmxlIHRvIGRvIHRoYXQgaW50ZXJuYWxseQorICAgICAgICB3 aGVuIG5lZWRlZCwgd2hhdCBzaW1wbGlmaWVzIHRoZSBBUEkgYW5kIGltcHJvdmVzIHRoZSByZWFk YWJpbGl0eSBvZiB3ZWJ2aWV3J3MgY29kZS4KKyAgICAgICAgVGhpcyBwYXRjaCByZXZlcnRzIGNo YW5nZXMgZnJvbSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE4NTQ4 LCB3aGljaAorICAgICAgICB3YXMgY2F1c2luZyBzb21lIHJlZ3Jlc3Npb25zIGluIGNvbnRlbnRT Y2FsZUZhY3Rvci9jb250ZW50UG9zaXRpb24gcmVsYXRlZCBzdHVmZi4KKyAgICAgICAgQmVzaWRl cyB0aGF0IFdlYlZpZXc6OnBhZ2VEaWRSZXF1ZXN0U2Nyb2xsIGNhbGxzIHZpZXdDbGllbnQgY2Fs bGJhY2sgd2l0aCB0aGUgd3JvbmcKKyAgICAgICAgcG9zaXRpb24gKGRpZmZlcmVudCBmcm9tIHRo ZSBwb3NpdGlvbiBzdG9yZWQgaW4gV2ViVmlldykuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L2VmbC9Fd2tWaWV3LmNwcDoKKyAgICAgICAgKEV3a1ZpZXc6OnNjcm9sbEJ5KToKKyAgICAgICAg KiBVSVByb2Nlc3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9XZWJWaWV3LmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViVmlldzo6dHJhbnNmb3JtVG9TY2VuZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlZp ZXc6OnVwZGF0ZVZpZXdwb3J0U2l6ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXc6OnBhZ2VE aWRSZXF1ZXN0U2Nyb2xsKToKKyAgICAgICAgKiBVSVByb2Nlc3MvZWZsL1BhZ2VWaWV3cG9ydENv bnRyb2xsZXJDbGllbnRFZmwuY3BwOgorICAgICAgICAoV2ViS2l0OjpQYWdlVmlld3BvcnRDb250 cm9sbGVyQ2xpZW50RWZsOjpzZXRWaWV3cG9ydFBvc2l0aW9uKToKKwogMjAxMy0xMi0xOCAgR2F2 aW4gQmFycmFjbG91Z2ggIDxiYXJyYWNsb3VnaEBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IHBh Z2UgdmlzaWJpbGl0eSBhcGkgdGVzdCwgaW5pdGlhbGl6YXRpb24gaW4gV2ViS2l0MgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmNwcAppbmRleCBjMzRiZDU3YWUy OTE5MDZlZTk4ZTI2Yjc5NWUwNzBkMTlhMmY0YTVjLi44Y2IyYjRhOGZmMDlhMTIwMTU3MWNkNzI0 ZDY1MWNmYzhkYjI1MzIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC9Fd2tWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9F d2tWaWV3LmNwcApAQCAtMTM5NiwxNiArMTM5NiwxOSBAQCB2b2lkIEV3a1ZpZXc6OmRpZEZpbmRa b29tYWJsZUFyZWEoY29uc3QgV0tQb2ludCYgcG9pbnQsIGNvbnN0IFdLUmVjdCYgYXJlYSkKIGJv b2wgRXdrVmlldzo6c2Nyb2xsQnkoY29uc3QgSW50U2l6ZSYgb2Zmc2V0KQogewogICAgIFdLUG9p bnQgb2xkUG9zaXRpb24gPSBXS1ZpZXdHZXRDb250ZW50UG9zaXRpb24od2tWaWV3KCkpOworICAg IGZsb2F0IGNvbnRlbnRTY2FsZSA9IFdLVmlld0dldENvbnRlbnRTY2FsZUZhY3Rvcih3a1ZpZXco KSk7CisgICAgb2xkUG9zaXRpb24ueCAqPSBjb250ZW50U2NhbGU7CisgICAgb2xkUG9zaXRpb24u eSAqPSBjb250ZW50U2NhbGU7CisKICAgICBGbG9hdFBvaW50IG5ld1Bvc2l0aW9uKG9sZFBvc2l0 aW9uLnggKyBvZmZzZXQud2lkdGgoKSwgb2xkUG9zaXRpb24ueSArIG9mZnNldC5oZWlnaHQoKSk7 CiAKICAgICAvLyBVcGRhdGUgbmV3IHBvc2l0aW9uIHRvIHRoZSBQYWdlVmlld3BvcnRDb250cm9s bGVyLgotICAgIGZsb2F0IGNvbnRlbnRTY2FsZSA9IFdLVmlld0dldENvbnRlbnRTY2FsZUZhY3Rv cih3a1ZpZXcoKSk7CiAgICAgbmV3UG9zaXRpb24uc2NhbGUoMSAvIGNvbnRlbnRTY2FsZSwgMSAv IGNvbnRlbnRTY2FsZSk7CiAgICAgbmV3UG9zaXRpb24gPSBtX3BhZ2VWaWV3cG9ydENvbnRyb2xs ZXIuYm91bmRDb250ZW50c1Bvc2l0aW9uQXRTY2FsZShuZXdQb3NpdGlvbiwgY29udGVudFNjYWxl KTsKICAgICBtX3BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuZGlkQ2hhbmdlQ29udGVudHNWaXNpYmls aXR5KG5ld1Bvc2l0aW9uLCBjb250ZW50U2NhbGUpOwogCiAgICAgLy8gVXBkYXRlIG5ldyBwb3Np dGlvbiB0byB0aGUgV0tWaWV3LgotICAgIFdLUG9pbnQgcG9zaXRpb24gPSBXS1BvaW50TWFrZShu ZXdQb3NpdGlvbi54KCkgKiBjb250ZW50U2NhbGUsIG5ld1Bvc2l0aW9uLnkoKSAqIGNvbnRlbnRT Y2FsZSk7CisgICAgV0tQb2ludCBwb3NpdGlvbiA9IFdLUG9pbnRNYWtlKG5ld1Bvc2l0aW9uLngo KSwgbmV3UG9zaXRpb24ueSgpKTsKICAgICBXS1ZpZXdTZXRDb250ZW50UG9zaXRpb24od2tWaWV3 KCksIHBvc2l0aW9uKTsKIAogICAgIC8vIElmIHRoZSBwYWdlIHBvc2l0aW9uIGhhcyBub3QgY2hh bmdlZCwgbm90aWZ5IHRoZSBjYWxsZXIgdXNpbmcgdGhlIHJldHVybiB2YWx1ZS4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNzL1dlYlZpZXcu Y3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV2ViVmll dy5jcHAKaW5kZXggMzg2Zjc2ZjhiOTg0NzMwMzYzNGQ3N2ZjNDFlNjA3NmY3ZmEyZTE4Yi4uMTAw ZmEzOWJlMzRjYTNlZDhlYzQxMDQ0NDU0Nzg4M2YwNTYwNWJlOCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV2ViVmlldy5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV2ViVmlldy5jcHAK QEAgLTIzOSw3ICsyMzksNyBAQCBBZmZpbmVUcmFuc2Zvcm0gV2ViVmlldzo6dHJhbnNmb3JtVG9T Y2VuZSgpIGNvbnN0CiB7CiAgICAgRmxvYXRQb2ludCBwb3NpdGlvbiA9IC1tX2NvbnRlbnRQb3Np dGlvbjsKICAgICBmbG9hdCBlZmZlY3RpdmVTY2FsZSA9IG1fY29udGVudFNjYWxlRmFjdG9yICog bV9wYWdlLT5kZXZpY2VTY2FsZUZhY3RvcigpOwotICAgIHBvc2l0aW9uLnNjYWxlKG1fcGFnZS0+ ZGV2aWNlU2NhbGVGYWN0b3IoKSwgbV9wYWdlLT5kZXZpY2VTY2FsZUZhY3RvcigpKTsKKyAgICBw b3NpdGlvbi5zY2FsZShlZmZlY3RpdmVTY2FsZSwgZWZmZWN0aXZlU2NhbGUpOwogCiAgICAgVHJh bnNmb3JtYXRpb25NYXRyaXggdHJhbnNmb3JtID0gbV91c2VyVmlld3BvcnRUcmFuc2Zvcm07CiAg ICAgdHJhbnNmb3JtLnRyYW5zbGF0ZShwb3NpdGlvbi54KCksIHBvc2l0aW9uLnkoKSk7CkBAIC0y NjEsOSArMjYxLDcgQEAgdm9pZCBXZWJWaWV3Ojp1cGRhdGVWaWV3cG9ydFNpemUoKQogICAgIGlm IChDb29yZGluYXRlZERyYXdpbmdBcmVhUHJveHkqIGRyYXdpbmdBcmVhID0gc3RhdGljX2Nhc3Q8 Q29vcmRpbmF0ZWREcmF3aW5nQXJlYVByb3h5Kj4ocGFnZSgpLT5kcmF3aW5nQXJlYSgpKSkgewog ICAgICAgICAvLyBXZWIgUHJvY2VzcyBleHBlY3RzIHNpemVzIGluIFVJIHVuaXRzLCBhbmQgbm90 IHJhdyBkZXZpY2UgdW5pdHMuCiAgICAgICAgIGRyYXdpbmdBcmVhLT5zZXRTaXplKHJvdW5kZWRJ bnRTaXplKGRpcFNpemUoKSksIEludFNpemUoKSwgSW50U2l6ZSgpKTsKLSAgICAgICAgRmxvYXRQ b2ludCBwb3NpdGlvbiA9IGNvbnRlbnRQb3NpdGlvbigpOwotICAgICAgICBwb3NpdGlvbi5zY2Fs ZSgxIC8gbV9jb250ZW50U2NhbGVGYWN0b3IsIDEgLyBtX2NvbnRlbnRTY2FsZUZhY3Rvcik7Ci0g ICAgICAgIEZsb2F0UmVjdCB2aXNpYmxlQ29udGVudHNSZWN0KHBvc2l0aW9uLCB2aXNpYmxlQ29u dGVudHNTaXplKCkpOworICAgICAgICBGbG9hdFJlY3QgdmlzaWJsZUNvbnRlbnRzUmVjdChjb250 ZW50UG9zaXRpb24oKSwgdmlzaWJsZUNvbnRlbnRzU2l6ZSgpKTsKICAgICAgICAgdmlzaWJsZUNv bnRlbnRzUmVjdC5pbnRlcnNlY3QoRmxvYXRSZWN0KEZsb2F0UG9pbnQoKSwgY29udGVudHNTaXpl KCkpKTsKICAgICAgICAgZHJhd2luZ0FyZWEtPnNldFZpc2libGVDb250ZW50c1JlY3QodmlzaWJs ZUNvbnRlbnRzUmVjdCwgRmxvYXRQb2ludCgpKTsKICAgICB9CkBAIC01MTUsNyArNTEzLDYgQEAg dm9pZCBXZWJWaWV3OjpkaWRDaGFuZ2VWaWV3cG9ydFByb3BlcnRpZXMoY29uc3QgV2ViQ29yZTo6 Vmlld3BvcnRBdHRyaWJ1dGVzJiBhdHQKIHZvaWQgV2ViVmlldzo6cGFnZURpZFJlcXVlc3RTY3Jv bGwoY29uc3QgSW50UG9pbnQmIHBvc2l0aW9uKQogewogICAgIEZsb2F0UG9pbnQgdWlQb3NpdGlv bihwb3NpdGlvbik7Ci0gICAgdWlQb3NpdGlvbi5zY2FsZShjb250ZW50U2NhbGVGYWN0b3IoKSwg Y29udGVudFNjYWxlRmFjdG9yKCkpOwogICAgIHNldENvbnRlbnRQb3NpdGlvbih1aVBvc2l0aW9u KTsKIAogICAgIG1fY2xpZW50LmRpZENoYW5nZUNvbnRlbnRzUG9zaXRpb24odGhpcywgcG9zaXRp b24pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlVmlld3Bv cnRDb250cm9sbGVyQ2xpZW50RWZsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwv UGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbC5jcHAKaW5kZXggMjJhNDViNTJmOWI5Nzdl MDc5MzNmNzZmMWRkN2Y5YzBjMmFkYWQwOS4uYjJhNjc3MmNhZDYzZDEwYmRjY2E2MzQzMDI3ZGU5 OGY2M2QzMWJkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdl Vmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvZWZsL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmwuY3BwCkBAIC01MywxMCAr NTMsOCBAQCB2b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmw6OnNldFZpZXdwb3J0 UG9zaXRpb24oY29uc3QgV2ViQ29yZTo6RmxvYXRQbwogewogICAgIG1fY29udGVudFBvc2l0aW9u ID0gY29udGVudHNQb2ludDsKIAotICAgIEZsb2F0UG9pbnQgcG9zKGNvbnRlbnRzUG9pbnQpOwog ICAgIGZsb2F0IHNjYWxlRmFjdG9yID0gV0tWaWV3R2V0Q29udGVudFNjYWxlRmFjdG9yKG1fdmll dy0+d2tWaWV3KCkpOwotICAgIHBvcy5zY2FsZShzY2FsZUZhY3Rvciwgc2NhbGVGYWN0b3IpOwot ICAgIFdLVmlld1NldENvbnRlbnRQb3NpdGlvbihtX3ZpZXctPndrVmlldygpLCBXS1BvaW50TWFr ZShwb3MueCgpLCBwb3MueSgpKSk7CisgICAgV0tWaWV3U2V0Q29udGVudFBvc2l0aW9uKG1fdmll dy0+d2tWaWV3KCksIFdLUG9pbnRNYWtlKGNvbnRlbnRzUG9pbnQueCgpLCBjb250ZW50c1BvaW50 LnkoKSkpOwogCiAgICAgbV9jb250cm9sbGVyLT5kaWRDaGFuZ2VDb250ZW50c1Zpc2liaWxpdHko bV9jb250ZW50UG9zaXRpb24sIHNjYWxlRmFjdG9yKTsKIH0K 219649 2013-12-19 06:38:44 -0800 2013-12-19 08:27:33 -0800 Proposed patch bug-125943-20131219114704.patch text/plain 6208 nick.diego U3VidmVyc2lvbiBSZXZpc2lvbjogMTYwODI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNTdkZDM1MzI2ZTJhZmVj Yzk3ZDRhY2FkNWFlNDgwMWU0NDg2YmFiYy4uZTZjZjhmZjM1N2YxNTFjMDFmMGI0NWFlMDg1N2Rk MWRmZGM5YzEyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTEyLTE4ICBOaWNr IERpZWdvIFlhbWFuZSAgPG5pY2sueWFtYW5lQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgW0Nv b3JkaW5hdGVkR3JhcGhpY3NdIFJlZ3Jlc3Npb25zIGluIFdlYlZpZXcncyBjb250ZW50U2NhbGVG YWN0b3IvY29udGVudFBvc2l0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjU5NDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBXaGVuIFdlYlZpZXc6OnBhZ2VEaWRSZXF1ZXN0U2Nyb2xsIGlzIGNhbGxl ZCBpdCBpcyBzY2FsaW5nIHBvc2l0aW9uIHJlcXVlc3RlZAorICAgICAgICB0byBzY3JvbGwgYmVm b3JlIHN0b3JlIGl0IGFzIGNvbnRlbnRQb3NpdGlvbiwgdGhhdCBpcyBub3QgbmVjZXNzYXJ5IHNp bmNlIFdlYlZpZXcKKyAgICAgICAgYWxyZWFkeSBzdG9yZXMgdGhlIHJlcXVlc3RlZCBjb250ZW50 U2NhbGVGYWN0b3Igc28gaXQncyBhYmxlIHRvIGRvIHRoYXQgaW50ZXJuYWxseQorICAgICAgICB3 aGVuIG5lZWRlZCwgd2hhdCBzaW1wbGlmaWVzIHRoZSBBUEkgYW5kIGltcHJvdmVzIHRoZSByZWFk YWJpbGl0eSBvZiB3ZWJ2aWV3J3MgY29kZS4KKyAgICAgICAgVGhpcyBwYXRjaCByZXZlcnRzIGNo YW5nZXMgZnJvbSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE4NTQ4 LCB3aGljaAorICAgICAgICB3YXMgY2F1c2luZyBzb21lIHJlZ3Jlc3Npb25zIGluIGNvbnRlbnRT Y2FsZUZhY3Rvci9jb250ZW50UG9zaXRpb24gcmVsYXRlZCBzdHVmZi4KKyAgICAgICAgQmVzaWRl cyB0aGF0IFdlYlZpZXc6OnBhZ2VEaWRSZXF1ZXN0U2Nyb2xsIGNhbGxzIHZpZXdDbGllbnQgY2Fs bGJhY2sgd2l0aCB0aGUgd3JvbmcKKyAgICAgICAgcG9zaXRpb24gKGRpZmZlcmVudCBmcm9tIHRo ZSBwb3NpdGlvbiBzdG9yZWQgaW4gV2ViVmlldykuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L2VmbC9Fd2tWaWV3LmNwcDoKKyAgICAgICAgKEV3a1ZpZXc6OnNjcm9sbEJ5KToKKyAgICAgICAg KiBVSVByb2Nlc3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9XZWJWaWV3LmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViVmlldzo6dHJhbnNmb3JtVG9TY2VuZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlZp ZXc6OnVwZGF0ZVZpZXdwb3J0U2l6ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXc6OnBhZ2VE aWRSZXF1ZXN0U2Nyb2xsKToKKyAgICAgICAgKiBVSVByb2Nlc3MvZWZsL1BhZ2VWaWV3cG9ydENv bnRyb2xsZXJDbGllbnRFZmwuY3BwOgorICAgICAgICAoV2ViS2l0OjpQYWdlVmlld3BvcnRDb250 cm9sbGVyQ2xpZW50RWZsOjpzZXRWaWV3cG9ydFBvc2l0aW9uKToKIDIwMTMtMTItMTggIFRpbSBI b3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViS2l0MiBWaWV3 IEdlc3R1cmVzOiBNb3ZlIFdlYlByb2Nlc3Mtc2lkZSBnZW9tZXRyeSBjb2xsZWN0aW9uIGludG8g aXRzIG93biBjbGFzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvRXdrVmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3 LmNwcAppbmRleCBjMzRiZDU3YWUyOTE5MDZlZTk4ZTI2Yjc5NWUwNzBkMTlhMmY0YTVjLi41N2Fl M2E3MjE5ZjNmNTc2ZjcxNDY4MWQ4ZDdlMmE1MjRhNGQ1Njg3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmNwcApAQCAtMTM5NiwxNiArMTM5NiwxNiBAQCB2 b2lkIEV3a1ZpZXc6OmRpZEZpbmRab29tYWJsZUFyZWEoY29uc3QgV0tQb2ludCYgcG9pbnQsIGNv bnN0IFdLUmVjdCYgYXJlYSkKIGJvb2wgRXdrVmlldzo6c2Nyb2xsQnkoY29uc3QgSW50U2l6ZSYg b2Zmc2V0KQogewogICAgIFdLUG9pbnQgb2xkUG9zaXRpb24gPSBXS1ZpZXdHZXRDb250ZW50UG9z aXRpb24od2tWaWV3KCkpOwotICAgIEZsb2F0UG9pbnQgbmV3UG9zaXRpb24ob2xkUG9zaXRpb24u eCArIG9mZnNldC53aWR0aCgpLCBvbGRQb3NpdGlvbi55ICsgb2Zmc2V0LmhlaWdodCgpKTsKKyAg ICBmbG9hdCBjb250ZW50U2NhbGUgPSBXS1ZpZXdHZXRDb250ZW50U2NhbGVGYWN0b3Iod2tWaWV3 KCkpOworCisgICAgRmxvYXRQb2ludCBuZXdQb3NpdGlvbihvbGRQb3NpdGlvbi54ICsgb2Zmc2V0 LndpZHRoKCkgLyBjb250ZW50U2NhbGUsIG9sZFBvc2l0aW9uLnkgKyBvZmZzZXQuaGVpZ2h0KCkg LyBjb250ZW50U2NhbGUpOwogCiAgICAgLy8gVXBkYXRlIG5ldyBwb3NpdGlvbiB0byB0aGUgUGFn ZVZpZXdwb3J0Q29udHJvbGxlci4KLSAgICBmbG9hdCBjb250ZW50U2NhbGUgPSBXS1ZpZXdHZXRD b250ZW50U2NhbGVGYWN0b3Iod2tWaWV3KCkpOwotICAgIG5ld1Bvc2l0aW9uLnNjYWxlKDEgLyBj b250ZW50U2NhbGUsIDEgLyBjb250ZW50U2NhbGUpOwogICAgIG5ld1Bvc2l0aW9uID0gbV9wYWdl Vmlld3BvcnRDb250cm9sbGVyLmJvdW5kQ29udGVudHNQb3NpdGlvbkF0U2NhbGUobmV3UG9zaXRp b24sIGNvbnRlbnRTY2FsZSk7CiAgICAgbV9wYWdlVmlld3BvcnRDb250cm9sbGVyLmRpZENoYW5n ZUNvbnRlbnRzVmlzaWJpbGl0eShuZXdQb3NpdGlvbiwgY29udGVudFNjYWxlKTsKIAogICAgIC8v IFVwZGF0ZSBuZXcgcG9zaXRpb24gdG8gdGhlIFdLVmlldy4KLSAgICBXS1BvaW50IHBvc2l0aW9u ID0gV0tQb2ludE1ha2UobmV3UG9zaXRpb24ueCgpICogY29udGVudFNjYWxlLCBuZXdQb3NpdGlv bi55KCkgKiBjb250ZW50U2NhbGUpOworICAgIFdLUG9pbnQgcG9zaXRpb24gPSBXS1BvaW50TWFr ZShuZXdQb3NpdGlvbi54KCksIG5ld1Bvc2l0aW9uLnkoKSk7CiAgICAgV0tWaWV3U2V0Q29udGVu dFBvc2l0aW9uKHdrVmlldygpLCBwb3NpdGlvbik7CiAKICAgICAvLyBJZiB0aGUgcGFnZSBwb3Np dGlvbiBoYXMgbm90IGNoYW5nZWQsIG5vdGlmeSB0aGUgY2FsbGVyIHVzaW5nIHRoZSByZXR1cm4g dmFsdWUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29vcmRpbmF0ZWRH cmFwaGljcy9XZWJWaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db29yZGluYXRl ZEdyYXBoaWNzL1dlYlZpZXcuY3BwCmluZGV4IDM4NmY3NmY4Yjk4NDczMDM2MzRkNzdmYzQxZTYw NzZmN2ZhMmUxOGIuLjEwMGZhMzliZTM0Y2EzZWQ4ZWM0MTA0NDQ1NDc4ODNmMDU2MDViZTggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNzL1dl YlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBo aWNzL1dlYlZpZXcuY3BwCkBAIC0yMzksNyArMjM5LDcgQEAgQWZmaW5lVHJhbnNmb3JtIFdlYlZp ZXc6OnRyYW5zZm9ybVRvU2NlbmUoKSBjb25zdAogewogICAgIEZsb2F0UG9pbnQgcG9zaXRpb24g PSAtbV9jb250ZW50UG9zaXRpb247CiAgICAgZmxvYXQgZWZmZWN0aXZlU2NhbGUgPSBtX2NvbnRl bnRTY2FsZUZhY3RvciAqIG1fcGFnZS0+ZGV2aWNlU2NhbGVGYWN0b3IoKTsKLSAgICBwb3NpdGlv bi5zY2FsZShtX3BhZ2UtPmRldmljZVNjYWxlRmFjdG9yKCksIG1fcGFnZS0+ZGV2aWNlU2NhbGVG YWN0b3IoKSk7CisgICAgcG9zaXRpb24uc2NhbGUoZWZmZWN0aXZlU2NhbGUsIGVmZmVjdGl2ZVNj YWxlKTsKIAogICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4IHRyYW5zZm9ybSA9IG1fdXNlclZpZXdw b3J0VHJhbnNmb3JtOwogICAgIHRyYW5zZm9ybS50cmFuc2xhdGUocG9zaXRpb24ueCgpLCBwb3Np dGlvbi55KCkpOwpAQCAtMjYxLDkgKzI2MSw3IEBAIHZvaWQgV2ViVmlldzo6dXBkYXRlVmlld3Bv cnRTaXplKCkKICAgICBpZiAoQ29vcmRpbmF0ZWREcmF3aW5nQXJlYVByb3h5KiBkcmF3aW5nQXJl YSA9IHN0YXRpY19jYXN0PENvb3JkaW5hdGVkRHJhd2luZ0FyZWFQcm94eSo+KHBhZ2UoKS0+ZHJh d2luZ0FyZWEoKSkpIHsKICAgICAgICAgLy8gV2ViIFByb2Nlc3MgZXhwZWN0cyBzaXplcyBpbiBV SSB1bml0cywgYW5kIG5vdCByYXcgZGV2aWNlIHVuaXRzLgogICAgICAgICBkcmF3aW5nQXJlYS0+ c2V0U2l6ZShyb3VuZGVkSW50U2l6ZShkaXBTaXplKCkpLCBJbnRTaXplKCksIEludFNpemUoKSk7 Ci0gICAgICAgIEZsb2F0UG9pbnQgcG9zaXRpb24gPSBjb250ZW50UG9zaXRpb24oKTsKLSAgICAg ICAgcG9zaXRpb24uc2NhbGUoMSAvIG1fY29udGVudFNjYWxlRmFjdG9yLCAxIC8gbV9jb250ZW50 U2NhbGVGYWN0b3IpOwotICAgICAgICBGbG9hdFJlY3QgdmlzaWJsZUNvbnRlbnRzUmVjdChwb3Np dGlvbiwgdmlzaWJsZUNvbnRlbnRzU2l6ZSgpKTsKKyAgICAgICAgRmxvYXRSZWN0IHZpc2libGVD b250ZW50c1JlY3QoY29udGVudFBvc2l0aW9uKCksIHZpc2libGVDb250ZW50c1NpemUoKSk7CiAg ICAgICAgIHZpc2libGVDb250ZW50c1JlY3QuaW50ZXJzZWN0KEZsb2F0UmVjdChGbG9hdFBvaW50 KCksIGNvbnRlbnRzU2l6ZSgpKSk7CiAgICAgICAgIGRyYXdpbmdBcmVhLT5zZXRWaXNpYmxlQ29u dGVudHNSZWN0KHZpc2libGVDb250ZW50c1JlY3QsIEZsb2F0UG9pbnQoKSk7CiAgICAgfQpAQCAt NTE1LDcgKzUxMyw2IEBAIHZvaWQgV2ViVmlldzo6ZGlkQ2hhbmdlVmlld3BvcnRQcm9wZXJ0aWVz KGNvbnN0IFdlYkNvcmU6OlZpZXdwb3J0QXR0cmlidXRlcyYgYXR0CiB2b2lkIFdlYlZpZXc6OnBh Z2VEaWRSZXF1ZXN0U2Nyb2xsKGNvbnN0IEludFBvaW50JiBwb3NpdGlvbikKIHsKICAgICBGbG9h dFBvaW50IHVpUG9zaXRpb24ocG9zaXRpb24pOwotICAgIHVpUG9zaXRpb24uc2NhbGUoY29udGVu dFNjYWxlRmFjdG9yKCksIGNvbnRlbnRTY2FsZUZhY3RvcigpKTsKICAgICBzZXRDb250ZW50UG9z aXRpb24odWlQb3NpdGlvbik7CiAKICAgICBtX2NsaWVudC5kaWRDaGFuZ2VDb250ZW50c1Bvc2l0 aW9uKHRoaXMsIHBvc2l0aW9uKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9lZmwvUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvZWZsL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmwuY3BwCmluZGV4 IDIyYTQ1YjUyZjliOTc3ZTA3OTMzZjc2ZjFkZDdmOWMwYzJhZGFkMDkuLmIyYTY3NzJjYWQ2M2Qx MGJkY2NhNjM0MzAyN2RlOThmNjNkMzFiZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9lZmwvUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbC5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZs LmNwcApAQCAtNTMsMTAgKzUzLDggQEAgdm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50 RWZsOjpzZXRWaWV3cG9ydFBvc2l0aW9uKGNvbnN0IFdlYkNvcmU6OkZsb2F0UG8KIHsKICAgICBt X2NvbnRlbnRQb3NpdGlvbiA9IGNvbnRlbnRzUG9pbnQ7CiAKLSAgICBGbG9hdFBvaW50IHBvcyhj b250ZW50c1BvaW50KTsKICAgICBmbG9hdCBzY2FsZUZhY3RvciA9IFdLVmlld0dldENvbnRlbnRT Y2FsZUZhY3RvcihtX3ZpZXctPndrVmlldygpKTsKLSAgICBwb3Muc2NhbGUoc2NhbGVGYWN0b3Is IHNjYWxlRmFjdG9yKTsKLSAgICBXS1ZpZXdTZXRDb250ZW50UG9zaXRpb24obV92aWV3LT53a1Zp ZXcoKSwgV0tQb2ludE1ha2UocG9zLngoKSwgcG9zLnkoKSkpOworICAgIFdLVmlld1NldENvbnRl bnRQb3NpdGlvbihtX3ZpZXctPndrVmlldygpLCBXS1BvaW50TWFrZShjb250ZW50c1BvaW50Lngo KSwgY29udGVudHNQb2ludC55KCkpKTsKIAogICAgIG1fY29udHJvbGxlci0+ZGlkQ2hhbmdlQ29u dGVudHNWaXNpYmlsaXR5KG1fY29udGVudFBvc2l0aW9uLCBzY2FsZUZhY3Rvcik7CiB9Cg==