46864 2010-09-29 18:24:44 -0700 [chromium] disappearing scrollbar in accelerated compositing mode 2010-10-05 16:56:03 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 nduca nduca commit-queue dglazkov jamesr vangelis webkit.review.bot oldest_to_newest 287292 0 nduca 2010-09-29 18:24:44 -0700 Composited pages with scrollbars will sometimes lose their scrollbar handle when scrolling. This is caused by the damage rect for the scrollbar being incorrectly handled in content space. 287304 1 69294 nduca 2010-09-29 18:42:36 -0700 Created attachment 69294 Proposed fix. 287331 2 webkit.review.bot 2010-09-29 19:48:17 -0700 Attachment 69294 did not build on chromium: Build output: http://queues.webkit.org/results/4193020 287652 3 69351 nduca 2010-09-30 10:49:19 -0700 Created attachment 69351 Now, with 2x the foo 287685 4 69351 vangelis 2010-09-30 11:21:07 -0700 Comment on attachment 69351 Now, with 2x the foo View in context: https://bugs.webkit.org/attachment.cgi?id=69351&action=review > WebKit/chromium/src/WebViewImpl.cpp:2227 > if (!view) Is this a good opportunity to also take care of the FIXME at the top of this method? > WebKit/chromium/src/WebViewImpl.cpp:2278 > + m_rootLayerDirtyRect.unite(innerDamage); Does this mean you'll now have damage in both the unscrolled location and the scrolled one? Could you just reset the m_rootLayerDirtyRect to be be equal to innerDamage? 287688 5 nduca 2010-09-30 11:27:38 -0700 > Is this a good opportunity to also take care of the FIXME at the top of this method? I was going to file a separate bug for that. > Does this mean you'll now have damage in both the unscrolled location and the > scrolled one? Could you just reset the m_rootLayerDirtyRect to be be equal to > innerDamage? Uniting rather than reset is important. Consider when you have an animated image and you scrolled. The damage rect in that case has both the damage from the animation, and damage on the actual scrollbar that moved. Assigning innerDamage to the rootLayerDirtyRect would drop the srollbar damage and we'd see the scrollbar looking funky. 287869 6 vangelis 2010-09-30 15:01:34 -0700 (In reply to comment #5) > > Is this a good opportunity to also take care of the FIXME at the top of this method? > I was going to file a separate bug for that. > > > Does this mean you'll now have damage in both the unscrolled location and the > > scrolled one? Could you just reset the m_rootLayerDirtyRect to be be equal to > > innerDamage? > Uniting rather than reset is important. Consider when you have an animated image and you scrolled. The damage rect in that case has both the damage from the animation, and damage on the actual scrollbar that moved. Assigning innerDamage to the rootLayerDirtyRect would drop the srollbar damage and we'd see the scrollbar looking funky. I chatted with Nat off line and I see now why this is necessary. The patch looks good on my end. 289843 7 69351 jamesr 2010-10-05 13:34:53 -0700 Comment on attachment 69351 Now, with 2x the foo Looks good to me. We discussed how to test this offline, it depends on a bit more infrastructure on the chromium end but we'll get tests up as soon as we can. 289878 8 69840 nduca 2010-10-05 14:14:30 -0700 Created attachment 69840 Fix changelog 289894 9 nduca 2010-10-05 14:35:32 -0700 Darn, Sheib just pointed out a problem with this patch. Gotta go figure out how to address it. 289902 10 69840 jamesr 2010-10-05 14:45:59 -0700 Comment on attachment 69840 Fix changelog OK, clearing r+ in that case 289952 11 69858 nduca 2010-10-05 16:02:44 -0700 Created attachment 69858 Use content rect converted to screenspace rather than a hand-created rect. This ensures we factor in both scrollbars during scrolling. 289979 12 69858 commit-queue 2010-10-05 16:55:58 -0700 Comment on attachment 69858 Use content rect converted to screenspace rather than a hand-created rect. This ensures we factor in both scrollbars during scrolling. Clearing flags on attachment: 69858 Committed r69162: <http://trac.webkit.org/changeset/69162> 289980 13 commit-queue 2010-10-05 16:56:03 -0700 All reviewed patches have been landed. Closing bug. 69294 2010-09-29 18:42:36 -0700 2010-09-30 10:49:15 -0700 Proposed fix. bug-46864-20100929184235.patch text/plain 4725 nduca SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjg3MzUpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDktMjkgIE5hdCBE dWNhICA8bmR1Y2FAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gSGFuZGxlIGNvbXBvc2l0ZWQgcm9vdCBsYXll ciBpbnZhbGlkYXRpb25zIGluIHNjcmVlbnNwYWNlLAorICAgICAgICBmaXhpbmcgdGhlIGRpc2Fw cGVhcmluZyBzY3JvbGxiYXIgcHJvYmxlbS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTQ2ODY0CisKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6Y29tcG9zaXRlKToKKyAgICAgICAgKFdl YktpdDo6V2ViVmlld0ltcGw6OnNjcm9sbFJvb3RMYXllclJlY3QpOgorICAgICAgICAoV2ViS2l0 OjpXZWJWaWV3SW1wbDo6aW52YWxpZGF0ZVJvb3RMYXllclJlY3QpOgorICAgICAgICAoV2ViS2l0 OjpXZWJWaWV3SW1wbDo6ZG9Db21wb3NpdGUpOgorCiAyMDEwLTA5LTI5ICBLaW51a28gWWFzdWRh ICA8a2ludWtvQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBMZXZp bi4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCShyZXZpc2lvbiA2ODY4NSkK KysrIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0yMjI3LDExICsyMjI3LDExIEBAIHZvaWQgV2ViVmlld0ltcGw6OnNjcm9sbFJvb3RMYXllclJl Y3QoY28KICAgICBpZiAoIXZpZXcpCiAgICAgICAgIHJldHVybjsKIAotICAgIEludFJlY3QgY29u dGVudFJlY3QgPSB2aWV3LT52aXNpYmxlQ29udGVudFJlY3QoZmFsc2UpOworICAgIEludFJlY3Qg c2NyZWVuUmVjdCgwLCAwLCBtX3NpemUud2lkdGgsIG1fc2l6ZS5oZWlnaHQpOwogCiAgICAgLy8g V2Ugc3VwcG9ydCBmYXN0IHNjcm9sbGluZyBpbiBvbmUgZGlyZWN0aW9uIGF0IGEgdGltZS4KICAg ICBpZiAoc2Nyb2xsRGVsdGEud2lkdGgoKSAmJiBzY3JvbGxEZWx0YS5oZWlnaHQoKSkgewotICAg ICAgICBpbnZhbGlkYXRlUm9vdExheWVyUmVjdChXZWJSZWN0KGNvbnRlbnRSZWN0KSk7CisgICAg ICAgIGludmFsaWRhdGVSb290TGF5ZXJSZWN0KFdlYlJlY3Qoc2NyZWVuUmVjdCkpOwogICAgICAg ICByZXR1cm47CiAgICAgfQogCkBAIC0yMjQxLDI5ICsyMjQxLDQzIEBAIHZvaWQgV2ViVmlld0lt cGw6OnNjcm9sbFJvb3RMYXllclJlY3QoY28KICAgICBJbnRSZWN0IGRhbWFnZWRDb250ZW50c1Jl Y3Q7CiAgICAgaWYgKHNjcm9sbERlbHRhLndpZHRoKCkpIHsKICAgICAgICAgaW50IGR4ID0gc2Ny b2xsRGVsdGEud2lkdGgoKTsKLSAgICAgICAgZGFtYWdlZENvbnRlbnRzUmVjdC5zZXRZKGNvbnRl bnRSZWN0LnkoKSk7Ci0gICAgICAgIGRhbWFnZWRDb250ZW50c1JlY3Quc2V0SGVpZ2h0KGNvbnRl bnRSZWN0LmhlaWdodCgpKTsKKyAgICAgICAgZGFtYWdlZENvbnRlbnRzUmVjdC5zZXRZKHNjcmVl blJlY3QueSgpKTsKKyAgICAgICAgZGFtYWdlZENvbnRlbnRzUmVjdC5zZXRIZWlnaHQoc2NyZWVu UmVjdC5oZWlnaHQoKSk7CiAgICAgICAgIGlmIChkeCA+IDApIHsKLSAgICAgICAgICAgIGRhbWFn ZWRDb250ZW50c1JlY3Quc2V0WChjb250ZW50UmVjdC54KCkpOworICAgICAgICAgICAgZGFtYWdl ZENvbnRlbnRzUmVjdC5zZXRYKHNjcmVlblJlY3QueCgpKTsKICAgICAgICAgICAgIGRhbWFnZWRD b250ZW50c1JlY3Quc2V0V2lkdGgoZHgpOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAg ZGFtYWdlZENvbnRlbnRzUmVjdC5zZXRYKGNvbnRlbnRSZWN0LnJpZ2h0KCkgKyBkeCk7CisgICAg ICAgICAgICBkYW1hZ2VkQ29udGVudHNSZWN0LnNldFgoc2NyZWVuUmVjdC5yaWdodCgpICsgZHgp OwogICAgICAgICAgICAgZGFtYWdlZENvbnRlbnRzUmVjdC5zZXRXaWR0aCgtZHgpOwogICAgICAg ICB9CiAgICAgfSBlbHNlIHsKICAgICAgICAgaW50IGR5ID0gc2Nyb2xsRGVsdGEuaGVpZ2h0KCk7 Ci0gICAgICAgIGRhbWFnZWRDb250ZW50c1JlY3Quc2V0WChjb250ZW50UmVjdC54KCkpOwotICAg ICAgICBkYW1hZ2VkQ29udGVudHNSZWN0LnNldFdpZHRoKGNvbnRlbnRSZWN0LndpZHRoKCkpOwor ICAgICAgICBkYW1hZ2VkQ29udGVudHNSZWN0LnNldFgoc2NyZWVuUmVjdC54KCkpOworICAgICAg ICBkYW1hZ2VkQ29udGVudHNSZWN0LnNldFdpZHRoKHNjcmVlblJlY3Qud2lkdGgoKSk7CiAgICAg ICAgIGlmIChkeSA+IDApIHsKLSAgICAgICAgICAgIGRhbWFnZWRDb250ZW50c1JlY3Quc2V0WShj b250ZW50UmVjdC55KCkpOworICAgICAgICAgICAgZGFtYWdlZENvbnRlbnRzUmVjdC5zZXRZKHNj cmVlblJlY3QueSgpKTsKICAgICAgICAgICAgIGRhbWFnZWRDb250ZW50c1JlY3Quc2V0SGVpZ2h0 KGR5KTsKICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIGRhbWFnZWRDb250ZW50c1JlY3Qu c2V0WShjb250ZW50UmVjdC5ib3R0b20oKSArIGR5KTsKKyAgICAgICAgICAgIGRhbWFnZWRDb250 ZW50c1JlY3Quc2V0WShzY3JlZW5SZWN0LmJvdHRvbSgpICsgZHkpOwogICAgICAgICAgICAgZGFt YWdlZENvbnRlbnRzUmVjdC5zZXRIZWlnaHQoLWR5KTsKICAgICAgICAgfQogICAgIH0KIAogICAg IG1fcm9vdExheWVyU2Nyb2xsRGFtYWdlLnVuaXRlKGRhbWFnZWRDb250ZW50c1JlY3QpOworCisg ICAgLy8gU2Nyb2xsIGFueSBleGlzdGluZyBkYW1hZ2UgdGhhdCBpbnRlcnNlY3RzIHdpdGggY2xp cCByZWN0CisgICAgaWYgKGNsaXBSZWN0LmludGVyc2VjdHMobV9yb290TGF5ZXJEaXJ0eVJlY3Qp KSB7CisgICAgICAgIC8vIEZpbmQgdGhlIGlubmVyIGRhbWFnZQorICAgICAgICBJbnRSZWN0IGlu bmVyRGFtYWdlKGNsaXBSZWN0KTsKKyAgICAgICAgaW5uZXJEYW1hZ2UuaW50ZXJzZWN0KG1fcm9v dExheWVyRGlydHlSZWN0KTsKKworICAgICAgICAvLyBNb3ZlIHRoZSBkYW1hZ2UKKyAgICAgICAg aW5uZXJEYW1hZ2UubW92ZShzY3JvbGxEZWx0YS53aWR0aCgpLCBzY3JvbGxEZWx0YS5oZWlnaHQo KSk7CisgICAgICAgIAorICAgICAgICAvLyBNZXJnZSBpdCBiYWNrIGludG8gdGhlIGRhbWFnZWQg cmVjdAorICAgICAgICBtX3Jvb3RMYXllckRpcnR5UmVjdC51bml0ZShpbm5lckRhbWFnZSk7Cisg ICAgfQorCiAgICAgc2V0Um9vdExheWVyTmVlZHNEaXNwbGF5KCk7CiB9CiAKQEAgLTIyODAsMTMg KzIyOTQsOSBAQCB2b2lkIFdlYlZpZXdJbXBsOjppbnZhbGlkYXRlUm9vdExheWVyUmVjCiAgICAg ICAgIHJldHVybjsKICAgICBGcmFtZVZpZXcqIHZpZXcgPSBwYWdlKCktPm1haW5GcmFtZSgpLT52 aWV3KCk7CiAKLSAgICAvLyByZWN0IGlzIGluIHZpZXdwb3J0IHNwYWNlLiBDb252ZXJ0IHRvIGNv bnRlbnQgc3BhY2UKLSAgICAvLyBzbyB0aGF0IGludmFsaWRhdGlvbnMgYW5kIHNjcm9sbCBpbnZh bGlkYXRpb25zIHBsYXkgd2VsbCB3aXRoIG9uZS1hbm90aGVyLgotICAgIEludFJlY3QgY29udGVu dFJlY3QgPSB2aWV3LT53aW5kb3dUb0NvbnRlbnRzKHJlY3QpOwotCiAgICAgLy8gRklYTUU6IGFk ZCBhIHNtYXJ0ZXIgZGFtYWdlIGFnZ3JlZ2F0aW9uIGxvZ2ljIGFuZC9vciB1bmlmeSB3aXRoIAog ICAgIC8vIExheWVyQ2hyb21pdW0ncyBkYW1hZ2UgbG9naWMKLSAgICBtX3Jvb3RMYXllckRpcnR5 UmVjdC51bml0ZShjb250ZW50UmVjdCk7CisgICAgbV9yb290TGF5ZXJEaXJ0eVJlY3QudW5pdGUo cmVjdCk7CiAgICAgc2V0Um9vdExheWVyTmVlZHNEaXNwbGF5KCk7CiB9CiAKQEAgLTIzOTYsMTAg KzI0MDYsNyBAQCB2b2lkIFdlYlZpZXdJbXBsOjpkb0NvbXBvc2l0ZSgpCiAgICAgZGFtYWdlUmVj dHMuYXBwZW5kKG1fcm9vdExheWVyU2Nyb2xsRGFtYWdlKTsKICAgICBkYW1hZ2VSZWN0cy5hcHBl bmQobV9yb290TGF5ZXJEaXJ0eVJlY3QpOwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgZGFt YWdlUmVjdHMuc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgLy8gVGhlIGRhbWFnZSByZWN0IGZvciB0 aGUgcm9vdCBsYXllciBpcyBpbiBjb250ZW50IHNwYWNlIFtlLmcuIHVuc2Nyb2xsZWRdLgotICAg ICAgICAvLyBDb252ZXJ0IGZyb20gY29udGVudCBzcGFjZSB0byB2aWV3UG9ydCBzcGFjZS4KLSAg ICAgICAgY29uc3QgSW50UmVjdCBkYW1hZ2VkQ29udGVudFJlY3QgPSBkYW1hZ2VSZWN0c1tpXTsK LSAgICAgICAgSW50UmVjdCBkYW1hZ2VkUmVjdCA9IHZpZXctPmNvbnRlbnRzVG9XaW5kb3coZGFt YWdlZENvbnRlbnRSZWN0KTsKKyAgICAgICAgSW50UmVjdCBkYW1hZ2VkUmVjdCA9IGRhbWFnZVJl Y3RzW2ldOwogCiAgICAgICAgIC8vIEludGVyc2VjdCB0aGlzIHJlY3RhbmdsZSB3aXRoIHRoZSB2 aWV3UG9ydC4KICAgICAgICAgZGFtYWdlZFJlY3QuaW50ZXJzZWN0KHZpZXdQb3J0KTsK 69351 2010-09-30 10:49:19 -0700 2010-10-05 14:14:25 -0700 Now, with 2x the foo bug-46864-20100930104917.patch text/plain 4746 nduca SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjg3MzUpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDktMjkgIE5hdCBE dWNhICA8bmR1Y2FAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gSGFuZGxlIGNvbXBvc2l0ZWQgcm9vdCBsYXll ciBpbnZhbGlkYXRpb25zIGluIHNjcmVlbnNwYWNlLAorICAgICAgICBmaXhpbmcgdGhlIGRpc2Fw cGVhcmluZyBzY3JvbGxiYXIgcHJvYmxlbS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTQ2ODY0CisKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6Y29tcG9zaXRlKToKKyAgICAgICAgKFdl YktpdDo6V2ViVmlld0ltcGw6OnNjcm9sbFJvb3RMYXllclJlY3QpOgorICAgICAgICAoV2ViS2l0 OjpXZWJWaWV3SW1wbDo6aW52YWxpZGF0ZVJvb3RMYXllclJlY3QpOgorICAgICAgICAoV2ViS2l0 OjpXZWJWaWV3SW1wbDo6ZG9Db21wb3NpdGUpOgorCiAyMDEwLTA5LTI5ICBLaW51a28gWWFzdWRh ICA8a2ludWtvQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBMZXZp bi4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCShyZXZpc2lvbiA2ODY4NSkK KysrIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0yMjI3LDExICsyMjI3LDExIEBAIHZvaWQgV2ViVmlld0ltcGw6OnNjcm9sbFJvb3RMYXllclJl Y3QoY28KICAgICBpZiAoIXZpZXcpCiAgICAgICAgIHJldHVybjsKIAotICAgIEludFJlY3QgY29u dGVudFJlY3QgPSB2aWV3LT52aXNpYmxlQ29udGVudFJlY3QoZmFsc2UpOworICAgIEludFJlY3Qg c2NyZWVuUmVjdCgwLCAwLCBtX3NpemUud2lkdGgsIG1fc2l6ZS5oZWlnaHQpOwogCiAgICAgLy8g V2Ugc3VwcG9ydCBmYXN0IHNjcm9sbGluZyBpbiBvbmUgZGlyZWN0aW9uIGF0IGEgdGltZS4KICAg ICBpZiAoc2Nyb2xsRGVsdGEud2lkdGgoKSAmJiBzY3JvbGxEZWx0YS5oZWlnaHQoKSkgewotICAg ICAgICBpbnZhbGlkYXRlUm9vdExheWVyUmVjdChXZWJSZWN0KGNvbnRlbnRSZWN0KSk7CisgICAg ICAgIGludmFsaWRhdGVSb290TGF5ZXJSZWN0KFdlYlJlY3Qoc2NyZWVuUmVjdCkpOwogICAgICAg ICByZXR1cm47CiAgICAgfQogCkBAIC0yMjQxLDI5ICsyMjQxLDQzIEBAIHZvaWQgV2ViVmlld0lt cGw6OnNjcm9sbFJvb3RMYXllclJlY3QoY28KICAgICBJbnRSZWN0IGRhbWFnZWRDb250ZW50c1Jl Y3Q7CiAgICAgaWYgKHNjcm9sbERlbHRhLndpZHRoKCkpIHsKICAgICAgICAgaW50IGR4ID0gc2Ny b2xsRGVsdGEud2lkdGgoKTsKLSAgICAgICAgZGFtYWdlZENvbnRlbnRzUmVjdC5zZXRZKGNvbnRl bnRSZWN0LnkoKSk7Ci0gICAgICAgIGRhbWFnZWRDb250ZW50c1JlY3Quc2V0SGVpZ2h0KGNvbnRl bnRSZWN0LmhlaWdodCgpKTsKKyAgICAgICAgZGFtYWdlZENvbnRlbnRzUmVjdC5zZXRZKHNjcmVl blJlY3QueSgpKTsKKyAgICAgICAgZGFtYWdlZENvbnRlbnRzUmVjdC5zZXRIZWlnaHQoc2NyZWVu UmVjdC5oZWlnaHQoKSk7CiAgICAgICAgIGlmIChkeCA+IDApIHsKLSAgICAgICAgICAgIGRhbWFn ZWRDb250ZW50c1JlY3Quc2V0WChjb250ZW50UmVjdC54KCkpOworICAgICAgICAgICAgZGFtYWdl ZENvbnRlbnRzUmVjdC5zZXRYKHNjcmVlblJlY3QueCgpKTsKICAgICAgICAgICAgIGRhbWFnZWRD b250ZW50c1JlY3Quc2V0V2lkdGgoZHgpOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAg ZGFtYWdlZENvbnRlbnRzUmVjdC5zZXRYKGNvbnRlbnRSZWN0LnJpZ2h0KCkgKyBkeCk7CisgICAg ICAgICAgICBkYW1hZ2VkQ29udGVudHNSZWN0LnNldFgoc2NyZWVuUmVjdC5yaWdodCgpICsgZHgp OwogICAgICAgICAgICAgZGFtYWdlZENvbnRlbnRzUmVjdC5zZXRXaWR0aCgtZHgpOwogICAgICAg ICB9CiAgICAgfSBlbHNlIHsKICAgICAgICAgaW50IGR5ID0gc2Nyb2xsRGVsdGEuaGVpZ2h0KCk7 Ci0gICAgICAgIGRhbWFnZWRDb250ZW50c1JlY3Quc2V0WChjb250ZW50UmVjdC54KCkpOwotICAg ICAgICBkYW1hZ2VkQ29udGVudHNSZWN0LnNldFdpZHRoKGNvbnRlbnRSZWN0LndpZHRoKCkpOwor ICAgICAgICBkYW1hZ2VkQ29udGVudHNSZWN0LnNldFgoc2NyZWVuUmVjdC54KCkpOworICAgICAg ICBkYW1hZ2VkQ29udGVudHNSZWN0LnNldFdpZHRoKHNjcmVlblJlY3Qud2lkdGgoKSk7CiAgICAg ICAgIGlmIChkeSA+IDApIHsKLSAgICAgICAgICAgIGRhbWFnZWRDb250ZW50c1JlY3Quc2V0WShj b250ZW50UmVjdC55KCkpOworICAgICAgICAgICAgZGFtYWdlZENvbnRlbnRzUmVjdC5zZXRZKHNj cmVlblJlY3QueSgpKTsKICAgICAgICAgICAgIGRhbWFnZWRDb250ZW50c1JlY3Quc2V0SGVpZ2h0 KGR5KTsKICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIGRhbWFnZWRDb250ZW50c1JlY3Qu c2V0WShjb250ZW50UmVjdC5ib3R0b20oKSArIGR5KTsKKyAgICAgICAgICAgIGRhbWFnZWRDb250 ZW50c1JlY3Quc2V0WShzY3JlZW5SZWN0LmJvdHRvbSgpICsgZHkpOwogICAgICAgICAgICAgZGFt YWdlZENvbnRlbnRzUmVjdC5zZXRIZWlnaHQoLWR5KTsKICAgICAgICAgfQogICAgIH0KIAogICAg IG1fcm9vdExheWVyU2Nyb2xsRGFtYWdlLnVuaXRlKGRhbWFnZWRDb250ZW50c1JlY3QpOworCisg ICAgLy8gU2Nyb2xsIGFueSBleGlzdGluZyBkYW1hZ2UgdGhhdCBpbnRlcnNlY3RzIHdpdGggY2xp cCByZWN0CisgICAgaWYgKGNsaXBSZWN0LmludGVyc2VjdHMobV9yb290TGF5ZXJEaXJ0eVJlY3Qp KSB7CisgICAgICAgIC8vIEZpbmQgdGhlIGlubmVyIGRhbWFnZQorICAgICAgICBJbnRSZWN0IGlu bmVyRGFtYWdlKGNsaXBSZWN0KTsKKyAgICAgICAgaW5uZXJEYW1hZ2UuaW50ZXJzZWN0KG1fcm9v dExheWVyRGlydHlSZWN0KTsKKworICAgICAgICAvLyBNb3ZlIHRoZSBkYW1hZ2UKKyAgICAgICAg aW5uZXJEYW1hZ2UubW92ZShzY3JvbGxEZWx0YS53aWR0aCgpLCBzY3JvbGxEZWx0YS5oZWlnaHQo KSk7CisgICAgICAgIAorICAgICAgICAvLyBNZXJnZSBpdCBiYWNrIGludG8gdGhlIGRhbWFnZWQg cmVjdAorICAgICAgICBtX3Jvb3RMYXllckRpcnR5UmVjdC51bml0ZShpbm5lckRhbWFnZSk7Cisg ICAgfQorCiAgICAgc2V0Um9vdExheWVyTmVlZHNEaXNwbGF5KCk7CiB9CiAKQEAgLTIyNzgsMTUg KzIyOTIsMTAgQEAgdm9pZCBXZWJWaWV3SW1wbDo6aW52YWxpZGF0ZVJvb3RMYXllclJlYwogCiAg ICAgaWYgKCFwYWdlKCkpCiAgICAgICAgIHJldHVybjsKLSAgICBGcmFtZVZpZXcqIHZpZXcgPSBw YWdlKCktPm1haW5GcmFtZSgpLT52aWV3KCk7Ci0KLSAgICAvLyByZWN0IGlzIGluIHZpZXdwb3J0 IHNwYWNlLiBDb252ZXJ0IHRvIGNvbnRlbnQgc3BhY2UKLSAgICAvLyBzbyB0aGF0IGludmFsaWRh dGlvbnMgYW5kIHNjcm9sbCBpbnZhbGlkYXRpb25zIHBsYXkgd2VsbCB3aXRoIG9uZS1hbm90aGVy LgotICAgIEludFJlY3QgY29udGVudFJlY3QgPSB2aWV3LT53aW5kb3dUb0NvbnRlbnRzKHJlY3Qp OwogCiAgICAgLy8gRklYTUU6IGFkZCBhIHNtYXJ0ZXIgZGFtYWdlIGFnZ3JlZ2F0aW9uIGxvZ2lj IGFuZC9vciB1bmlmeSB3aXRoIAogICAgIC8vIExheWVyQ2hyb21pdW0ncyBkYW1hZ2UgbG9naWMK LSAgICBtX3Jvb3RMYXllckRpcnR5UmVjdC51bml0ZShjb250ZW50UmVjdCk7CisgICAgbV9yb290 TGF5ZXJEaXJ0eVJlY3QudW5pdGUocmVjdCk7CiAgICAgc2V0Um9vdExheWVyTmVlZHNEaXNwbGF5 KCk7CiB9CiAKQEAgLTIzOTYsMTAgKzI0MDUsNyBAQCB2b2lkIFdlYlZpZXdJbXBsOjpkb0NvbXBv c2l0ZSgpCiAgICAgZGFtYWdlUmVjdHMuYXBwZW5kKG1fcm9vdExheWVyU2Nyb2xsRGFtYWdlKTsK ICAgICBkYW1hZ2VSZWN0cy5hcHBlbmQobV9yb290TGF5ZXJEaXJ0eVJlY3QpOwogICAgIGZvciAo c2l6ZV90IGkgPSAwOyBpIDwgZGFtYWdlUmVjdHMuc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgLy8g VGhlIGRhbWFnZSByZWN0IGZvciB0aGUgcm9vdCBsYXllciBpcyBpbiBjb250ZW50IHNwYWNlIFtl LmcuIHVuc2Nyb2xsZWRdLgotICAgICAgICAvLyBDb252ZXJ0IGZyb20gY29udGVudCBzcGFjZSB0 byB2aWV3UG9ydCBzcGFjZS4KLSAgICAgICAgY29uc3QgSW50UmVjdCBkYW1hZ2VkQ29udGVudFJl Y3QgPSBkYW1hZ2VSZWN0c1tpXTsKLSAgICAgICAgSW50UmVjdCBkYW1hZ2VkUmVjdCA9IHZpZXct PmNvbnRlbnRzVG9XaW5kb3coZGFtYWdlZENvbnRlbnRSZWN0KTsKKyAgICAgICAgSW50UmVjdCBk YW1hZ2VkUmVjdCA9IGRhbWFnZVJlY3RzW2ldOwogCiAgICAgICAgIC8vIEludGVyc2VjdCB0aGlz IHJlY3RhbmdsZSB3aXRoIHRoZSB2aWV3UG9ydC4KICAgICAgICAgZGFtYWdlZFJlY3QuaW50ZXJz ZWN0KHZpZXdQb3J0KTsK 69840 2010-10-05 14:14:30 -0700 2010-10-05 16:02:40 -0700 Fix changelog bug-46864-20101005141429.patch text/plain 4752 nduca SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjkxMzkpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMTAtMDUgIE5hdCBE dWNhICA8bmR1Y2FAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gSGFuZGxlIGNvbXBvc2l0ZWQgcm9vdCBsYXll ciBpbnZhbGlkYXRpb25zIGluIHNjcmVlbnNwYWNlLAorICAgICAgICBmaXhpbmcgdGhlIGRpc2Fw cGVhcmluZyBzY3JvbGxiYXIgcHJvYmxlbS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTQ2ODY0CisKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6Y29tcG9zaXRlKToKKyAgICAgICAgKFdl YktpdDo6V2ViVmlld0ltcGw6OnNjcm9sbFJvb3RMYXllclJlY3QpOgorICAgICAgICAoV2ViS2l0 OjpXZWJWaWV3SW1wbDo6aW52YWxpZGF0ZVJvb3RMYXllclJlY3QpOgorICAgICAgICAoV2ViS2l0 OjpXZWJWaWV3SW1wbDo6ZG9Db21wb3NpdGUpOgorCiAyMDEwLTEwLTA1ICBBbG9rIFByaXlhZGFy c2hpICA8YWxva3BAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGgg UnVzc2VsbC4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCShyZXZpc2lvbiA2 OTEzOSkKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0yMjU2LDExICsyMjU2LDExIEBAIHZvaWQgV2ViVmlld0ltcGw6OnNjcm9sbFJvb3RM YXllclJlY3QoY28KICAgICBpZiAoIXZpZXcpCiAgICAgICAgIHJldHVybjsKIAotICAgIEludFJl Y3QgY29udGVudFJlY3QgPSB2aWV3LT52aXNpYmxlQ29udGVudFJlY3QoZmFsc2UpOworICAgIElu dFJlY3Qgc2NyZWVuUmVjdCgwLCAwLCBtX3NpemUud2lkdGgsIG1fc2l6ZS5oZWlnaHQpOwogCiAg ICAgLy8gV2Ugc3VwcG9ydCBmYXN0IHNjcm9sbGluZyBpbiBvbmUgZGlyZWN0aW9uIGF0IGEgdGlt ZS4KICAgICBpZiAoc2Nyb2xsRGVsdGEud2lkdGgoKSAmJiBzY3JvbGxEZWx0YS5oZWlnaHQoKSkg ewotICAgICAgICBpbnZhbGlkYXRlUm9vdExheWVyUmVjdChXZWJSZWN0KGNvbnRlbnRSZWN0KSk7 CisgICAgICAgIGludmFsaWRhdGVSb290TGF5ZXJSZWN0KFdlYlJlY3Qoc2NyZWVuUmVjdCkpOwog ICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC0yMjcwLDI5ICsyMjcwLDQzIEBAIHZvaWQgV2Vi Vmlld0ltcGw6OnNjcm9sbFJvb3RMYXllclJlY3QoY28KICAgICBJbnRSZWN0IGRhbWFnZWRDb250 ZW50c1JlY3Q7CiAgICAgaWYgKHNjcm9sbERlbHRhLndpZHRoKCkpIHsKICAgICAgICAgaW50IGR4 ID0gc2Nyb2xsRGVsdGEud2lkdGgoKTsKLSAgICAgICAgZGFtYWdlZENvbnRlbnRzUmVjdC5zZXRZ KGNvbnRlbnRSZWN0LnkoKSk7Ci0gICAgICAgIGRhbWFnZWRDb250ZW50c1JlY3Quc2V0SGVpZ2h0 KGNvbnRlbnRSZWN0LmhlaWdodCgpKTsKKyAgICAgICAgZGFtYWdlZENvbnRlbnRzUmVjdC5zZXRZ KHNjcmVlblJlY3QueSgpKTsKKyAgICAgICAgZGFtYWdlZENvbnRlbnRzUmVjdC5zZXRIZWlnaHQo c2NyZWVuUmVjdC5oZWlnaHQoKSk7CiAgICAgICAgIGlmIChkeCA+IDApIHsKLSAgICAgICAgICAg IGRhbWFnZWRDb250ZW50c1JlY3Quc2V0WChjb250ZW50UmVjdC54KCkpOworICAgICAgICAgICAg ZGFtYWdlZENvbnRlbnRzUmVjdC5zZXRYKHNjcmVlblJlY3QueCgpKTsKICAgICAgICAgICAgIGRh bWFnZWRDb250ZW50c1JlY3Quc2V0V2lkdGgoZHgpOwogICAgICAgICB9IGVsc2UgewotICAgICAg ICAgICAgZGFtYWdlZENvbnRlbnRzUmVjdC5zZXRYKGNvbnRlbnRSZWN0LnJpZ2h0KCkgKyBkeCk7 CisgICAgICAgICAgICBkYW1hZ2VkQ29udGVudHNSZWN0LnNldFgoc2NyZWVuUmVjdC5yaWdodCgp ICsgZHgpOwogICAgICAgICAgICAgZGFtYWdlZENvbnRlbnRzUmVjdC5zZXRXaWR0aCgtZHgpOwog ICAgICAgICB9CiAgICAgfSBlbHNlIHsKICAgICAgICAgaW50IGR5ID0gc2Nyb2xsRGVsdGEuaGVp Z2h0KCk7Ci0gICAgICAgIGRhbWFnZWRDb250ZW50c1JlY3Quc2V0WChjb250ZW50UmVjdC54KCkp OwotICAgICAgICBkYW1hZ2VkQ29udGVudHNSZWN0LnNldFdpZHRoKGNvbnRlbnRSZWN0LndpZHRo KCkpOworICAgICAgICBkYW1hZ2VkQ29udGVudHNSZWN0LnNldFgoc2NyZWVuUmVjdC54KCkpOwor ICAgICAgICBkYW1hZ2VkQ29udGVudHNSZWN0LnNldFdpZHRoKHNjcmVlblJlY3Qud2lkdGgoKSk7 CiAgICAgICAgIGlmIChkeSA+IDApIHsKLSAgICAgICAgICAgIGRhbWFnZWRDb250ZW50c1JlY3Qu c2V0WShjb250ZW50UmVjdC55KCkpOworICAgICAgICAgICAgZGFtYWdlZENvbnRlbnRzUmVjdC5z ZXRZKHNjcmVlblJlY3QueSgpKTsKICAgICAgICAgICAgIGRhbWFnZWRDb250ZW50c1JlY3Quc2V0 SGVpZ2h0KGR5KTsKICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIGRhbWFnZWRDb250ZW50 c1JlY3Quc2V0WShjb250ZW50UmVjdC5ib3R0b20oKSArIGR5KTsKKyAgICAgICAgICAgIGRhbWFn ZWRDb250ZW50c1JlY3Quc2V0WShzY3JlZW5SZWN0LmJvdHRvbSgpICsgZHkpOwogICAgICAgICAg ICAgZGFtYWdlZENvbnRlbnRzUmVjdC5zZXRIZWlnaHQoLWR5KTsKICAgICAgICAgfQogICAgIH0K IAogICAgIG1fcm9vdExheWVyU2Nyb2xsRGFtYWdlLnVuaXRlKGRhbWFnZWRDb250ZW50c1JlY3Qp OworCisgICAgLy8gU2Nyb2xsIGFueSBleGlzdGluZyBkYW1hZ2UgdGhhdCBpbnRlcnNlY3RzIHdp dGggY2xpcCByZWN0CisgICAgaWYgKGNsaXBSZWN0LmludGVyc2VjdHMobV9yb290TGF5ZXJEaXJ0 eVJlY3QpKSB7CisgICAgICAgIC8vIEZpbmQgdGhlIGlubmVyIGRhbWFnZQorICAgICAgICBJbnRS ZWN0IGlubmVyRGFtYWdlKGNsaXBSZWN0KTsKKyAgICAgICAgaW5uZXJEYW1hZ2UuaW50ZXJzZWN0 KG1fcm9vdExheWVyRGlydHlSZWN0KTsKKworICAgICAgICAvLyBNb3ZlIHRoZSBkYW1hZ2UKKyAg ICAgICAgaW5uZXJEYW1hZ2UubW92ZShzY3JvbGxEZWx0YS53aWR0aCgpLCBzY3JvbGxEZWx0YS5o ZWlnaHQoKSk7CisgICAgICAgIAorICAgICAgICAvLyBNZXJnZSBpdCBiYWNrIGludG8gdGhlIGRh bWFnZWQgcmVjdAorICAgICAgICBtX3Jvb3RMYXllckRpcnR5UmVjdC51bml0ZShpbm5lckRhbWFn ZSk7CisgICAgfQorCiAgICAgc2V0Um9vdExheWVyTmVlZHNEaXNwbGF5KCk7CiB9CiAKQEAgLTIz MDcsMTUgKzIzMjEsMTAgQEAgdm9pZCBXZWJWaWV3SW1wbDo6aW52YWxpZGF0ZVJvb3RMYXllclJl YwogCiAgICAgaWYgKCFwYWdlKCkpCiAgICAgICAgIHJldHVybjsKLSAgICBGcmFtZVZpZXcqIHZp ZXcgPSBwYWdlKCktPm1haW5GcmFtZSgpLT52aWV3KCk7Ci0KLSAgICAvLyByZWN0IGlzIGluIHZp ZXdwb3J0IHNwYWNlLiBDb252ZXJ0IHRvIGNvbnRlbnQgc3BhY2UKLSAgICAvLyBzbyB0aGF0IGlu dmFsaWRhdGlvbnMgYW5kIHNjcm9sbCBpbnZhbGlkYXRpb25zIHBsYXkgd2VsbCB3aXRoIG9uZS1h bm90aGVyLgotICAgIEludFJlY3QgY29udGVudFJlY3QgPSB2aWV3LT53aW5kb3dUb0NvbnRlbnRz KHJlY3QpOwogCiAgICAgLy8gRklYTUU6IGFkZCBhIHNtYXJ0ZXIgZGFtYWdlIGFnZ3JlZ2F0aW9u IGxvZ2ljIGFuZC9vciB1bmlmeSB3aXRoIAogICAgIC8vIExheWVyQ2hyb21pdW0ncyBkYW1hZ2Ug bG9naWMKLSAgICBtX3Jvb3RMYXllckRpcnR5UmVjdC51bml0ZShjb250ZW50UmVjdCk7CisgICAg bV9yb290TGF5ZXJEaXJ0eVJlY3QudW5pdGUocmVjdCk7CiAgICAgc2V0Um9vdExheWVyTmVlZHNE aXNwbGF5KCk7CiB9CiAKQEAgLTI0MjUsMTAgKzI0MzQsNyBAQCB2b2lkIFdlYlZpZXdJbXBsOjpk b0NvbXBvc2l0ZSgpCiAgICAgZGFtYWdlUmVjdHMuYXBwZW5kKG1fcm9vdExheWVyU2Nyb2xsRGFt YWdlKTsKICAgICBkYW1hZ2VSZWN0cy5hcHBlbmQobV9yb290TGF5ZXJEaXJ0eVJlY3QpOwogICAg IGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgZGFtYWdlUmVjdHMuc2l6ZSgpOyArK2kpIHsKLSAgICAg ICAgLy8gVGhlIGRhbWFnZSByZWN0IGZvciB0aGUgcm9vdCBsYXllciBpcyBpbiBjb250ZW50IHNw YWNlIFtlLmcuIHVuc2Nyb2xsZWRdLgotICAgICAgICAvLyBDb252ZXJ0IGZyb20gY29udGVudCBz cGFjZSB0byB2aWV3UG9ydCBzcGFjZS4KLSAgICAgICAgY29uc3QgSW50UmVjdCBkYW1hZ2VkQ29u dGVudFJlY3QgPSBkYW1hZ2VSZWN0c1tpXTsKLSAgICAgICAgSW50UmVjdCBkYW1hZ2VkUmVjdCA9 IHZpZXctPmNvbnRlbnRzVG9XaW5kb3coZGFtYWdlZENvbnRlbnRSZWN0KTsKKyAgICAgICAgSW50 UmVjdCBkYW1hZ2VkUmVjdCA9IGRhbWFnZVJlY3RzW2ldOwogCiAgICAgICAgIC8vIEludGVyc2Vj dCB0aGlzIHJlY3RhbmdsZSB3aXRoIHRoZSB2aWV3UG9ydC4KICAgICAgICAgZGFtYWdlZFJlY3Qu aW50ZXJzZWN0KHZpZXdQb3J0KTsK 69858 2010-10-05 16:02:44 -0700 2010-10-05 16:55:57 -0700 Use content rect converted to screenspace rather than a hand-created rect. This ensures we factor in both scrollbars during scrolling. bug-46864-20101005160242.patch text/plain 4737 nduca SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjkxNTApCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMTAtMDUgIE5hdCBE dWNhICA8bmR1Y2FAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gSGFuZGxlIGNvbXBvc2l0ZWQgcm9vdCBsYXll ciBpbnZhbGlkYXRpb25zIGluIHNjcmVlbnNwYWNlLAorICAgICAgICBmaXhpbmcgdGhlIGRpc2Fw cGVhcmluZyBzY3JvbGxiYXIgcHJvYmxlbS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTQ2ODY0CisKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6Y29tcG9zaXRlKToKKyAgICAgICAgKFdl YktpdDo6V2ViVmlld0ltcGw6OnNjcm9sbFJvb3RMYXllclJlY3QpOgorICAgICAgICAoV2ViS2l0 OjpXZWJWaWV3SW1wbDo6aW52YWxpZGF0ZVJvb3RMYXllclJlY3QpOgorICAgICAgICAoV2ViS2l0 OjpXZWJWaWV3SW1wbDo6ZG9Db21wb3NpdGUpOgorCiAyMDEwLTEwLTA1ICBBbmRyZXcgV2lsc29u ICA8YXR3aWxzb25AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFuZHJlYXMg S2xpbmcuCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAkocmV2aXNpb24gNjkx NTApCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMjI1NywxMCArMjI1NywxMSBAQCB2b2lkIFdlYlZpZXdJbXBsOjpzY3JvbGxSb290TGF5 ZXJSZWN0KGNvCiAgICAgICAgIHJldHVybjsKIAogICAgIEludFJlY3QgY29udGVudFJlY3QgPSB2 aWV3LT52aXNpYmxlQ29udGVudFJlY3QoZmFsc2UpOworICAgIEludFJlY3Qgc2NyZWVuUmVjdCA9 IHZpZXctPmNvbnRlbnRzVG9XaW5kb3coY29udGVudFJlY3QpOwogCiAgICAgLy8gV2Ugc3VwcG9y dCBmYXN0IHNjcm9sbGluZyBpbiBvbmUgZGlyZWN0aW9uIGF0IGEgdGltZS4KICAgICBpZiAoc2Ny b2xsRGVsdGEud2lkdGgoKSAmJiBzY3JvbGxEZWx0YS5oZWlnaHQoKSkgewotICAgICAgICBpbnZh bGlkYXRlUm9vdExheWVyUmVjdChXZWJSZWN0KGNvbnRlbnRSZWN0KSk7CisgICAgICAgIGludmFs aWRhdGVSb290TGF5ZXJSZWN0KFdlYlJlY3Qoc2NyZWVuUmVjdCkpOwogICAgICAgICByZXR1cm47 CiAgICAgfQogCkBAIC0yMjcwLDI5ICsyMjcxLDQzIEBAIHZvaWQgV2ViVmlld0ltcGw6OnNjcm9s bFJvb3RMYXllclJlY3QoY28KICAgICBJbnRSZWN0IGRhbWFnZWRDb250ZW50c1JlY3Q7CiAgICAg aWYgKHNjcm9sbERlbHRhLndpZHRoKCkpIHsKICAgICAgICAgaW50IGR4ID0gc2Nyb2xsRGVsdGEu d2lkdGgoKTsKLSAgICAgICAgZGFtYWdlZENvbnRlbnRzUmVjdC5zZXRZKGNvbnRlbnRSZWN0Lnko KSk7Ci0gICAgICAgIGRhbWFnZWRDb250ZW50c1JlY3Quc2V0SGVpZ2h0KGNvbnRlbnRSZWN0Lmhl aWdodCgpKTsKKyAgICAgICAgZGFtYWdlZENvbnRlbnRzUmVjdC5zZXRZKHNjcmVlblJlY3QueSgp KTsKKyAgICAgICAgZGFtYWdlZENvbnRlbnRzUmVjdC5zZXRIZWlnaHQoc2NyZWVuUmVjdC5oZWln aHQoKSk7CiAgICAgICAgIGlmIChkeCA+IDApIHsKLSAgICAgICAgICAgIGRhbWFnZWRDb250ZW50 c1JlY3Quc2V0WChjb250ZW50UmVjdC54KCkpOworICAgICAgICAgICAgZGFtYWdlZENvbnRlbnRz UmVjdC5zZXRYKHNjcmVlblJlY3QueCgpKTsKICAgICAgICAgICAgIGRhbWFnZWRDb250ZW50c1Jl Y3Quc2V0V2lkdGgoZHgpOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgZGFtYWdlZENv bnRlbnRzUmVjdC5zZXRYKGNvbnRlbnRSZWN0LnJpZ2h0KCkgKyBkeCk7CisgICAgICAgICAgICBk YW1hZ2VkQ29udGVudHNSZWN0LnNldFgoc2NyZWVuUmVjdC5yaWdodCgpICsgZHgpOwogICAgICAg ICAgICAgZGFtYWdlZENvbnRlbnRzUmVjdC5zZXRXaWR0aCgtZHgpOwogICAgICAgICB9CiAgICAg fSBlbHNlIHsKICAgICAgICAgaW50IGR5ID0gc2Nyb2xsRGVsdGEuaGVpZ2h0KCk7Ci0gICAgICAg IGRhbWFnZWRDb250ZW50c1JlY3Quc2V0WChjb250ZW50UmVjdC54KCkpOwotICAgICAgICBkYW1h Z2VkQ29udGVudHNSZWN0LnNldFdpZHRoKGNvbnRlbnRSZWN0LndpZHRoKCkpOworICAgICAgICBk YW1hZ2VkQ29udGVudHNSZWN0LnNldFgoc2NyZWVuUmVjdC54KCkpOworICAgICAgICBkYW1hZ2Vk Q29udGVudHNSZWN0LnNldFdpZHRoKHNjcmVlblJlY3Qud2lkdGgoKSk7CiAgICAgICAgIGlmIChk eSA+IDApIHsKLSAgICAgICAgICAgIGRhbWFnZWRDb250ZW50c1JlY3Quc2V0WShjb250ZW50UmVj dC55KCkpOworICAgICAgICAgICAgZGFtYWdlZENvbnRlbnRzUmVjdC5zZXRZKHNjcmVlblJlY3Qu eSgpKTsKICAgICAgICAgICAgIGRhbWFnZWRDb250ZW50c1JlY3Quc2V0SGVpZ2h0KGR5KTsKICAg ICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIGRhbWFnZWRDb250ZW50c1JlY3Quc2V0WShjb250 ZW50UmVjdC5ib3R0b20oKSArIGR5KTsKKyAgICAgICAgICAgIGRhbWFnZWRDb250ZW50c1JlY3Qu c2V0WShzY3JlZW5SZWN0LmJvdHRvbSgpICsgZHkpOwogICAgICAgICAgICAgZGFtYWdlZENvbnRl bnRzUmVjdC5zZXRIZWlnaHQoLWR5KTsKICAgICAgICAgfQogICAgIH0KIAogICAgIG1fcm9vdExh eWVyU2Nyb2xsRGFtYWdlLnVuaXRlKGRhbWFnZWRDb250ZW50c1JlY3QpOworCisgICAgLy8gU2Ny b2xsIGFueSBleGlzdGluZyBkYW1hZ2UgdGhhdCBpbnRlcnNlY3RzIHdpdGggY2xpcCByZWN0Cisg ICAgaWYgKGNsaXBSZWN0LmludGVyc2VjdHMobV9yb290TGF5ZXJEaXJ0eVJlY3QpKSB7CisgICAg ICAgIC8vIEZpbmQgdGhlIGlubmVyIGRhbWFnZQorICAgICAgICBJbnRSZWN0IGlubmVyRGFtYWdl KGNsaXBSZWN0KTsKKyAgICAgICAgaW5uZXJEYW1hZ2UuaW50ZXJzZWN0KG1fcm9vdExheWVyRGly dHlSZWN0KTsKKworICAgICAgICAvLyBNb3ZlIHRoZSBkYW1hZ2UKKyAgICAgICAgaW5uZXJEYW1h Z2UubW92ZShzY3JvbGxEZWx0YS53aWR0aCgpLCBzY3JvbGxEZWx0YS5oZWlnaHQoKSk7CisgICAg ICAgIAorICAgICAgICAvLyBNZXJnZSBpdCBiYWNrIGludG8gdGhlIGRhbWFnZWQgcmVjdAorICAg ICAgICBtX3Jvb3RMYXllckRpcnR5UmVjdC51bml0ZShpbm5lckRhbWFnZSk7CisgICAgfQorCiAg ICAgc2V0Um9vdExheWVyTmVlZHNEaXNwbGF5KCk7CiB9CiAKQEAgLTIzMDcsMTUgKzIzMjIsMTAg QEAgdm9pZCBXZWJWaWV3SW1wbDo6aW52YWxpZGF0ZVJvb3RMYXllclJlYwogCiAgICAgaWYgKCFw YWdlKCkpCiAgICAgICAgIHJldHVybjsKLSAgICBGcmFtZVZpZXcqIHZpZXcgPSBwYWdlKCktPm1h aW5GcmFtZSgpLT52aWV3KCk7Ci0KLSAgICAvLyByZWN0IGlzIGluIHZpZXdwb3J0IHNwYWNlLiBD b252ZXJ0IHRvIGNvbnRlbnQgc3BhY2UKLSAgICAvLyBzbyB0aGF0IGludmFsaWRhdGlvbnMgYW5k IHNjcm9sbCBpbnZhbGlkYXRpb25zIHBsYXkgd2VsbCB3aXRoIG9uZS1hbm90aGVyLgotICAgIElu dFJlY3QgY29udGVudFJlY3QgPSB2aWV3LT53aW5kb3dUb0NvbnRlbnRzKHJlY3QpOwogCiAgICAg Ly8gRklYTUU6IGFkZCBhIHNtYXJ0ZXIgZGFtYWdlIGFnZ3JlZ2F0aW9uIGxvZ2ljIGFuZC9vciB1 bmlmeSB3aXRoIAogICAgIC8vIExheWVyQ2hyb21pdW0ncyBkYW1hZ2UgbG9naWMKLSAgICBtX3Jv b3RMYXllckRpcnR5UmVjdC51bml0ZShjb250ZW50UmVjdCk7CisgICAgbV9yb290TGF5ZXJEaXJ0 eVJlY3QudW5pdGUocmVjdCk7CiAgICAgc2V0Um9vdExheWVyTmVlZHNEaXNwbGF5KCk7CiB9CiAK QEAgLTI0MjUsMTAgKzI0MzUsNyBAQCB2b2lkIFdlYlZpZXdJbXBsOjpkb0NvbXBvc2l0ZSgpCiAg ICAgZGFtYWdlUmVjdHMuYXBwZW5kKG1fcm9vdExheWVyU2Nyb2xsRGFtYWdlKTsKICAgICBkYW1h Z2VSZWN0cy5hcHBlbmQobV9yb290TGF5ZXJEaXJ0eVJlY3QpOwogICAgIGZvciAoc2l6ZV90IGkg PSAwOyBpIDwgZGFtYWdlUmVjdHMuc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgLy8gVGhlIGRhbWFn ZSByZWN0IGZvciB0aGUgcm9vdCBsYXllciBpcyBpbiBjb250ZW50IHNwYWNlIFtlLmcuIHVuc2Ny b2xsZWRdLgotICAgICAgICAvLyBDb252ZXJ0IGZyb20gY29udGVudCBzcGFjZSB0byB2aWV3UG9y dCBzcGFjZS4KLSAgICAgICAgY29uc3QgSW50UmVjdCBkYW1hZ2VkQ29udGVudFJlY3QgPSBkYW1h Z2VSZWN0c1tpXTsKLSAgICAgICAgSW50UmVjdCBkYW1hZ2VkUmVjdCA9IHZpZXctPmNvbnRlbnRz VG9XaW5kb3coZGFtYWdlZENvbnRlbnRSZWN0KTsKKyAgICAgICAgSW50UmVjdCBkYW1hZ2VkUmVj dCA9IGRhbWFnZVJlY3RzW2ldOwogCiAgICAgICAgIC8vIEludGVyc2VjdCB0aGlzIHJlY3Rhbmds ZSB3aXRoIHRoZSB2aWV3UG9ydC4KICAgICAgICAgZGFtYWdlZFJlY3QuaW50ZXJzZWN0KHZpZXdQ b3J0KTsK