84979 2012-04-26 11:37:00 -0700 Infinite backgroundClipRect should not be scrolled. 2012-04-27 12:34:35 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 shawnsingh shawnsingh enne webkit.review.bot oldest_to_newest 610767 0 shawnsingh 2012-04-26 11:37:00 -0700 It is possible for the backgroundClipRect to be an infinite rect (equal to PaintInfo::InfiniteRect()). However, in RenderLayer::backgroundClipRect() this backgroundClipRect is being scrolled when it is fixed position on the root layer. By scrolling the backgroundClipRect, it no longer equals PaintInfo::InfiniteRect() and later in the code, goes through incorrect code paths where that rect is not considered infinite. As a result, chromium was receiving overflowed bounds on some layers which caused stuttering when scrolling fixed-position layers. (for example, 2011.beercamp.com) For now, the correct fix is to avoid scrolling a rect that is considered to be infinite. A better solution in the long term is to robustify the semantics of infinite rects so that moving them will not change them, since they are already infinite. However, this requires pervading all clipRects / layoutRects / IntRects with the notion of being infinite. I have the fix, just need to create a layout test before submitting a patch! 611029 1 139083 shawnsingh 2012-04-26 15:24:15 -0700 Created attachment 139083 Patch 611032 2 shawnsingh 2012-04-26 15:27:52 -0700 (In reply to comment #1) > Created an attachment (id=139083) [details] > Patch - includes new layout test - tested on all unit tests and layout tests, no obvious regressions 611076 3 139083 enne 2012-04-26 16:38:40 -0700 Comment on attachment 139083 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=139083&action=review Nice test! A few small nits: > Source/WebCore/rendering/RenderLayer.cpp:3911 > + if (parentRects.fixed() && rootLayer->renderer() == view && !(backgroundClipRect == PaintInfo::infiniteRect())) !(x == y) => x != y If ClipRect somehow doesn't support !=, then maybe it should. > LayoutTests/compositing/iframes/resources/fixed-position-transformed-subframe.html:1 > +<html> <!DOCTYPE html> at the top, since this isn't about quirks mode. > LayoutTests/compositing/iframes/resources/fixed-position-transformed-subframe.html:33 > + if (window.internals) > + window.internals.settings.setMockScrollbarsEnabled(true); (Aren't mock scrollbars always on in compositing/ for Chromium and Safari?) > LayoutTests/compositing/iframes/resources/fixed-position-transformed-subframe.html:36 > + layoutTestController.waitUntilDone(); (I'm pretty sure you don't need to do waitUntilDone/notifyDone if you do everything in the onload handler.) > LayoutTests/compositing/iframes/scroll-fixed-transformed-element.html:1 > +<html> Same here. 611119 4 139104 shawnsingh 2012-04-26 17:39:31 -0700 Created attachment 139104 Addressed reviewers comments 611121 5 139104 enne 2012-04-26 17:43:16 -0700 Comment on attachment 139104 Addressed reviewers comments Nice, thanks! R=me. 611587 6 139104 shawnsingh 2012-04-27 09:37:05 -0700 Comment on attachment 139104 Addressed reviewers comments Thanks for reviewing, as always =) 611781 7 139104 webkit.review.bot 2012-04-27 12:34:31 -0700 Comment on attachment 139104 Addressed reviewers comments Clearing flags on attachment: 139104 Committed r115471: <http://trac.webkit.org/changeset/115471> 611783 8 webkit.review.bot 2012-04-27 12:34:35 -0700 All reviewed patches have been landed. Closing bug. 139083 2012-04-26 15:24:15 -0700 2012-04-26 17:39:27 -0700 Patch bug-84979-20120426152414.patch text/plain 6975 shawnsingh U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1MzQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGNiN2U4ODFhYjViZDVk M2ZmOWUzN2U0ZTQyZWZlOThhYWM3NTZjNy4uZTdjNWMwZmI1NGM2YmZjMzNhNjBmNDZmNGNmY2Q3 ZDdjNzU0NTA0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA0LTI2ICBTaGF3 biBTaW5naCAgPHNoYXduc2luZ2hAY2hyb21pdW0ub3JnPgorCisgICAgICAgIEluZmluaXRlIGJh Y2tncm91bmRDbGlwUmVjdCBzaG91bGQgbm90IGJlIHNjcm9sbGVkLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQ5NzkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBjb21wb3NpdGluZy9pZnJhbWVz L3Njcm9sbC1maXhlZC10cmFuc2Zvcm1lZC1lbGVtZW50Lmh0bWwKKworICAgICAgICBCeSBhY2Np ZGVudGFsbHkgc2Nyb2xsaW5nIGNsaXBSZWN0cyB0aGF0IHNob3VsZCBiZSBjb25zaWRlcmVkCisg ICAgICAgICJpbmZpbml0ZSIsIHRoZXkgd2VyZSBubyBsb25nZXIgYmVpbmcgY29uc2lkZXJlZCBp bmZpbml0ZS4gVGhpcworICAgICAgICBjYXVzZWQgYSBjaGFpbiBvZiB1bi1pbnRlbmRlZCBjb2Rl IHBhdGhzIHRoYXQgY2F1c2VkIGZpeGVkCisgICAgICAgIHBvc2l0aW9uIGVsZW1lbnRzIHRvIHN0 dXR0ZXIgd2hlbiBzY3JvbGxpbmcgaW4gQ2hyb21pdW0uCisKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmJhY2tncm91 bmRDbGlwUmVjdCk6CisKIDIwMTItMDQtMjYgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUu Y29tPgogCiAgICAgICAgIEltcGxlbWVudCBTdHlsZVNoZWV0SW50ZXJuYWwgY29weWluZwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggODc3NWM1N2I3YTdjOWUz OGMwOTQyNzJhZjcxNjM5YzU0OTYzNWJlMC4uNDk1YzM1ZGNiMWM5NGVlYjBlNzQ0ZTUyNmMwZjhh NTRkNjZlM2ZiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBA IC0zOTA2LDggKzM5MDYsMTEgQEAgQ2xpcFJlY3QgUmVuZGVyTGF5ZXI6OmJhY2tncm91bmRDbGlw UmVjdChjb25zdCBSZW5kZXJMYXllciogcm9vdExheWVyLCBSZW5kZXJSZWcKICAgICBDbGlwUmVj dCBiYWNrZ3JvdW5kQ2xpcFJlY3QgPSBiYWNrZ3JvdW5kQ2xpcFJlY3RGb3JQb3NpdGlvbihwYXJl bnRSZWN0cywgcmVuZGVyZXIoKS0+c3R5bGUoKS0+cG9zaXRpb24oKSk7CiAgICAgUmVuZGVyVmll dyogdmlldyA9IHJlbmRlcmVyKCktPnZpZXcoKTsKICAgICBBU1NFUlQodmlldyk7Ci0gICAgaWYg KHBhcmVudFJlY3RzLmZpeGVkKCkgJiYgcm9vdExheWVyLT5yZW5kZXJlcigpID09IHZpZXcpCisK KyAgICAvLyBOb3RlOiBpbmZpbml0ZSBjbGlwUmVjdHMgc2hvdWxkIG5vdCBiZSBzY3JvbGxlZCBo ZXJlLCBvdGhlcndpc2UgdGhleSB3aWxsIGFjY2lkZW50YWxseSBubyBsb25nZXIgYmUgY29uc2lk ZXJlZCBpbmZpbml0ZS4KKyAgICBpZiAocGFyZW50UmVjdHMuZml4ZWQoKSAmJiByb290TGF5ZXIt PnJlbmRlcmVyKCkgPT0gdmlldyAmJiAhKGJhY2tncm91bmRDbGlwUmVjdCA9PSBQYWludEluZm86 OmluZmluaXRlUmVjdCgpKSkKICAgICAgICAgYmFja2dyb3VuZENsaXBSZWN0Lm1vdmUodmlldy0+ ZnJhbWVWaWV3KCktPnNjcm9sbFhGb3JGaXhlZFBvc2l0aW9uKCksIHZpZXctPmZyYW1lVmlldygp LT5zY3JvbGxZRm9yRml4ZWRQb3NpdGlvbigpKTsKKwogICAgIHJldHVybiBiYWNrZ3JvdW5kQ2xp cFJlY3Q7CiB9CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwppbmRleCBkYjM4OTk4M2JjODZhMGFhMjg0OTA4MDA2YTM4ODY0ODRjYzk5 OTJhLi43OTZiZDBhNGJiYTliODFjYjViM2U5MTVmNTFjNmZhMzRiYjYwOGMzIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTUgQEAKKzIwMTItMDQtMjYgIFNoYXduIFNpbmdoICA8c2hhd25zaW5naEBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgSW5maW5pdGUgYmFja2dyb3VuZENsaXBSZWN0IHNob3VsZCBub3Qg YmUgc2Nyb2xsZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD04NDk3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogY29tcG9zaXRpbmcvaWZyYW1lcy9yZXNvdXJjZXMvZml4ZWQtcG9zaXRpb24tdHJhbnNm b3JtZWQtc3ViZnJhbWUuaHRtbDogQWRkZWQuCisgICAgICAgICogY29tcG9zaXRpbmcvaWZyYW1l cy9zY3JvbGwtZml4ZWQtdHJhbnNmb3JtZWQtZWxlbWVudC1leHBlY3RlZC5wbmc6IEFkZGVkLgor ICAgICAgICAqIGNvbXBvc2l0aW5nL2lmcmFtZXMvc2Nyb2xsLWZpeGVkLXRyYW5zZm9ybWVkLWVs ZW1lbnQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBjb21wb3NpdGluZy9pZnJhbWVz L3Njcm9sbC1maXhlZC10cmFuc2Zvcm1lZC1lbGVtZW50Lmh0bWw6IEFkZGVkLgorCiAyMDEyLTA0 LTAzICBSb2JlcnQgSG9nYW4gIDxyb2JlcnRAd2Via2l0Lm9yZz4KIAogICAgICAgICBuZXctd2Vi a2l0LXJ1bi10ZXN0czogaGFuZGxlIHJlZiB0ZXN0cyBmcm9tIHRoZSBDU1MgdGVzdCBzdWl0ZQpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvaWZyYW1lcy9yZXNvdXJjZXMvZml4 ZWQtcG9zaXRpb24tdHJhbnNmb3JtZWQtc3ViZnJhbWUuaHRtbCBiL0xheW91dFRlc3RzL2NvbXBv c2l0aW5nL2lmcmFtZXMvcmVzb3VyY2VzL2ZpeGVkLXBvc2l0aW9uLXRyYW5zZm9ybWVkLXN1YmZy YW1lLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uMmI3NTBmNWIzYTU4NjlhYjJhNTQ5MmZjM2Y4YTc5NTM0Yjhl MjYwMQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2lmcmFtZXMv cmVzb3VyY2VzL2ZpeGVkLXBvc2l0aW9uLXRyYW5zZm9ybWVkLXN1YmZyYW1lLmh0bWwKQEAgLTAs MCArMSw2MSBAQAorPGh0bWw+Cis8aGVhZD4KKyAgPHN0eWxlIHR5cGU9J3RleHQvY3NzJz4KKyAg ICBib2R5IHsKKyAgICAgICAgaGVpZ2h0OiAxMDAwcHg7CisgICAgfQorCisgICAgLmdyZWVuIHsK KyAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47CisgICAgfQorCisgICAgLmZpeGVkIHsK KyAgICAgICAgcG9zaXRpb246IGZpeGVkOworICAgICAgICB0b3A6IDBweDsKKyAgICAgICAgbGVm dDogMHB4OworICAgIH0KKworICAgIC5ib3ggeworICAgICAgICB3aWR0aDogMzAwcHg7CisgICAg ICAgIGhlaWdodDogMzAwcHg7CisgICAgfQorCisgICAgLmNvbnRhaW5lciB7CisgICAgICAgIHBv c2l0aW9uOiByZWxhdGl2ZTsKKyAgICB9CisKKyAgICAucGVyc3BlY3RpdmUgeworICAgICAgICAt d2Via2l0LXBlcnNwZWN0aXZlOiAxcHg7CisgICAgfQorICA8L3N0eWxlPgorICA8c2NyaXB0Pgor ICAgIGlmICh3aW5kb3cuaW50ZXJuYWxzKQorICAgICAgd2luZG93LmludGVybmFscy5zZXR0aW5n cy5zZXRNb2NrU2Nyb2xsYmFyc0VuYWJsZWQodHJ1ZSk7CisgICAgaWYgKHdpbmRvdy5sYXlvdXRU ZXN0Q29udHJvbGxlcikgeworICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCh0 cnVlKTsKKyAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLndhaXRVbnRpbERvbmUoKTsKKyAgICB9 CisKKyAgICBmdW5jdGlvbiBkb1Rlc3QoKQorICAgIHsKKyAgICAgIGlmICh3aW5kb3cubGF5b3V0 VGVzdENvbnRyb2xsZXIpCisgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmRpc3BsYXkoKTsK KworICAgICAgLy8gQW55IHNjcm9sbCBzaG91bGQga2VlcCB0aGUgZml4ZWQtcG9zaXRpb24gZWxl bWVudCB3aGVyZSBpdCBpcy4KKyAgICAgIC8vIElmIGl0IHN0dXR0ZXJzIG9yIGRpc2FwcGVhcnMg aW5jb3JyZWN0bHksIHRoZW4gdGhlIHJlZCBiYWNrZ3JvdW5kIHdpbGwgYmUgcmV2ZWFsZWQuCisg ICAgICB3aW5kb3cuc2Nyb2xsVG8oMCwgMTUwKTsKKyAgICAgIGlmICh3aW5kb3cubGF5b3V0VGVz dENvbnRyb2xsZXIpCisgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLm5vdGlmeURvbmUoKTsK KyAgICB9CisKKyAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcignbG9hZCcsIGRvVGVzdCwgZmFs c2UpOworICA8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorICA8ZGl2IGNsYXNzPSJncmVlbiBm aXhlZCBib3giPgorICAgIDxkaXYgY2xhc3M9ImNvbnRhaW5lciI+CisgICAgICA8ZGl2IGNsYXNz PSJwZXJzcGVjdGl2ZSI+PC9kaXY+CisgICAgPC9kaXY+CisgIDwvZGl2PgorPC9ib2R5PgorPC9o dG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvaWZyYW1lcy9zY3JvbGwt Zml4ZWQtdHJhbnNmb3JtZWQtZWxlbWVudC1leHBlY3RlZC5wbmcgYi9MYXlvdXRUZXN0cy9jb21w b3NpdGluZy9pZnJhbWVzL3Njcm9sbC1maXhlZC10cmFuc2Zvcm1lZC1lbGVtZW50LWV4cGVjdGVk LnBuZwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwLi5mMTI4YTFjZGRkMjVkYmM0ZDM0NjQzYTQ0MWUzMDU5ZGQxY2U2YTMx CkdJVCBiaW5hcnkgcGF0Y2gKbGl0ZXJhbCAzMzQ4CnpjbWVBU0BOPyhvbEh5YHVWQnEhaWEweX55 VXsrdllWMmE+aTFCJVFsWWJwUnpua0I5Z0NDTTQ3JD1TdUZ4ZVI4Qgp6WChyfC1zVjFmdG1Me2Yj IylqciokKkQ8MyNzLVB6JChHM21yYiFFND8hQz54el9aTkwjV0FFfSZmQS1ZZDR+LXwKelNSSik0 PnxMPz9ZMSRzaSVlJU19QjMyKFZIcyN6P19PWEJPY1I4UjlqcXtoWTFGOEdZNE0wK29rJUBzSmdA dUVHCnpWUz1DbjFBfkpiTGgjJndJaHA8TDg8YFYmNDNGKSljRHclaG9jWXBCNDBqSCh2TT9+NTsx RlA3UCo4U1lVfSklSgp6VX1SdTBWajR6KlhNVFFSWGI4Xzx5WiEkO09NN3pgaDg/WmsqdW4+RXBw NlFtckpfTDxBVHZMfFdNbypzP3NaaWEKejZHTVRyXyVLZXghIUs4a2BlO2EodkImUksrdUgpYG5q ZF82Z1NtdmpReSZoaGw1RXRTcXRQKiVqfk1WYVVgSkVQCmRwaF9ZQzdePm9odnRCSX0lTFlhcGdR dSZYJVF+bG9DSUgoTnpNY1I4CgpsaXRlcmFsIDAKSGNtVj9kMDAwMDEKCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9jb21wb3NpdGluZy9pZnJhbWVzL3Njcm9sbC1maXhlZC10cmFuc2Zvcm1lZC1l bGVtZW50LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2lmcmFtZXMvc2Ny b2xsLWZpeGVkLXRyYW5zZm9ybWVkLWVsZW1lbnQtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjhi MTM3ODkxNzkxZmU5NjkyN2FkNzhlNjRiMGFhZDdiZGVkMDhiZGMKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9pZnJhbWVzL3Njcm9sbC1maXhlZC10cmFuc2Zvcm1l ZC1lbGVtZW50LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxIEBACisKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2NvbXBvc2l0aW5nL2lmcmFtZXMvc2Nyb2xsLWZpeGVkLXRyYW5zZm9ybWVkLWVsZW1l bnQuaHRtbCBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2lmcmFtZXMvc2Nyb2xsLWZpeGVkLXRy YW5zZm9ybWVkLWVsZW1lbnQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5jYTFlYmNmZjU4NDVkMjA4YjllMTEw NGRmZDRjZjdhZTg2YmYwZmYzCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY29tcG9z aXRpbmcvaWZyYW1lcy9zY3JvbGwtZml4ZWQtdHJhbnNmb3JtZWQtZWxlbWVudC5odG1sCkBAIC0w LDAgKzEsMjQgQEAKKzxodG1sPgorPGhlYWQ+CisgIDxzdHlsZT4KKyAgICBpZnJhbWUgeworICAg ICAgd2lkdGg6IDMwMHB4OworICAgICAgaGVpZ2h0OiAzMDBweDsKKyAgICAgIHBvc2l0aW9uOiBh YnNvbHV0ZTsKKyAgICAgIGJvcmRlcjogbm9uZTsKKyAgICAgIGJhY2tncm91bmQtY29sb3I6IHJl ZDsKKyAgICB9CisgIDwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgPCEtLSBUaGlzIHRlc3Qg cmVwcm9kdWNlcyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQ5Nzku CisgICAgICAgSW4gdGhpcyBidWcsIGNsaXBSZWN0cyB0aGF0IHdlcmUgc3VwcG9zZWQgdG8gYmUg ImluZmluaXRlIiB3ZXJlIGJlaW5nIHNjcm9sbGVkLAorICAgICAgIGNhdXNpbmcgdGhlbSB0byBu byBsb25nZXIgYmUgY29uc2lkZXJlZCBpbmZpbml0ZS4gQXMgYSByZXN1bHQsIGZpeGVkLXBvc2l0 aW9uCisgICAgICAgbGF5ZXJzIHdpdGggdHJhbnNmb3JtZWQgZWxlbWVudHMgd291bGQgaGF2ZSBw cm9ibGVtcy4KKworICAgICAgIEluIHRoaXMgbGF5b3V0IHRlc3QsIHRoZSBmaXhlZC1wb3NpdGlv biBncmVlbiBib3ggc2hvdWxkIGZpbGwgdGhlIGlmcmFtZSwgdGh1cworICAgICAgIGhpZGluZyB0 aGUgcmVkIGJhY2tncm91bmQuCisgICAgLS0+CisgIDxpZnJhbWUgaWQ9ImZyYW1lIiBzcmM9InJl c291cmNlcy9maXhlZC1wb3NpdGlvbi10cmFuc2Zvcm1lZC1zdWJmcmFtZS5odG1sIj48L2lmcmFt ZT4KKzwvYm9keT4KKzwvaHRtbD4K 139104 2012-04-26 17:39:31 -0700 2012-04-27 12:34:31 -0700 Addressed reviewers comments bug-84979-20120426173930.patch text/plain 7523 shawnsingh U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1MzQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGNiN2U4ODFhYjViZDVk M2ZmOWUzN2U0ZTQyZWZlOThhYWM3NTZjNy4uZTdjNWMwZmI1NGM2YmZjMzNhNjBmNDZmNGNmY2Q3 ZDdjNzU0NTA0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA0LTI2ICBTaGF3 biBTaW5naCAgPHNoYXduc2luZ2hAY2hyb21pdW0ub3JnPgorCisgICAgICAgIEluZmluaXRlIGJh Y2tncm91bmRDbGlwUmVjdCBzaG91bGQgbm90IGJlIHNjcm9sbGVkLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQ5NzkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBjb21wb3NpdGluZy9pZnJhbWVz L3Njcm9sbC1maXhlZC10cmFuc2Zvcm1lZC1lbGVtZW50Lmh0bWwKKworICAgICAgICBCeSBhY2Np ZGVudGFsbHkgc2Nyb2xsaW5nIGNsaXBSZWN0cyB0aGF0IHNob3VsZCBiZSBjb25zaWRlcmVkCisg ICAgICAgICJpbmZpbml0ZSIsIHRoZXkgd2VyZSBubyBsb25nZXIgYmVpbmcgY29uc2lkZXJlZCBp bmZpbml0ZS4gVGhpcworICAgICAgICBjYXVzZWQgYSBjaGFpbiBvZiB1bi1pbnRlbmRlZCBjb2Rl IHBhdGhzIHRoYXQgY2F1c2VkIGZpeGVkCisgICAgICAgIHBvc2l0aW9uIGVsZW1lbnRzIHRvIHN0 dXR0ZXIgd2hlbiBzY3JvbGxpbmcgaW4gQ2hyb21pdW0uCisKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmJhY2tncm91 bmRDbGlwUmVjdCk6CisKIDIwMTItMDQtMjYgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUu Y29tPgogCiAgICAgICAgIEltcGxlbWVudCBTdHlsZVNoZWV0SW50ZXJuYWwgY29weWluZwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggODc3NWM1N2I3YTdjOWUz OGMwOTQyNzJhZjcxNjM5YzU0OTYzNWJlMC4uNGQ2YjczNzNkMTYxYzMwYzM0Mjg4YTIzN2M1MzRj OGY3ZDIzMWJjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBA IC0zOTA2LDggKzM5MDYsMTEgQEAgQ2xpcFJlY3QgUmVuZGVyTGF5ZXI6OmJhY2tncm91bmRDbGlw UmVjdChjb25zdCBSZW5kZXJMYXllciogcm9vdExheWVyLCBSZW5kZXJSZWcKICAgICBDbGlwUmVj dCBiYWNrZ3JvdW5kQ2xpcFJlY3QgPSBiYWNrZ3JvdW5kQ2xpcFJlY3RGb3JQb3NpdGlvbihwYXJl bnRSZWN0cywgcmVuZGVyZXIoKS0+c3R5bGUoKS0+cG9zaXRpb24oKSk7CiAgICAgUmVuZGVyVmll dyogdmlldyA9IHJlbmRlcmVyKCktPnZpZXcoKTsKICAgICBBU1NFUlQodmlldyk7Ci0gICAgaWYg KHBhcmVudFJlY3RzLmZpeGVkKCkgJiYgcm9vdExheWVyLT5yZW5kZXJlcigpID09IHZpZXcpCisK KyAgICAvLyBOb3RlOiBpbmZpbml0ZSBjbGlwUmVjdHMgc2hvdWxkIG5vdCBiZSBzY3JvbGxlZCBo ZXJlLCBvdGhlcndpc2UgdGhleSB3aWxsIGFjY2lkZW50YWxseSBubyBsb25nZXIgYmUgY29uc2lk ZXJlZCBpbmZpbml0ZS4KKyAgICBpZiAocGFyZW50UmVjdHMuZml4ZWQoKSAmJiByb290TGF5ZXIt PnJlbmRlcmVyKCkgPT0gdmlldyAmJiBiYWNrZ3JvdW5kQ2xpcFJlY3QgIT0gUGFpbnRJbmZvOjpp bmZpbml0ZVJlY3QoKSkKICAgICAgICAgYmFja2dyb3VuZENsaXBSZWN0Lm1vdmUodmlldy0+ZnJh bWVWaWV3KCktPnNjcm9sbFhGb3JGaXhlZFBvc2l0aW9uKCksIHZpZXctPmZyYW1lVmlldygpLT5z Y3JvbGxZRm9yRml4ZWRQb3NpdGlvbigpKTsKKwogICAgIHJldHVybiBiYWNrZ3JvdW5kQ2xpcFJl Y3Q7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKaW5kZXggM2Q3YTQ1 YzUyNTc4YmQ4YmRkZWFlNzVjOTU2Y2RjNTQ4ZTM5MTQ5ZC4uMWMyOWIwODBkOGViZTA5MmE2ZGQz YjlmZGE4ZWRmNmI2YzZjY2JiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy LmgKQEAgLTEwMCw2ICsxMDAsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRIYXNSYWRpdXMoYm9v bCBoYXNSYWRpdXMpIHsgbV9oYXNSYWRpdXMgPSBoYXNSYWRpdXM7IH0KIAogICAgIGJvb2wgb3Bl cmF0b3I9PShjb25zdCBDbGlwUmVjdCYgb3RoZXIpIGNvbnN0IHsgcmV0dXJuIHJlY3QoKSA9PSBv dGhlci5yZWN0KCkgJiYgaGFzUmFkaXVzKCkgPT0gb3RoZXIuaGFzUmFkaXVzKCk7IH0KKyAgICBi b29sIG9wZXJhdG9yIT0oY29uc3QgQ2xpcFJlY3QmIG90aGVyKSBjb25zdCB7IHJldHVybiByZWN0 KCkgIT0gb3RoZXIucmVjdCgpIHx8IGhhc1JhZGl1cygpICE9IG90aGVyLmhhc1JhZGl1cygpOyB9 CiAKICAgICB2b2lkIGludGVyc2VjdChjb25zdCBMYXlvdXRSZWN0JiBvdGhlcikgeyBtX3JlY3Qu aW50ZXJzZWN0KG90aGVyKTsgfQogICAgIHZvaWQgaW50ZXJzZWN0KGNvbnN0IENsaXBSZWN0JiBv dGhlcikKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwppbmRleCBkYjM4OTk4M2JjODZhMGFhMjg0OTA4MDA2YTM4ODY0ODRjYzk5OTJhLi43 OTZiZDBhNGJiYTliODFjYjViM2U5MTVmNTFjNmZhMzRiYjYwOGMzIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTUgQEAKKzIwMTItMDQtMjYgIFNoYXduIFNpbmdoICA8c2hhd25zaW5naEBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgSW5maW5pdGUgYmFja2dyb3VuZENsaXBSZWN0IHNob3VsZCBub3QgYmUgc2Ny b2xsZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04 NDk3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog Y29tcG9zaXRpbmcvaWZyYW1lcy9yZXNvdXJjZXMvZml4ZWQtcG9zaXRpb24tdHJhbnNmb3JtZWQt c3ViZnJhbWUuaHRtbDogQWRkZWQuCisgICAgICAgICogY29tcG9zaXRpbmcvaWZyYW1lcy9zY3Jv bGwtZml4ZWQtdHJhbnNmb3JtZWQtZWxlbWVudC1leHBlY3RlZC5wbmc6IEFkZGVkLgorICAgICAg ICAqIGNvbXBvc2l0aW5nL2lmcmFtZXMvc2Nyb2xsLWZpeGVkLXRyYW5zZm9ybWVkLWVsZW1lbnQt ZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBjb21wb3NpdGluZy9pZnJhbWVzL3Njcm9s bC1maXhlZC10cmFuc2Zvcm1lZC1lbGVtZW50Lmh0bWw6IEFkZGVkLgorCiAyMDEyLTA0LTAzICBS b2JlcnQgSG9nYW4gIDxyb2JlcnRAd2Via2l0Lm9yZz4KIAogICAgICAgICBuZXctd2Via2l0LXJ1 bi10ZXN0czogaGFuZGxlIHJlZiB0ZXN0cyBmcm9tIHRoZSBDU1MgdGVzdCBzdWl0ZQpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvaWZyYW1lcy9yZXNvdXJjZXMvZml4ZWQtcG9z aXRpb24tdHJhbnNmb3JtZWQtc3ViZnJhbWUuaHRtbCBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5n L2lmcmFtZXMvcmVzb3VyY2VzL2ZpeGVkLXBvc2l0aW9uLXRyYW5zZm9ybWVkLXN1YmZyYW1lLmh0 bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uMmQwZWU1MDMyZjc2M2UxZWYyYjlkZjE2NWMwYTdiMDU2ZjUzMjI3Mgot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2lmcmFtZXMvcmVzb3Vy Y2VzL2ZpeGVkLXBvc2l0aW9uLXRyYW5zZm9ybWVkLXN1YmZyYW1lLmh0bWwKQEAgLTAsMCArMSw1 NyBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorICA8c3R5bGUgdHlwZT0ndGV4 dC9jc3MnPgorICAgIGJvZHkgeworICAgICAgICBoZWlnaHQ6IDEwMDBweDsKKyAgICB9CisKKyAg ICAuZ3JlZW4geworICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgICB9CisKKyAg ICAuZml4ZWQgeworICAgICAgICBwb3NpdGlvbjogZml4ZWQ7CisgICAgICAgIHRvcDogMHB4Owor ICAgICAgICBsZWZ0OiAwcHg7CisgICAgfQorCisgICAgLmJveCB7CisgICAgICAgIHdpZHRoOiAz MDBweDsKKyAgICAgICAgaGVpZ2h0OiAzMDBweDsKKyAgICB9CisKKyAgICAuY29udGFpbmVyIHsK KyAgICAgICAgcG9zaXRpb246IHJlbGF0aXZlOworICAgIH0KKworICAgIC5wZXJzcGVjdGl2ZSB7 CisgICAgICAgIC13ZWJraXQtcGVyc3BlY3RpdmU6IDFweDsKKyAgICB9CisgIDwvc3R5bGU+Cisg IDxzY3JpcHQ+CisgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikgeworICAgICAg bGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCh0cnVlKTsKKyAgICB9CisKKyAgICBmdW5j dGlvbiBkb1Rlc3QoKQorICAgIHsKKyAgICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xs ZXIpCisgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmRpc3BsYXkoKTsKKworICAgICAgLy8g QW55IHNjcm9sbCBzaG91bGQga2VlcCB0aGUgZml4ZWQtcG9zaXRpb24gZWxlbWVudCB3aGVyZSBp dCBpcy4KKyAgICAgIC8vIElmIGl0IHN0dXR0ZXJzIG9yIGRpc2FwcGVhcnMgaW5jb3JyZWN0bHks IHRoZW4gdGhlIHJlZCBiYWNrZ3JvdW5kIHdpbGwgYmUgcmV2ZWFsZWQuCisgICAgICB3aW5kb3cu c2Nyb2xsVG8oMCwgMTUwKTsKKyAgICB9CisKKyAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcign bG9hZCcsIGRvVGVzdCwgZmFsc2UpOworICA8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorICA8 ZGl2IGNsYXNzPSJncmVlbiBmaXhlZCBib3giPgorICAgIDxkaXYgY2xhc3M9ImNvbnRhaW5lciI+ CisgICAgICA8ZGl2IGNsYXNzPSJwZXJzcGVjdGl2ZSI+PC9kaXY+CisgICAgPC9kaXY+CisgIDwv ZGl2PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29tcG9zaXRp bmcvaWZyYW1lcy9zY3JvbGwtZml4ZWQtdHJhbnNmb3JtZWQtZWxlbWVudC1leHBlY3RlZC5wbmcg Yi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9pZnJhbWVzL3Njcm9sbC1maXhlZC10cmFuc2Zvcm1l ZC1lbGVtZW50LWV4cGVjdGVkLnBuZwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5mMTI4YTFjZGRkMjVkYmM0ZDM0NjQz YTQ0MWUzMDU5ZGQxY2U2YTMxCkdJVCBiaW5hcnkgcGF0Y2gKbGl0ZXJhbCAzMzQ4CnpjbWVBU0BO PyhvbEh5YHVWQnEhaWEweX55VXsrdllWMmE+aTFCJVFsWWJwUnpua0I5Z0NDTTQ3JD1TdUZ4ZVI4 Qgp6WChyfC1zVjFmdG1Me2YjIylqciokKkQ8MyNzLVB6JChHM21yYiFFND8hQz54el9aTkwjV0FF fSZmQS1ZZDR+LXwKelNSSik0PnxMPz9ZMSRzaSVlJU19QjMyKFZIcyN6P19PWEJPY1I4UjlqcXto WTFGOEdZNE0wK29rJUBzSmdAdUVHCnpWUz1DbjFBfkpiTGgjJndJaHA8TDg8YFYmNDNGKSljRHcl aG9jWXBCNDBqSCh2TT9+NTsxRlA3UCo4U1lVfSklSgp6VX1SdTBWajR6KlhNVFFSWGI4Xzx5WiEk O09NN3pgaDg/WmsqdW4+RXBwNlFtckpfTDxBVHZMfFdNbypzP3NaaWEKejZHTVRyXyVLZXghIUs4 a2BlO2EodkImUksrdUgpYG5qZF82Z1NtdmpReSZoaGw1RXRTcXRQKiVqfk1WYVVgSkVQCmRwaF9Z QzdePm9odnRCSX0lTFlhcGdRdSZYJVF+bG9DSUgoTnpNY1I4CgpsaXRlcmFsIDAKSGNtVj9kMDAw MDEKCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9pZnJhbWVzL3Njcm9sbC1m aXhlZC10cmFuc2Zvcm1lZC1lbGVtZW50LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2NvbXBv c2l0aW5nL2lmcmFtZXMvc2Nyb2xsLWZpeGVkLXRyYW5zZm9ybWVkLWVsZW1lbnQtZXhwZWN0ZWQu dHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAuLjhiMTM3ODkxNzkxZmU5NjkyN2FkNzhlNjRiMGFhZDdiZGVkMDhiZGMK LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9pZnJhbWVzL3Njcm9s bC1maXhlZC10cmFuc2Zvcm1lZC1lbGVtZW50LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxIEBACisK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2lmcmFtZXMvc2Nyb2xsLWZpeGVk LXRyYW5zZm9ybWVkLWVsZW1lbnQuaHRtbCBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2lmcmFt ZXMvc2Nyb2xsLWZpeGVkLXRyYW5zZm9ybWVkLWVsZW1lbnQuaHRtbApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5mMDNi MjljN2QyM2M1ZDM4ZmRhMmIyOWFhZjBhOWVlZTc3OGNhMWE1Ci0tLSAvZGV2L251bGwKKysrIGIv TGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvaWZyYW1lcy9zY3JvbGwtZml4ZWQtdHJhbnNmb3JtZWQt ZWxlbWVudC5odG1sCkBAIC0wLDAgKzEsMjUgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8 aGVhZD4KKyAgPHN0eWxlPgorICAgIGlmcmFtZSB7CisgICAgICB3aWR0aDogMzAwcHg7CisgICAg ICBoZWlnaHQ6IDMwMHB4OworICAgICAgcG9zaXRpb246IGFic29sdXRlOworICAgICAgYm9yZGVy OiBub25lOworICAgICAgYmFja2dyb3VuZC1jb2xvcjogcmVkOworICAgIH0KKyAgPC9zdHlsZT4K KzwvaGVhZD4KKzxib2R5PgorICA8IS0tIFRoaXMgdGVzdCByZXByb2R1Y2VzIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDk3OS4KKyAgICAgICBJbiB0aGlzIGJ1Zywg Y2xpcFJlY3RzIHRoYXQgd2VyZSBzdXBwb3NlZCB0byBiZSAiaW5maW5pdGUiIHdlcmUgYmVpbmcg c2Nyb2xsZWQsCisgICAgICAgY2F1c2luZyB0aGVtIHRvIG5vIGxvbmdlciBiZSBjb25zaWRlcmVk IGluZmluaXRlLiBBcyBhIHJlc3VsdCwgZml4ZWQtcG9zaXRpb24KKyAgICAgICBsYXllcnMgd2l0 aCB0cmFuc2Zvcm1lZCBlbGVtZW50cyB3b3VsZCBoYXZlIHByb2JsZW1zLgorCisgICAgICAgSW4g dGhpcyBsYXlvdXQgdGVzdCwgdGhlIGZpeGVkLXBvc2l0aW9uIGdyZWVuIGJveCBzaG91bGQgZmls bCB0aGUgaWZyYW1lLCB0aHVzCisgICAgICAgaGlkaW5nIHRoZSByZWQgYmFja2dyb3VuZC4KKyAg ICAtLT4KKyAgPGlmcmFtZSBpZD0iZnJhbWUiIHNyYz0icmVzb3VyY2VzL2ZpeGVkLXBvc2l0aW9u LXRyYW5zZm9ybWVkLXN1YmZyYW1lLmh0bWwiPjwvaWZyYW1lPgorPC9ib2R5PgorPC9odG1sPgo=