61884 2011-06-01 13:54:04 -0700 Switch paintOverflowControls to use IntPoint 2011-06-01 16:16:06 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 61883 60318 1 leviw leviw darin eae eric simon.fraser oldest_to_newest 413633 0 leviw 2011-06-01 13:54:04 -0700 Ongoing tx/ty removal. 413685 1 95666 leviw 2011-06-01 14:49:16 -0700 Created attachment 95666 Patch 413687 2 95666 eric 2011-06-01 14:51:12 -0700 Comment on attachment 95666 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95666&action=review > Source/WebCore/rendering/RenderLayer.cpp:2284 > + m_cachedOverlayScrollbarOffset = paintOffset; eeewww. Wonder why this exists. > Source/WebCore/rendering/RenderLayer.cpp:2295 > + adjustedPaintOffset.move(m_cachedOverlayScrollbarOffset); This doesn't look right. I think you meant =. > Source/WebCore/rendering/RenderLayerBacking.cpp:1105 > + int tx = layerBounds.x() - m_owningLayer->renderBoxX(); > + int ty = layerBounds.y() - m_owningLayer->renderBoxY(); I guess we're not ready to kill the tx, ty here yet? :) 413689 3 95666 leviw 2011-06-01 14:53:31 -0700 Comment on attachment 95666 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95666&action=review Thanks for the catch! >> Source/WebCore/rendering/RenderLayer.cpp:2284 >> + m_cachedOverlayScrollbarOffset = paintOffset; > > eeewww. Wonder why this exists. I'll second that... Seems pretty funky to me! >> Source/WebCore/rendering/RenderLayer.cpp:2295 >> + adjustedPaintOffset.move(m_cachedOverlayScrollbarOffset); > > This doesn't look right. I think you meant =. D'oh! Good catch! >> Source/WebCore/rendering/RenderLayerBacking.cpp:1105 >> + int ty = layerBounds.y() - m_owningLayer->renderBoxY(); > > I guess we're not ready to kill the tx, ty here yet? :) paintLayer will unfortunately probably be one of the last, but we're making great progress! :) 413690 4 95668 leviw 2011-06-01 14:54:33 -0700 Created attachment 95668 Patch 413720 5 95668 eric 2011-06-01 15:51:00 -0700 Comment on attachment 95668 Patch OK. 413739 6 95668 leviw 2011-06-01 16:16:02 -0700 Comment on attachment 95668 Patch Clearing flags on attachment: 95668 Committed r87864: <http://trac.webkit.org/changeset/87864> 413740 7 leviw 2011-06-01 16:16:06 -0700 All reviewed patches have been landed. Closing bug. 95666 2011-06-01 14:49:16 -0700 2011-06-01 14:54:30 -0700 Patch bug-61884-20110601144915.patch text/plain 7638 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3ODUyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDYtMDEgIExldmkgV2Vp bnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFN3aXRjaCBwYWludE92ZXJmbG93Q29udHJvbHMgdG8gdXNl IEludFBvaW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02MTg4NAorCisgICAgICAgIFN3aXRjaGluZyBwYWludE92ZXJmbG93Q29udHJvbHMgdG8gdXNl IGFuIEludFBvaW50IGluc3RlYWQgb2YgYSBwYWlyIG9mIGludHMuCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzIHNpbmNlIHRoaXMgaXMgc2ltcGxlIHJlZmFjdG9yaW5nLgorCisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpw YWludCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckxheWVyOjpwYWludE92ZXJmbG93Q29udHJvbHMpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyTGF5ZXI6OnBhaW50TGF5ZXIpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJMYXllci5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjpwYWludEludG9MYXllcik6CisK IDIwMTEtMDYtMDEgIERhbmllbCBDaGVuZyAgPGRjaGVuZ0BjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgVG9ueSBDaGFuZy4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCbG9jay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJsb2NrLmNwcAkocmV2aXNpb24gODc4NDQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMjY4LDcgKzIyNjgsNyBA QCB2b2lkIFJlbmRlckJsb2NrOjpwYWludChQYWludEluZm8mIHBhaW50CiAgICAgLy8gei1pbmRl eC4gIFdlIHBhaW50IGFmdGVyIHdlIHBhaW50ZWQgdGhlIGJhY2tncm91bmQvYm9yZGVyLCBzbyB0 aGF0IHRoZSBzY3JvbGxiYXJzIHdpbGwKICAgICAvLyBzaXQgYWJvdmUgdGhlIGJhY2tncm91bmQv Ym9yZGVyLgogICAgIGlmIChoYXNPdmVyZmxvd0NsaXAoKSAmJiBzdHlsZSgpLT52aXNpYmlsaXR5 KCkgPT0gVklTSUJMRSAmJiAocGhhc2UgPT0gUGFpbnRQaGFzZUJsb2NrQmFja2dyb3VuZCB8fCBw aGFzZSA9PSBQYWludFBoYXNlQ2hpbGRCbG9ja0JhY2tncm91bmQpICYmIHBhaW50SW5mby5zaG91 bGRQYWludFdpdGhpblJvb3QodGhpcykpCi0gICAgICAgIGxheWVyKCktPnBhaW50T3ZlcmZsb3dD b250cm9scyhwYWludEluZm8uY29udGV4dCwgdHgsIHR5LCBwYWludEluZm8ucmVjdCk7CisgICAg ICAgIGxheWVyKCktPnBhaW50T3ZlcmZsb3dDb250cm9scyhwYWludEluZm8uY29udGV4dCwgSW50 UG9pbnQodHgsIHR5KSwgcGFpbnRJbmZvLnJlY3QpOwogfQogCiB2b2lkIFJlbmRlckJsb2NrOjpw YWludENvbHVtblJ1bGVzKFBhaW50SW5mbyYgcGFpbnRJbmZvLCBpbnQgdHgsIGludCB0eSkKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAkocmV2aXNpb24gODc4 NDUpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0yMjY2LDcgKzIyNjYsNyBAQCB2b2lkIFJlbmRlckxheWVyOjp1cGRhdGVTY3Jv bGxJbmZvQWZ0ZXJMCiAgICAgICAgIHVwZGF0ZU92ZXJmbG93U3RhdHVzKGhvcml6b250YWxPdmVy ZmxvdywgdmVydGljYWxPdmVyZmxvdyk7CiB9CiAKLXZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50T3Zl cmZsb3dDb250cm9scyhHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGludCB0eCwgaW50IHR5LCBj b25zdCBJbnRSZWN0JiBkYW1hZ2VSZWN0LCBib29sIHBhaW50aW5nT3ZlcmxheUNvbnRyb2xzKQor dm9pZCBSZW5kZXJMYXllcjo6cGFpbnRPdmVyZmxvd0NvbnRyb2xzKEdyYXBoaWNzQ29udGV4dCog Y29udGV4dCwgY29uc3QgSW50UG9pbnQmIHBhaW50T2Zmc2V0LCBjb25zdCBJbnRSZWN0JiBkYW1h Z2VSZWN0LCBib29sIHBhaW50aW5nT3ZlcmxheUNvbnRyb2xzKQogewogICAgIC8vIERvbid0IGRv IGFueXRoaW5nIGlmIHdlIGhhdmUgbm8gb3ZlcmZsb3cuCiAgICAgaWYgKCFyZW5kZXJlcigpLT5o YXNPdmVyZmxvd0NsaXAoKSkKQEAgLTIyODEsNyArMjI4MSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6 OnBhaW50T3ZlcmZsb3dDb250cm9scygKICAgICBpZiAoaGFzT3ZlcmxheVNjcm9sbGJhcnMoKSAm JiAhcGFpbnRpbmdPdmVybGF5Q29udHJvbHMpIHsKICAgICAgICAgUmVuZGVyVmlldyogcmVuZGVy VmlldyA9IHJlbmRlcmVyKCktPnZpZXcoKTsKICAgICAgICAgcmVuZGVyVmlldy0+bGF5ZXIoKS0+ c2V0Q29udGFpbnNEaXJ0eU92ZXJsYXlTY3JvbGxiYXJzKHRydWUpOwotICAgICAgICBtX2NhY2hl ZE92ZXJsYXlTY3JvbGxiYXJPZmZzZXQgPSBJbnRQb2ludCh0eCwgdHkpOworICAgICAgICBtX2Nh Y2hlZE92ZXJsYXlTY3JvbGxiYXJPZmZzZXQgPSBwYWludE9mZnNldDsKICAgICAgICAgcmVuZGVy Vmlldy0+ZnJhbWVWaWV3KCktPnNldENvbnRhaW5zU2Nyb2xsYWJsZUFyZWFXaXRoT3ZlcmxheVNj cm9sbGJhcnModHJ1ZSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0yMjkwLDE3ICsyMjkw LDE0IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50T3ZlcmZsb3dDb250cm9scygKICAgICBpZiAo cGFpbnRpbmdPdmVybGF5Q29udHJvbHMgJiYgIWhhc092ZXJsYXlTY3JvbGxiYXJzKCkpCiAgICAg ICAgIHJldHVybjsKIAotICAgIGludCBvZmZzZXRYID0gdHg7Ci0gICAgaW50IG9mZnNldFkgPSB0 eTsKLSAgICBpZiAocGFpbnRpbmdPdmVybGF5Q29udHJvbHMpIHsKLSAgICAgICAgb2Zmc2V0WCA9 IG1fY2FjaGVkT3ZlcmxheVNjcm9sbGJhck9mZnNldC54KCk7Ci0gICAgICAgIG9mZnNldFkgPSBt X2NhY2hlZE92ZXJsYXlTY3JvbGxiYXJPZmZzZXQueSgpOwotICAgIH0KKyAgICBJbnRQb2ludCBh ZGp1c3RlZFBhaW50T2Zmc2V0ID0gcGFpbnRPZmZzZXQ7CisgICAgaWYgKHBhaW50aW5nT3Zlcmxh eUNvbnRyb2xzKQorICAgICAgICBhZGp1c3RlZFBhaW50T2Zmc2V0Lm1vdmUobV9jYWNoZWRPdmVy bGF5U2Nyb2xsYmFyT2Zmc2V0KTsKIAogICAgIC8vIE1vdmUgdGhlIHNjcm9sbGJhciB3aWRnZXRz IGlmIG5lY2Vzc2FyeS4gIFdlIG5vcm1hbGx5IG1vdmUgYW5kIHJlc2l6ZSB3aWRnZXRzIGR1cmlu ZyBsYXlvdXQsIGJ1dCBzb21ldGltZXMKICAgICAvLyB3aWRnZXRzIGNhbiBtb3ZlIHdpdGhvdXQg bGF5b3V0IG9jY3VycmluZyAobW9zdCBub3RhYmx5IHdoZW4geW91IHNjcm9sbCBhIGRvY3VtZW50 IHRoYXQKICAgICAvLyBjb250YWlucyBmaXhlZCBwb3NpdGlvbmVkIGVsZW1lbnRzKS4KLSAgICBw b3NpdGlvbk92ZXJmbG93Q29udHJvbHMoSW50U2l6ZShvZmZzZXRYLCBvZmZzZXRZKSk7CisgICAg cG9zaXRpb25PdmVyZmxvd0NvbnRyb2xzKHRvU2l6ZShhZGp1c3RlZFBhaW50T2Zmc2V0KSk7CiAK ICAgICAvLyBOb3cgdGhhdCB3ZSdyZSBzdXJlIHRoZSBzY3JvbGxiYXJzIGFyZSBpbiB0aGUgcmln aHQgcGxhY2UsIHBhaW50IHRoZW0uCiAgICAgaWYgKG1faEJhcgpAQCAtMjMyMywxMCArMjMyMCwx MCBAQCB2b2lkIFJlbmRlckxheWVyOjpwYWludE92ZXJmbG93Q29udHJvbHMoCiAKICAgICAvLyBX ZSBmaWxsIG91ciBzY3JvbGwgY29ybmVyIHdpdGggd2hpdGUgaWYgd2UgaGF2ZSBhIHNjcm9sbGJh ciB0aGF0IGRvZXNuJ3QgcnVuIGFsbCB0aGUgd2F5IHVwIHRvIHRoZQogICAgIC8vIGVkZ2Ugb2Yg dGhlIGJveC4KLSAgICBwYWludFNjcm9sbENvcm5lcihjb250ZXh0LCBJbnRQb2ludChvZmZzZXRY LCBvZmZzZXRZKSwgZGFtYWdlUmVjdCk7CisgICAgcGFpbnRTY3JvbGxDb3JuZXIoY29udGV4dCwg YWRqdXN0ZWRQYWludE9mZnNldCwgZGFtYWdlUmVjdCk7CiAgICAgCiAgICAgLy8gUGFpbnQgb3Vy IHJlc2l6ZXIgbGFzdCwgc2luY2UgaXQgc2l0cyBvbiB0b3Agb2YgdGhlIHNjcm9sbCBjb3JuZXIu Ci0gICAgcGFpbnRSZXNpemVyKGNvbnRleHQsIEludFBvaW50KG9mZnNldFgsIG9mZnNldFkpLCBk YW1hZ2VSZWN0KTsKKyAgICBwYWludFJlc2l6ZXIoY29udGV4dCwgYWRqdXN0ZWRQYWludE9mZnNl dCwgZGFtYWdlUmVjdCk7CiB9CiAKIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50U2Nyb2xsQ29ybmVy KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50UG9pbnQmIHBhaW50T2Zmc2V0LCBj b25zdCBJbnRSZWN0JiBkYW1hZ2VSZWN0KQpAQCAtMjcwOCw3ICsyNzA1LDcgQEAgdm9pZCBSZW5k ZXJMYXllcjo6cGFpbnRMYXllcihSZW5kZXJMYXllcgogCiAgICAgaWYgKHBhaW50aW5nT3Zlcmxh eVNjcm9sbGJhcnMpIHsKICAgICAgICAgc2V0Q2xpcChwLCBwYWludERpcnR5UmVjdCwgZGFtYWdl UmVjdCk7Ci0gICAgICAgIHBhaW50T3ZlcmZsb3dDb250cm9scyhwLCB0eCwgdHksIGRhbWFnZVJl Y3QsIHRydWUpOworICAgICAgICBwYWludE92ZXJmbG93Q29udHJvbHMocCwgSW50UG9pbnQodHgs IHR5KSwgZGFtYWdlUmVjdCwgdHJ1ZSk7CiAgICAgICAgIHJlc3RvcmVDbGlwKHAsIHBhaW50RGly dHlSZWN0LCBkYW1hZ2VSZWN0KTsKICAgICB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllci5oCShyZXZpc2lvbiA4Nzg0NSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllci5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNjEsNyArMjYxLDcgQEAgcHVi bGljOgogICAgIGJvb2wgaGl0VGVzdE92ZXJmbG93Q29udHJvbHMoSGl0VGVzdFJlc3VsdCYsIGNv bnN0IEludFBvaW50JiBsb2NhbFBvaW50KTsKICAgICBJbnRTaXplIG9mZnNldEZyb21SZXNpemVD b3JuZXIoY29uc3QgSW50UG9pbnQmIGFic29sdXRlUG9pbnQpIGNvbnN0OwogCi0gICAgdm9pZCBw YWludE92ZXJmbG93Q29udHJvbHMoR3JhcGhpY3NDb250ZXh0KiwgaW50IHR4LCBpbnQgdHksIGNv bnN0IEludFJlY3QmIGRhbWFnZVJlY3QsIGJvb2wgcGFpbnRpbmdPdmVybGF5Q29udHJvbHMgPSBm YWxzZSk7CisgICAgdm9pZCBwYWludE92ZXJmbG93Q29udHJvbHMoR3JhcGhpY3NDb250ZXh0Kiwg Y29uc3QgSW50UG9pbnQmLCBjb25zdCBJbnRSZWN0JiBkYW1hZ2VSZWN0LCBib29sIHBhaW50aW5n T3ZlcmxheUNvbnRyb2xzID0gZmFsc2UpOwogICAgIHZvaWQgcGFpbnRTY3JvbGxDb3JuZXIoR3Jh cGhpY3NDb250ZXh0KiwgY29uc3QgSW50UG9pbnQmLCBjb25zdCBJbnRSZWN0JiBkYW1hZ2VSZWN0 KTsKICAgICB2b2lkIHBhaW50UmVzaXplcihHcmFwaGljc0NvbnRleHQqLCBjb25zdCBJbnRQb2lu dCYsIGNvbnN0IEludFJlY3QmIGRhbWFnZVJlY3QpOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAkocmV2aXNpb24gODc4NDUpCisr KyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTEwMCwxMSArMTEwMCw5IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjpw YWludEludG9MYXllcigKICAgICAvLyBDYWxjdWxhdGUgdGhlIGNsaXAgcmVjdHMgd2Ugc2hvdWxk IHVzZS4KICAgICBJbnRSZWN0IGxheWVyQm91bmRzLCBkYW1hZ2VSZWN0LCBjbGlwUmVjdFRvQXBw bHksIG91dGxpbmVSZWN0OwogICAgIG1fb3duaW5nTGF5ZXItPmNhbGN1bGF0ZVJlY3RzKHJvb3RM YXllciwgcGFpbnREaXJ0eVJlY3QsIGxheWVyQm91bmRzLCBkYW1hZ2VSZWN0LCBjbGlwUmVjdFRv QXBwbHksIG91dGxpbmVSZWN0KTsKLSAgICAKLSAgICBpbnQgeCA9IGxheWVyQm91bmRzLngoKTsg ICAgICAgIC8vIGxheWVyQm91bmRzIGlzIGNvbXB1dGVkIHJlbGF0aXZlIHRvIHJvb3RMYXllcgot ICAgIGludCB5ID0gbGF5ZXJCb3VuZHMueSgpOwotICAgIGludCB0eCA9IHggLSBtX293bmluZ0xh eWVyLT5yZW5kZXJCb3hYKCk7Ci0gICAgaW50IHR5ID0geSAtIG1fb3duaW5nTGF5ZXItPnJlbmRl ckJveFkoKTsKKworICAgIGludCB0eCA9IGxheWVyQm91bmRzLngoKSAtIG1fb3duaW5nTGF5ZXIt PnJlbmRlckJveFgoKTsKKyAgICBpbnQgdHkgPSBsYXllckJvdW5kcy55KCkgLSBtX293bmluZ0xh eWVyLT5yZW5kZXJCb3hZKCk7CiAKICAgICAvLyBJZiB0aGlzIGxheWVyJ3MgcmVuZGVyZXIgaXMg YSBjaGlsZCBvZiB0aGUgcGFpbnRpbmdSb290LCB3ZSByZW5kZXIgdW5jb25kaXRpb25hbGx5LCB3 aGljaAogICAgIC8vIGlzIGRvbmUgYnkgcGFzc2luZyBhIG5pbCBwYWludGluZ1Jvb3QgZG93biB0 byBvdXIgcmVuZGVyZXIgKGFzIGlmIG5vIHBhaW50aW5nUm9vdCB3YXMgZXZlciBzZXQpLgpAQCAt MTEyNyw3ICsxMTI1LDcgQEAgdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnBhaW50SW50b0xheWVy KAogICAgICAgICAvLyBPdXIgc2Nyb2xsYmFyIHdpZGdldHMgcGFpbnQgZXhhY3RseSB3aGVuIHdl IHRlbGwgdGhlbSB0bywgc28gdGhhdCB0aGV5IHdvcmsgcHJvcGVybHkgd2l0aAogICAgICAgICAv LyB6LWluZGV4LiAgV2UgcGFpbnQgYWZ0ZXIgd2UgcGFpbnRlZCB0aGUgYmFja2dyb3VuZC9ib3Jk ZXIsIHNvIHRoYXQgdGhlIHNjcm9sbGJhcnMgd2lsbAogICAgICAgICAvLyBzaXQgYWJvdmUgdGhl IGJhY2tncm91bmQvYm9yZGVyLgotICAgICAgICBtX293bmluZ0xheWVyLT5wYWludE92ZXJmbG93 Q29udHJvbHMoY29udGV4dCwgeCwgeSwgZGFtYWdlUmVjdCk7CisgICAgICAgIG1fb3duaW5nTGF5 ZXItPnBhaW50T3ZlcmZsb3dDb250cm9scyhjb250ZXh0LCBsYXllckJvdW5kcy5sb2NhdGlvbigp LCBkYW1hZ2VSZWN0KTsKICAgICAgICAgCiAgICAgICAgIC8vIFJlc3RvcmUgdGhlIGNsaXAuCiAg ICAgICAgIHJlc3RvcmVDbGlwKGNvbnRleHQsIHBhaW50RGlydHlSZWN0LCBkYW1hZ2VSZWN0KTsK 95668 2011-06-01 14:54:33 -0700 2011-06-01 16:16:01 -0700 Patch bug-61884-20110601145432.patch text/plain 7634 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3ODUyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDYtMDEgIExldmkgV2Vp bnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFN3aXRjaCBwYWludE92ZXJmbG93Q29udHJvbHMgdG8gdXNl IEludFBvaW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02MTg4NAorCisgICAgICAgIFN3aXRjaGluZyBwYWludE92ZXJmbG93Q29udHJvbHMgdG8gdXNl IGFuIEludFBvaW50IGluc3RlYWQgb2YgYSBwYWlyIG9mIGludHMuCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzIHNpbmNlIHRoaXMgaXMgc2ltcGxlIHJlZmFjdG9yaW5nLgorCisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpw YWludCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckxheWVyOjpwYWludE92ZXJmbG93Q29udHJvbHMpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyTGF5ZXI6OnBhaW50TGF5ZXIpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJMYXllci5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjpwYWludEludG9MYXllcik6CisK IDIwMTEtMDYtMDEgIERhbmllbCBDaGVuZyAgPGRjaGVuZ0BjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgVG9ueSBDaGFuZy4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCbG9jay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJsb2NrLmNwcAkocmV2aXNpb24gODc4NDQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMjY4LDcgKzIyNjgsNyBA QCB2b2lkIFJlbmRlckJsb2NrOjpwYWludChQYWludEluZm8mIHBhaW50CiAgICAgLy8gei1pbmRl eC4gIFdlIHBhaW50IGFmdGVyIHdlIHBhaW50ZWQgdGhlIGJhY2tncm91bmQvYm9yZGVyLCBzbyB0 aGF0IHRoZSBzY3JvbGxiYXJzIHdpbGwKICAgICAvLyBzaXQgYWJvdmUgdGhlIGJhY2tncm91bmQv Ym9yZGVyLgogICAgIGlmIChoYXNPdmVyZmxvd0NsaXAoKSAmJiBzdHlsZSgpLT52aXNpYmlsaXR5 KCkgPT0gVklTSUJMRSAmJiAocGhhc2UgPT0gUGFpbnRQaGFzZUJsb2NrQmFja2dyb3VuZCB8fCBw aGFzZSA9PSBQYWludFBoYXNlQ2hpbGRCbG9ja0JhY2tncm91bmQpICYmIHBhaW50SW5mby5zaG91 bGRQYWludFdpdGhpblJvb3QodGhpcykpCi0gICAgICAgIGxheWVyKCktPnBhaW50T3ZlcmZsb3dD b250cm9scyhwYWludEluZm8uY29udGV4dCwgdHgsIHR5LCBwYWludEluZm8ucmVjdCk7CisgICAg ICAgIGxheWVyKCktPnBhaW50T3ZlcmZsb3dDb250cm9scyhwYWludEluZm8uY29udGV4dCwgSW50 UG9pbnQodHgsIHR5KSwgcGFpbnRJbmZvLnJlY3QpOwogfQogCiB2b2lkIFJlbmRlckJsb2NrOjpw YWludENvbHVtblJ1bGVzKFBhaW50SW5mbyYgcGFpbnRJbmZvLCBpbnQgdHgsIGludCB0eSkKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAkocmV2aXNpb24gODc4 NDUpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0yMjY2LDcgKzIyNjYsNyBAQCB2b2lkIFJlbmRlckxheWVyOjp1cGRhdGVTY3Jv bGxJbmZvQWZ0ZXJMCiAgICAgICAgIHVwZGF0ZU92ZXJmbG93U3RhdHVzKGhvcml6b250YWxPdmVy ZmxvdywgdmVydGljYWxPdmVyZmxvdyk7CiB9CiAKLXZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50T3Zl cmZsb3dDb250cm9scyhHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGludCB0eCwgaW50IHR5LCBj b25zdCBJbnRSZWN0JiBkYW1hZ2VSZWN0LCBib29sIHBhaW50aW5nT3ZlcmxheUNvbnRyb2xzKQor dm9pZCBSZW5kZXJMYXllcjo6cGFpbnRPdmVyZmxvd0NvbnRyb2xzKEdyYXBoaWNzQ29udGV4dCog Y29udGV4dCwgY29uc3QgSW50UG9pbnQmIHBhaW50T2Zmc2V0LCBjb25zdCBJbnRSZWN0JiBkYW1h Z2VSZWN0LCBib29sIHBhaW50aW5nT3ZlcmxheUNvbnRyb2xzKQogewogICAgIC8vIERvbid0IGRv IGFueXRoaW5nIGlmIHdlIGhhdmUgbm8gb3ZlcmZsb3cuCiAgICAgaWYgKCFyZW5kZXJlcigpLT5o YXNPdmVyZmxvd0NsaXAoKSkKQEAgLTIyODEsNyArMjI4MSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6 OnBhaW50T3ZlcmZsb3dDb250cm9scygKICAgICBpZiAoaGFzT3ZlcmxheVNjcm9sbGJhcnMoKSAm JiAhcGFpbnRpbmdPdmVybGF5Q29udHJvbHMpIHsKICAgICAgICAgUmVuZGVyVmlldyogcmVuZGVy VmlldyA9IHJlbmRlcmVyKCktPnZpZXcoKTsKICAgICAgICAgcmVuZGVyVmlldy0+bGF5ZXIoKS0+ c2V0Q29udGFpbnNEaXJ0eU92ZXJsYXlTY3JvbGxiYXJzKHRydWUpOwotICAgICAgICBtX2NhY2hl ZE92ZXJsYXlTY3JvbGxiYXJPZmZzZXQgPSBJbnRQb2ludCh0eCwgdHkpOworICAgICAgICBtX2Nh Y2hlZE92ZXJsYXlTY3JvbGxiYXJPZmZzZXQgPSBwYWludE9mZnNldDsKICAgICAgICAgcmVuZGVy Vmlldy0+ZnJhbWVWaWV3KCktPnNldENvbnRhaW5zU2Nyb2xsYWJsZUFyZWFXaXRoT3ZlcmxheVNj cm9sbGJhcnModHJ1ZSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0yMjkwLDE3ICsyMjkw LDE0IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50T3ZlcmZsb3dDb250cm9scygKICAgICBpZiAo cGFpbnRpbmdPdmVybGF5Q29udHJvbHMgJiYgIWhhc092ZXJsYXlTY3JvbGxiYXJzKCkpCiAgICAg ICAgIHJldHVybjsKIAotICAgIGludCBvZmZzZXRYID0gdHg7Ci0gICAgaW50IG9mZnNldFkgPSB0 eTsKLSAgICBpZiAocGFpbnRpbmdPdmVybGF5Q29udHJvbHMpIHsKLSAgICAgICAgb2Zmc2V0WCA9 IG1fY2FjaGVkT3ZlcmxheVNjcm9sbGJhck9mZnNldC54KCk7Ci0gICAgICAgIG9mZnNldFkgPSBt X2NhY2hlZE92ZXJsYXlTY3JvbGxiYXJPZmZzZXQueSgpOwotICAgIH0KKyAgICBJbnRQb2ludCBh ZGp1c3RlZFBhaW50T2Zmc2V0ID0gcGFpbnRPZmZzZXQ7CisgICAgaWYgKHBhaW50aW5nT3Zlcmxh eUNvbnRyb2xzKQorICAgICAgICBhZGp1c3RlZFBhaW50T2Zmc2V0ID0gbV9jYWNoZWRPdmVybGF5 U2Nyb2xsYmFyT2Zmc2V0OwogCiAgICAgLy8gTW92ZSB0aGUgc2Nyb2xsYmFyIHdpZGdldHMgaWYg bmVjZXNzYXJ5LiAgV2Ugbm9ybWFsbHkgbW92ZSBhbmQgcmVzaXplIHdpZGdldHMgZHVyaW5nIGxh eW91dCwgYnV0IHNvbWV0aW1lcwogICAgIC8vIHdpZGdldHMgY2FuIG1vdmUgd2l0aG91dCBsYXlv dXQgb2NjdXJyaW5nIChtb3N0IG5vdGFibHkgd2hlbiB5b3Ugc2Nyb2xsIGEgZG9jdW1lbnQgdGhh dAogICAgIC8vIGNvbnRhaW5zIGZpeGVkIHBvc2l0aW9uZWQgZWxlbWVudHMpLgotICAgIHBvc2l0 aW9uT3ZlcmZsb3dDb250cm9scyhJbnRTaXplKG9mZnNldFgsIG9mZnNldFkpKTsKKyAgICBwb3Np dGlvbk92ZXJmbG93Q29udHJvbHModG9TaXplKGFkanVzdGVkUGFpbnRPZmZzZXQpKTsKIAogICAg IC8vIE5vdyB0aGF0IHdlJ3JlIHN1cmUgdGhlIHNjcm9sbGJhcnMgYXJlIGluIHRoZSByaWdodCBw bGFjZSwgcGFpbnQgdGhlbS4KICAgICBpZiAobV9oQmFyCkBAIC0yMzIzLDEwICsyMzIwLDEwIEBA IHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50T3ZlcmZsb3dDb250cm9scygKIAogICAgIC8vIFdlIGZp bGwgb3VyIHNjcm9sbCBjb3JuZXIgd2l0aCB3aGl0ZSBpZiB3ZSBoYXZlIGEgc2Nyb2xsYmFyIHRo YXQgZG9lc24ndCBydW4gYWxsIHRoZSB3YXkgdXAgdG8gdGhlCiAgICAgLy8gZWRnZSBvZiB0aGUg Ym94LgotICAgIHBhaW50U2Nyb2xsQ29ybmVyKGNvbnRleHQsIEludFBvaW50KG9mZnNldFgsIG9m ZnNldFkpLCBkYW1hZ2VSZWN0KTsKKyAgICBwYWludFNjcm9sbENvcm5lcihjb250ZXh0LCBhZGp1 c3RlZFBhaW50T2Zmc2V0LCBkYW1hZ2VSZWN0KTsKICAgICAKICAgICAvLyBQYWludCBvdXIgcmVz aXplciBsYXN0LCBzaW5jZSBpdCBzaXRzIG9uIHRvcCBvZiB0aGUgc2Nyb2xsIGNvcm5lci4KLSAg ICBwYWludFJlc2l6ZXIoY29udGV4dCwgSW50UG9pbnQob2Zmc2V0WCwgb2Zmc2V0WSksIGRhbWFn ZVJlY3QpOworICAgIHBhaW50UmVzaXplcihjb250ZXh0LCBhZGp1c3RlZFBhaW50T2Zmc2V0LCBk YW1hZ2VSZWN0KTsKIH0KIAogdm9pZCBSZW5kZXJMYXllcjo6cGFpbnRTY3JvbGxDb3JuZXIoR3Jh cGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRQb2ludCYgcGFpbnRPZmZzZXQsIGNvbnN0 IEludFJlY3QmIGRhbWFnZVJlY3QpCkBAIC0yNzA4LDcgKzI3MDUsNyBAQCB2b2lkIFJlbmRlckxh eWVyOjpwYWludExheWVyKFJlbmRlckxheWVyCiAKICAgICBpZiAocGFpbnRpbmdPdmVybGF5U2Ny b2xsYmFycykgewogICAgICAgICBzZXRDbGlwKHAsIHBhaW50RGlydHlSZWN0LCBkYW1hZ2VSZWN0 KTsKLSAgICAgICAgcGFpbnRPdmVyZmxvd0NvbnRyb2xzKHAsIHR4LCB0eSwgZGFtYWdlUmVjdCwg dHJ1ZSk7CisgICAgICAgIHBhaW50T3ZlcmZsb3dDb250cm9scyhwLCBJbnRQb2ludCh0eCwgdHkp LCBkYW1hZ2VSZWN0LCB0cnVlKTsKICAgICAgICAgcmVzdG9yZUNsaXAocCwgcGFpbnREaXJ0eVJl Y3QsIGRhbWFnZVJlY3QpOwogICAgIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyLmgJKHJldmlzaW9uIDg3ODQ1KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTI2MSw3ICsyNjEsNyBAQCBwdWJsaWM6 CiAgICAgYm9vbCBoaXRUZXN0T3ZlcmZsb3dDb250cm9scyhIaXRUZXN0UmVzdWx0JiwgY29uc3Qg SW50UG9pbnQmIGxvY2FsUG9pbnQpOwogICAgIEludFNpemUgb2Zmc2V0RnJvbVJlc2l6ZUNvcm5l cihjb25zdCBJbnRQb2ludCYgYWJzb2x1dGVQb2ludCkgY29uc3Q7CiAKLSAgICB2b2lkIHBhaW50 T3ZlcmZsb3dDb250cm9scyhHcmFwaGljc0NvbnRleHQqLCBpbnQgdHgsIGludCB0eSwgY29uc3Qg SW50UmVjdCYgZGFtYWdlUmVjdCwgYm9vbCBwYWludGluZ092ZXJsYXlDb250cm9scyA9IGZhbHNl KTsKKyAgICB2b2lkIHBhaW50T3ZlcmZsb3dDb250cm9scyhHcmFwaGljc0NvbnRleHQqLCBjb25z dCBJbnRQb2ludCYsIGNvbnN0IEludFJlY3QmIGRhbWFnZVJlY3QsIGJvb2wgcGFpbnRpbmdPdmVy bGF5Q29udHJvbHMgPSBmYWxzZSk7CiAgICAgdm9pZCBwYWludFNjcm9sbENvcm5lcihHcmFwaGlj c0NvbnRleHQqLCBjb25zdCBJbnRQb2ludCYsIGNvbnN0IEludFJlY3QmIGRhbWFnZVJlY3QpOwog ICAgIHZvaWQgcGFpbnRSZXNpemVyKEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEludFBvaW50Jiwg Y29uc3QgSW50UmVjdCYgZGFtYWdlUmVjdCk7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCShyZXZpc2lvbiA4Nzg0NSkKKysrIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xMTAwLDExICsxMTAwLDkgQEAgdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnBhaW50 SW50b0xheWVyKAogICAgIC8vIENhbGN1bGF0ZSB0aGUgY2xpcCByZWN0cyB3ZSBzaG91bGQgdXNl LgogICAgIEludFJlY3QgbGF5ZXJCb3VuZHMsIGRhbWFnZVJlY3QsIGNsaXBSZWN0VG9BcHBseSwg b3V0bGluZVJlY3Q7CiAgICAgbV9vd25pbmdMYXllci0+Y2FsY3VsYXRlUmVjdHMocm9vdExheWVy LCBwYWludERpcnR5UmVjdCwgbGF5ZXJCb3VuZHMsIGRhbWFnZVJlY3QsIGNsaXBSZWN0VG9BcHBs eSwgb3V0bGluZVJlY3QpOwotICAgIAotICAgIGludCB4ID0gbGF5ZXJCb3VuZHMueCgpOyAgICAg ICAgLy8gbGF5ZXJCb3VuZHMgaXMgY29tcHV0ZWQgcmVsYXRpdmUgdG8gcm9vdExheWVyCi0gICAg aW50IHkgPSBsYXllckJvdW5kcy55KCk7Ci0gICAgaW50IHR4ID0geCAtIG1fb3duaW5nTGF5ZXIt PnJlbmRlckJveFgoKTsKLSAgICBpbnQgdHkgPSB5IC0gbV9vd25pbmdMYXllci0+cmVuZGVyQm94 WSgpOworCisgICAgaW50IHR4ID0gbGF5ZXJCb3VuZHMueCgpIC0gbV9vd25pbmdMYXllci0+cmVu ZGVyQm94WCgpOworICAgIGludCB0eSA9IGxheWVyQm91bmRzLnkoKSAtIG1fb3duaW5nTGF5ZXIt PnJlbmRlckJveFkoKTsKIAogICAgIC8vIElmIHRoaXMgbGF5ZXIncyByZW5kZXJlciBpcyBhIGNo aWxkIG9mIHRoZSBwYWludGluZ1Jvb3QsIHdlIHJlbmRlciB1bmNvbmRpdGlvbmFsbHksIHdoaWNo CiAgICAgLy8gaXMgZG9uZSBieSBwYXNzaW5nIGEgbmlsIHBhaW50aW5nUm9vdCBkb3duIHRvIG91 ciByZW5kZXJlciAoYXMgaWYgbm8gcGFpbnRpbmdSb290IHdhcyBldmVyIHNldCkuCkBAIC0xMTI3 LDcgKzExMjUsNyBAQCB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6cGFpbnRJbnRvTGF5ZXIoCiAg ICAgICAgIC8vIE91ciBzY3JvbGxiYXIgd2lkZ2V0cyBwYWludCBleGFjdGx5IHdoZW4gd2UgdGVs bCB0aGVtIHRvLCBzbyB0aGF0IHRoZXkgd29yayBwcm9wZXJseSB3aXRoCiAgICAgICAgIC8vIHot aW5kZXguICBXZSBwYWludCBhZnRlciB3ZSBwYWludGVkIHRoZSBiYWNrZ3JvdW5kL2JvcmRlciwg c28gdGhhdCB0aGUgc2Nyb2xsYmFycyB3aWxsCiAgICAgICAgIC8vIHNpdCBhYm92ZSB0aGUgYmFj a2dyb3VuZC9ib3JkZXIuCi0gICAgICAgIG1fb3duaW5nTGF5ZXItPnBhaW50T3ZlcmZsb3dDb250 cm9scyhjb250ZXh0LCB4LCB5LCBkYW1hZ2VSZWN0KTsKKyAgICAgICAgbV9vd25pbmdMYXllci0+ cGFpbnRPdmVyZmxvd0NvbnRyb2xzKGNvbnRleHQsIGxheWVyQm91bmRzLmxvY2F0aW9uKCksIGRh bWFnZVJlY3QpOwogICAgICAgICAKICAgICAgICAgLy8gUmVzdG9yZSB0aGUgY2xpcC4KICAgICAg ICAgcmVzdG9yZUNsaXAoY29udGV4dCwgcGFpbnREaXJ0eVJlY3QsIGRhbWFnZVJlY3QpOwo=