46120 2010-09-20 14:24:03 -0700 RenderImage::intrinsicSizeChanged crashes when m_imageResource is missing 2010-09-21 18:09:14 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) All All RESOLVED FIXED P1 Major --- 0 ctruta webkit-unassigned commit-queue jamesr oldest_to_newest 281813 0 ctruta 2010-09-20 14:24:03 -0700 This is a regression from bug 43779, changeset 66223. It has been noticed in Chromium; see the Chromium issue 54972 at http://code.google.com/p/chromium/issues/detail?id=54972 I am submitting a straightforward patch that fixes the crash, although I am not entirely sure this is the right fix. Input from reviewers will be highly appreciated. My understanding of the changeset 66223 is that RenderImage objects must have an ImageResource, so setImageResource must be called either inside the constructor (as it's the case with RenderMedia), or immediately after the constructor (as it's the case with the renderer associated with HTMLImageElement, HTMLInputElement, HTMLObjectElement, etc.). This, however, doesn't work well in the case of RenderObject or RenderObjectChildList: inside RenderObject::createObject, as well as inside RenderObjectChildList::updateBeforeAfterContent, setImageResource is called only after setting the image style. This leads to a crash when the style is zoomed, because RenderImage::setStyle (or more precisely, RenderImage::intrinsicSizeChanged) assumes that an ImageResource object exists. Swapping setStyle and setImageResource doesn't work any better, because setImageResource also assumes that a style exists! I am setting the severity/priority level to Major/P1, because it is crashing Chromium badly. I will submit, shortly, my very simple patch and layout test. 282042 1 68179 ctruta 2010-09-20 19:53:52 -0700 Created attachment 68179 Fix and layout test As I mentioned in the previous comment, perhaps a little ambiguously: Swapping the order of calls to setStyle/setImageResource inside RenderObject::createObject and RenderObjectChildList::updateBeforeAfterContent does not solve the lack of initialization, because initializing a style and initializing an image resource are cyclically dependent on each other. I am, therefore, relying on a simple if-check instead, to avoid this issue altogether. 282105 2 68179 zimmermann 2010-09-20 22:51:43 -0700 Comment on attachment 68179 Fix and layout test View in context: https://bugs.webkit.org/attachment.cgi?id=68179&action=review > WebCore/rendering/RenderImage.h:66 > + if (m_imageResource.get()) No need to use .get(). r=me. If you don't have commit access, you'll need to upload a new version, that I can cq+. 282241 3 68226 ctruta 2010-09-21 05:54:24 -0700 Created attachment 68226 Fix and layout test, comply with reviewer's comments 282562 4 68226 commit-queue 2010-09-21 14:36:07 -0700 Comment on attachment 68226 Fix and layout test, comply with reviewer's comments Rejecting patch 68226 from commit-queue. Failed to run "['WebKitTools/Scripts/run-webkit-tests', '--no-launch-safari', '--exit-after-n-failures=1', '--wait-for-httpd', '--quiet']" exit_code: 1 Running build-dumprendertree Compiling Java tests make: Nothing to be done for `default'. Running tests from /Projects/CommitQueue/LayoutTests Testing 21333 test cases. css3/style-zoomed-image.html -> failed Exiting early after 1 failures. 1581 tests run. 48.40s total testing time 1580 test cases (99%) succeeded 1 test case (<1%) had incorrect layout 1 test case (<1%) had stderr output Full output: http://queues.webkit.org/results/4001076 282575 5 ctruta 2010-09-21 14:56:36 -0700 (In reply to comment #4) Did the layout test fail on Mac? I do not understand why. I am running the trybot, again, to get more details on why it happened. I do not know, at this point, whether it's my fault and it needs more fixing on Mac. The patch is urgently needed on Chromium; should I add an exclusion, for the time being? 282647 6 jamesr 2010-09-21 16:57:25 -0700 The commit queue is saying that this test failed on mac. I'll see if I can repro. 282652 7 ctruta 2010-09-21 17:01:49 -0700 I rerun my patch with the try bots, thinking that I might have done something wrong previously, but I received successful results this time as well. I am really confused by what is happening, and I would really appreciate some help. Is there a way to retry this, e.g. by putting the patch back into the commit queue? 282667 8 jamesr 2010-09-21 17:11:47 -0700 (In reply to comment #7) > I rerun my patch with the try bots, thinking that I might have done something wrong previously, but I received successful results this time as well. I am really confused by what is happening, and I would really appreciate some help. Is there a way to retry this, e.g. by putting the patch back into the commit queue? What platform are you testing on? The failure the commit queue is seeing is on the mac port (i.e. Safari), not chromium-mac. 282675 9 jamesr 2010-09-21 17:20:08 -0700 The failure is due to trailing whitespace differences. I'm guessing you were testing with new-run-webkit-tests, which ignores trailing '\n's, I can fix and land by hand if you'd like. 282707 10 68320 ctruta 2010-09-21 17:54:48 -0700 Created attachment 68320 Fix + layout test + fixed "expected" file James, I'm so grateful for finding this out for me. Thank you! I don't know how I lost the trailing '\n', probably while copying+pasting, and their lack didn't seem to cause any issue in the Chromium test runs. When I resubmitted the job to the trybots, all of them (mac, linux, windows) were happy as well. I already resubmitting the fixed patch, could you please review and commit-queue it? (Or, should I have submitted only the '\n\n' change this time?) 282708 11 68320 jamesr 2010-09-21 17:58:31 -0700 Comment on attachment 68320 Fix + layout test + fixed "expected" file As I said, new-run-webkit-tests (which chromium uses) ignores trailing newline diffs when running tests. run-webkit-tests (which the mac port uses) does not. That's why you did not see a failure but the commit queue did. 282710 12 68320 jamesr 2010-09-21 18:08:58 -0700 Comment on attachment 68320 Fix + layout test + fixed "expected" file Clearing flags on attachment: 68320 Committed r68004: <http://trac.webkit.org/changeset/68004> 282711 13 jamesr 2010-09-21 18:09:14 -0700 All reviewed patches have been landed. Closing bug. 68179 2010-09-20 19:53:52 -0700 2010-09-21 05:54:24 -0700 Fix and layout test webkit.diff.submit text/plain 4083 ctruta ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkMDUwZjU3Li5kNGY1NmUxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDkt MjAgIENvc21pbiBUcnV0YSAgPGN0cnV0YUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVuZGVySW1hZ2U6OmludHJpbnNpY1Np emVDaGFuZ2VkIGNyYXNoZXMgd2hlbiBtX2ltYWdlUmVzb3VyY2UgaXMgbWlzc2luZworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDYxMjAKKworICAgICAg ICBUZXN0IGEgc3R5bGUgY2hhbmdlIGFwcGxpZWQgdG8gYSB6b29tZWQgaW1hZ2UuCisKKyAgICAg ICAgKiBjc3MzL3N0eWxlLXpvb21lZC1pbWFnZS5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBjc3Mz L3N0eWxlLXpvb21lZC1pbWFnZS1leHBlY3RlZC50eHQ6IEFkZGVkLgorCiAyMDEwLTA5LTIwICBB ZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBTa2lwIHNvbWUgZmFpbGlu ZyBhbmltYXRpb24gdGVzdHMgb24gV2luZG93cwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3Nz My9zdHlsZS16b29tZWQtaW1hZ2UtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvY3NzMy9zdHls ZS16b29tZWQtaW1hZ2UtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAuLmU1Y2E5YjkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL3N0eWxl LXpvb21lZC1pbWFnZS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwzIEBACitUZXN0IGZvciBCdWcg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2MTIwLgorCitUaGlzIHRl c3QgY2hlY2tzIHRoYXQgc2V0dGluZyB0aGUgc3R5bGUgb24gYSB6b29tZWQgaW1hZ2UgZG9lcyBu b3QgbGVhZCB0byBhIG51bGwgcG9pbnRlciBleGNlcHRpb24uIFRoZSB0ZXN0IHBhc3NlcyBpZiBp dCBkb2VzIG5vdCBjYXVzZSBhIGNyYXNoLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3NzMy9z dHlsZS16b29tZWQtaW1hZ2UuaHRtbCBiL0xheW91dFRlc3RzL2NzczMvc3R5bGUtem9vbWVkLWlt YWdlLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZmE4M2UxNAotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NzczMvc3R5bGUtem9vbWVkLWltYWdlLmh0bWwK QEAgLTAsMCArMSwyNiBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9XM0MvL0RURCBIVE1M IDQuMDEvL0VOIj4KKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0PgorICAgIGlmICh3aW5kb3cubGF5 b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1Rl eHQoKTsKKzwvc2NyaXB0PgorPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KKyAgICBkaXYgeyB6b29t OiAyMDAlOyB3aWR0aDogMTAwcHg7IGhlaWdodDogNTBweDsgfQorPC9zdHlsZT4KKzwvaGVhZD4K Kzxib2R5PgorPHA+CitUZXN0IGZvciA8YSBocmVmPSJodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NDYxMjAiPkJ1ZyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NDYxMjA8L2E+LgorPC9wPgorPHA+CitUaGlzIHRlc3QgY2hlY2tzIHRoYXQgc2V0 dGluZyB0aGUgc3R5bGUgb24gYSB6b29tZWQgaW1hZ2UgZG9lcyBub3QgbGVhZCB0byBhIG51bGwg cG9pbnRlciBleGNlcHRpb24uCitUaGUgdGVzdCBwYXNzZXMgaWYgaXQgZG9lcyBub3QgY2F1c2Ug YSBjcmFzaC4KKzwvcD4KKzxkaXYgaWQ9ImlubGluZSI+Cis8L2Rpdj4KKzxzY3JpcHQ+CisgICAg ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImlubGluZSIpLnNldEF0dHJpYnV0ZSgic3R5bGUiLCAi Y29udGVudDogdXJsKGRhdGE6aW1hZ2UvcG5nO2Jhc2U2NCxpVkJPUncwS0dnb0FBQUFOU1VoRVVn QUFBQThBQUFBUEFRTUFBQUFCR0FjSkFBQUFBMUJNVkVVQWdBQ2MrYVdSQUFBQURFbEVRVlI0Mm1O Z0lBRUFBQUF0QUFIN0toTXFBQUFBQUVsRlRrU3VRbUNDKTsiKTsKKzwvc2NyaXB0PgorPC9ib2R5 PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5n ZUxvZwppbmRleCAzMWU5ZjEwLi5iZmM0NWNkIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxv ZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEwLTA5LTIwICBD b3NtaW4gVHJ1dGEgIDxjdHJ1dGFAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbmRlckltYWdlOjppbnRyaW5zaWNTaXplQ2hh bmdlZCBjcmFzaGVzIHdoZW4gbV9pbWFnZVJlc291cmNlIGlzIG1pc3NpbmcKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2MTIwCisKKyAgICAgICAgQXZv aWQgYXBwbHlpbmcgb3BlcmF0b3IgLT4gdG8gbV9pbWFnZVJlc291cmNlIHdoZW4gaXRzIHVuZGVy bHlpbmcgcG9pbnRlciBpcyBOVUxMLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckltYWdl Lmg6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJJbWFnZTo6aW50cmluc2ljU2l6ZUNoYW5nZWQp OiBDaGVja2VkIG1faW1hZ2VSZXNvdXJjZS4KKyAgICAgICAgKiBodG1sL0hUTUxJbWFnZUVsZW1l bnQuY3BwOgorICAgICAgICAoSFRNTEltYWdlRWxlbWVudDo6Y3JlYXRlUmVuZGVyZXIpOiBGaXhl ZCBpbmRlbnRhdGlvbi4KKwogMjAxMC0wOS0yMCAgRW5yaWNhIENhc3VjY2kgIDxlbnJpY2FAYXBw bGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCmRpZmYgLS1naXQgYS9X ZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5jcHAgYi9XZWJDb3JlL2h0bWwvSFRNTEltYWdl RWxlbWVudC5jcHAKaW5kZXggZDIyM2IxZS4uMjllYTU5MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9o dG1sL0hUTUxJbWFnZUVsZW1lbnQuY3BwCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MSW1hZ2VFbGVt ZW50LmNwcApAQCAtMTgwLDcgKzE4MCw3IEBAIFN0cmluZyBIVE1MSW1hZ2VFbGVtZW50OjphbHRU ZXh0KCkgY29uc3QKIAogUmVuZGVyT2JqZWN0KiBIVE1MSW1hZ2VFbGVtZW50OjpjcmVhdGVSZW5k ZXJlcihSZW5kZXJBcmVuYSogYXJlbmEsIFJlbmRlclN0eWxlKiBzdHlsZSkKIHsKLSAgICAgaWYg KHN0eWxlLT5jb250ZW50RGF0YSgpKQorICAgIGlmIChzdHlsZS0+Y29udGVudERhdGEoKSkKICAg ICAgICAgcmV0dXJuIFJlbmRlck9iamVjdDo6Y3JlYXRlT2JqZWN0KHRoaXMsIHN0eWxlKTsKIAog ICAgIFJlbmRlckltYWdlKiBpbWFnZSA9IG5ldyAoYXJlbmEpIFJlbmRlckltYWdlKHRoaXMpOwpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW1hZ2UuaCBiL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckltYWdlLmgKaW5kZXggYTg2NjZlZS4uZmFiZThiMSAxMDA2NDQKLS0tIGEv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW1hZ2UuaAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJJbWFnZS5oCkBAIC02MSw3ICs2MSwxMSBAQCBwcm90ZWN0ZWQ6CiAgICAgYm9vbCBpc1dp ZHRoU3BlY2lmaWVkKCkgY29uc3Q7CiAgICAgYm9vbCBpc0hlaWdodFNwZWNpZmllZCgpIGNvbnN0 OwogCi0gICAgdmlydHVhbCB2b2lkIGludHJpbnNpY1NpemVDaGFuZ2VkKCkgeyBpbWFnZUNoYW5n ZWQobV9pbWFnZVJlc291cmNlLT5pbWFnZVB0cigpKTsgfQorICAgIHZpcnR1YWwgdm9pZCBpbnRy aW5zaWNTaXplQ2hhbmdlZCgpCisgICAgeworICAgICAgICBpZiAobV9pbWFnZVJlc291cmNlLmdl dCgpKQorICAgICAgICAgICAgaW1hZ2VDaGFuZ2VkKG1faW1hZ2VSZXNvdXJjZS0+aW1hZ2VQdHIo KSk7CisgICAgfQogCiBwcml2YXRlOgogICAgIHZpcnR1YWwgY29uc3QgY2hhciogcmVuZGVyTmFt ZSgpIGNvbnN0IHsgcmV0dXJuICJSZW5kZXJJbWFnZSI7IH0K 68226 2010-09-21 05:54:24 -0700 2010-09-21 17:54:48 -0700 Fix and layout test, comply with reviewer's comments webkit.diff.submit2 text/plain 4077 ctruta ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkMDUwZjU3Li5kNGY1NmUxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDkt MjAgIENvc21pbiBUcnV0YSAgPGN0cnV0YUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVuZGVySW1hZ2U6OmludHJpbnNpY1Np emVDaGFuZ2VkIGNyYXNoZXMgd2hlbiBtX2ltYWdlUmVzb3VyY2UgaXMgbWlzc2luZworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDYxMjAKKworICAgICAg ICBUZXN0IGEgc3R5bGUgY2hhbmdlIGFwcGxpZWQgdG8gYSB6b29tZWQgaW1hZ2UuCisKKyAgICAg ICAgKiBjc3MzL3N0eWxlLXpvb21lZC1pbWFnZS5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBjc3Mz L3N0eWxlLXpvb21lZC1pbWFnZS1leHBlY3RlZC50eHQ6IEFkZGVkLgorCiAyMDEwLTA5LTIwICBB ZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBTa2lwIHNvbWUgZmFpbGlu ZyBhbmltYXRpb24gdGVzdHMgb24gV2luZG93cwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3Nz My9zdHlsZS16b29tZWQtaW1hZ2UtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvY3NzMy9zdHls ZS16b29tZWQtaW1hZ2UtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAuLmU1Y2E5YjkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL3N0eWxl LXpvb21lZC1pbWFnZS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwzIEBACitUZXN0IGZvciBCdWcg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2MTIwLgorCitUaGlzIHRl c3QgY2hlY2tzIHRoYXQgc2V0dGluZyB0aGUgc3R5bGUgb24gYSB6b29tZWQgaW1hZ2UgZG9lcyBu b3QgbGVhZCB0byBhIG51bGwgcG9pbnRlciBleGNlcHRpb24uIFRoZSB0ZXN0IHBhc3NlcyBpZiBp dCBkb2VzIG5vdCBjYXVzZSBhIGNyYXNoLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3NzMy9z dHlsZS16b29tZWQtaW1hZ2UuaHRtbCBiL0xheW91dFRlc3RzL2NzczMvc3R5bGUtem9vbWVkLWlt YWdlLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZmE4M2UxNAotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NzczMvc3R5bGUtem9vbWVkLWltYWdlLmh0bWwK QEAgLTAsMCArMSwyNiBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9XM0MvL0RURCBIVE1M IDQuMDEvL0VOIj4KKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0PgorICAgIGlmICh3aW5kb3cubGF5 b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1Rl eHQoKTsKKzwvc2NyaXB0PgorPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KKyAgICBkaXYgeyB6b29t OiAyMDAlOyB3aWR0aDogMTAwcHg7IGhlaWdodDogNTBweDsgfQorPC9zdHlsZT4KKzwvaGVhZD4K Kzxib2R5PgorPHA+CitUZXN0IGZvciA8YSBocmVmPSJodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NDYxMjAiPkJ1ZyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NDYxMjA8L2E+LgorPC9wPgorPHA+CitUaGlzIHRlc3QgY2hlY2tzIHRoYXQgc2V0 dGluZyB0aGUgc3R5bGUgb24gYSB6b29tZWQgaW1hZ2UgZG9lcyBub3QgbGVhZCB0byBhIG51bGwg cG9pbnRlciBleGNlcHRpb24uCitUaGUgdGVzdCBwYXNzZXMgaWYgaXQgZG9lcyBub3QgY2F1c2Ug YSBjcmFzaC4KKzwvcD4KKzxkaXYgaWQ9ImlubGluZSI+Cis8L2Rpdj4KKzxzY3JpcHQ+CisgICAg ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImlubGluZSIpLnNldEF0dHJpYnV0ZSgic3R5bGUiLCAi Y29udGVudDogdXJsKGRhdGE6aW1hZ2UvcG5nO2Jhc2U2NCxpVkJPUncwS0dnb0FBQUFOU1VoRVVn QUFBQThBQUFBUEFRTUFBQUFCR0FjSkFBQUFBMUJNVkVVQWdBQ2MrYVdSQUFBQURFbEVRVlI0Mm1O Z0lBRUFBQUF0QUFIN0toTXFBQUFBQUVsRlRrU3VRbUNDKTsiKTsKKzwvc2NyaXB0PgorPC9ib2R5 PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5n ZUxvZwppbmRleCAzMWU5ZjEwLi5iZmM0NWNkIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxv ZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEwLTA5LTIwICBD b3NtaW4gVHJ1dGEgIDxjdHJ1dGFAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbmRlckltYWdlOjppbnRyaW5zaWNTaXplQ2hh bmdlZCBjcmFzaGVzIHdoZW4gbV9pbWFnZVJlc291cmNlIGlzIG1pc3NpbmcKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2MTIwCisKKyAgICAgICAgQXZv aWQgYXBwbHlpbmcgb3BlcmF0b3IgLT4gdG8gbV9pbWFnZVJlc291cmNlIHdoZW4gaXRzIHVuZGVy bHlpbmcgcG9pbnRlciBpcyBOVUxMLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckltYWdl Lmg6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJJbWFnZTo6aW50cmluc2ljU2l6ZUNoYW5nZWQp OiBDaGVja2VkIG1faW1hZ2VSZXNvdXJjZS4KKyAgICAgICAgKiBodG1sL0hUTUxJbWFnZUVsZW1l bnQuY3BwOgorICAgICAgICAoSFRNTEltYWdlRWxlbWVudDo6Y3JlYXRlUmVuZGVyZXIpOiBGaXhl ZCBpbmRlbnRhdGlvbi4KKwogMjAxMC0wOS0yMCAgRW5yaWNhIENhc3VjY2kgIDxlbnJpY2FAYXBw bGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCmRpZmYgLS1naXQgYS9X ZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5jcHAgYi9XZWJDb3JlL2h0bWwvSFRNTEltYWdl RWxlbWVudC5jcHAKaW5kZXggZDIyM2IxZS4uMjllYTU5MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9o dG1sL0hUTUxJbWFnZUVsZW1lbnQuY3BwCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MSW1hZ2VFbGVt ZW50LmNwcApAQCAtMTgwLDcgKzE4MCw3IEBAIFN0cmluZyBIVE1MSW1hZ2VFbGVtZW50OjphbHRU ZXh0KCkgY29uc3QKIAogUmVuZGVyT2JqZWN0KiBIVE1MSW1hZ2VFbGVtZW50OjpjcmVhdGVSZW5k ZXJlcihSZW5kZXJBcmVuYSogYXJlbmEsIFJlbmRlclN0eWxlKiBzdHlsZSkKIHsKLSAgICAgaWYg KHN0eWxlLT5jb250ZW50RGF0YSgpKQorICAgIGlmIChzdHlsZS0+Y29udGVudERhdGEoKSkKICAg ICAgICAgcmV0dXJuIFJlbmRlck9iamVjdDo6Y3JlYXRlT2JqZWN0KHRoaXMsIHN0eWxlKTsKIAog ICAgIFJlbmRlckltYWdlKiBpbWFnZSA9IG5ldyAoYXJlbmEpIFJlbmRlckltYWdlKHRoaXMpOwpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW1hZ2UuaCBiL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckltYWdlLmgKaW5kZXggYTg2NjZlZS4uMWFhMDAzZSAxMDA2NDQKLS0tIGEv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW1hZ2UuaAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJJbWFnZS5oCkBAIC02MSw3ICs2MSwxMSBAQCBwcm90ZWN0ZWQ6CiAgICAgYm9vbCBpc1dp ZHRoU3BlY2lmaWVkKCkgY29uc3Q7CiAgICAgYm9vbCBpc0hlaWdodFNwZWNpZmllZCgpIGNvbnN0 OwogCi0gICAgdmlydHVhbCB2b2lkIGludHJpbnNpY1NpemVDaGFuZ2VkKCkgeyBpbWFnZUNoYW5n ZWQobV9pbWFnZVJlc291cmNlLT5pbWFnZVB0cigpKTsgfQorICAgIHZpcnR1YWwgdm9pZCBpbnRy aW5zaWNTaXplQ2hhbmdlZCgpCisgICAgeworICAgICAgICBpZiAobV9pbWFnZVJlc291cmNlKQor ICAgICAgICAgICAgaW1hZ2VDaGFuZ2VkKG1faW1hZ2VSZXNvdXJjZS0+aW1hZ2VQdHIoKSk7Cisg ICAgfQogCiBwcml2YXRlOgogICAgIHZpcnR1YWwgY29uc3QgY2hhciogcmVuZGVyTmFtZSgpIGNv bnN0IHsgcmV0dXJuICJSZW5kZXJJbWFnZSI7IH0K 68320 2010-09-21 17:54:48 -0700 2010-09-21 18:08:58 -0700 Fix + layout test + fixed "expected" file webkit.diff.submit3 text/plain 4081 ctruta ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkMDUwZjU3Li5kNGY1NmUxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDkt MjAgIENvc21pbiBUcnV0YSAgPGN0cnV0YUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVuZGVySW1hZ2U6OmludHJpbnNpY1Np emVDaGFuZ2VkIGNyYXNoZXMgd2hlbiBtX2ltYWdlUmVzb3VyY2UgaXMgbWlzc2luZworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDYxMjAKKworICAgICAg ICBUZXN0IGEgc3R5bGUgY2hhbmdlIGFwcGxpZWQgdG8gYSB6b29tZWQgaW1hZ2UuCisKKyAgICAg ICAgKiBjc3MzL3N0eWxlLXpvb21lZC1pbWFnZS5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBjc3Mz L3N0eWxlLXpvb21lZC1pbWFnZS1leHBlY3RlZC50eHQ6IEFkZGVkLgorCiAyMDEwLTA5LTIwICBB ZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBTa2lwIHNvbWUgZmFpbGlu ZyBhbmltYXRpb24gdGVzdHMgb24gV2luZG93cwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3Nz My9zdHlsZS16b29tZWQtaW1hZ2UtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvY3NzMy9zdHls ZS16b29tZWQtaW1hZ2UtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAuLmU3MTkyYjgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL3N0eWxl LXpvb21lZC1pbWFnZS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw1IEBACitUZXN0IGZvciBCdWcg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2MTIwLgorCitUaGlzIHRl c3QgY2hlY2tzIHRoYXQgc2V0dGluZyB0aGUgc3R5bGUgb24gYSB6b29tZWQgaW1hZ2UgZG9lcyBu b3QgbGVhZCB0byBhIG51bGwgcG9pbnRlciBleGNlcHRpb24uIFRoZSB0ZXN0IHBhc3NlcyBpZiBp dCBkb2VzIG5vdCBjYXVzZSBhIGNyYXNoLgorCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Nz czMvc3R5bGUtem9vbWVkLWltYWdlLmh0bWwgYi9MYXlvdXRUZXN0cy9jc3MzL3N0eWxlLXpvb21l ZC1pbWFnZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmZhODNlMTQK LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL3N0eWxlLXpvb21lZC1pbWFnZS5o dG1sCkBAIC0wLDAgKzEsMjYgQEAKKzwhRE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8vVzNDLy9EVEQg SFRNTCA0LjAxLy9FTiI+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdD4KKyAgICBpZiAod2luZG93 LmxheW91dFRlc3RDb250cm9sbGVyKQorICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1w QXNUZXh0KCk7Cis8L3NjcmlwdD4KKzxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CisgICAgZGl2IHsg em9vbTogMjAwJTsgd2lkdGg6IDEwMHB4OyBoZWlnaHQ6IDUwcHg7IH0KKzwvc3R5bGU+Cis8L2hl YWQ+Cis8Ym9keT4KKzxwPgorVGVzdCBmb3IgPGEgaHJlZj0iaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTQ2MTIwIj5CdWcgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTQ2MTIwPC9hPi4KKzwvcD4KKzxwPgorVGhpcyB0ZXN0IGNoZWNrcyB0aGF0 IHNldHRpbmcgdGhlIHN0eWxlIG9uIGEgem9vbWVkIGltYWdlIGRvZXMgbm90IGxlYWQgdG8gYSBu dWxsIHBvaW50ZXIgZXhjZXB0aW9uLgorVGhlIHRlc3QgcGFzc2VzIGlmIGl0IGRvZXMgbm90IGNh dXNlIGEgY3Jhc2guCis8L3A+Cis8ZGl2IGlkPSJpbmxpbmUiPgorPC9kaXY+Cis8c2NyaXB0Pgor ICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJpbmxpbmUiKS5zZXRBdHRyaWJ1dGUoInN0eWxl IiwgImNvbnRlbnQ6IHVybChkYXRhOmltYWdlL3BuZztiYXNlNjQsaVZCT1J3MEtHZ29BQUFBTlNV aEVVZ0FBQUE4QUFBQVBBUU1BQUFBQkdBY0pBQUFBQTFCTVZFVUFnQUNjK2FXUkFBQUFERWxFUVZS NDJtTmdJQUVBQUFBdEFBSDdLaE1xQUFBQUFFbEZUa1N1UW1DQyk7Iik7Cis8L3NjcmlwdD4KKzwv Ym9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9D aGFuZ2VMb2cKaW5kZXggMzFlOWYxMC4uYmZjNDVjZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFu Z2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wOS0y MCAgQ29zbWluIFRydXRhICA8Y3RydXRhQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5kZXJJbWFnZTo6aW50cmluc2ljU2l6 ZUNoYW5nZWQgY3Jhc2hlcyB3aGVuIG1faW1hZ2VSZXNvdXJjZSBpcyBtaXNzaW5nCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjEyMAorCisgICAgICAg IEF2b2lkIGFwcGx5aW5nIG9wZXJhdG9yIC0+IHRvIG1faW1hZ2VSZXNvdXJjZSB3aGVuIGl0cyB1 bmRlcmx5aW5nIHBvaW50ZXIgaXMgTlVMTC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJJ bWFnZS5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVySW1hZ2U6OmludHJpbnNpY1NpemVDaGFu Z2VkKTogQ2hlY2tlZCBtX2ltYWdlUmVzb3VyY2UuCisgICAgICAgICogaHRtbC9IVE1MSW1hZ2VF bGVtZW50LmNwcDoKKyAgICAgICAgKEhUTUxJbWFnZUVsZW1lbnQ6OmNyZWF0ZVJlbmRlcmVyKTog Rml4ZWQgaW5kZW50YXRpb24uCisKIDIwMTAtMDktMjAgIEVucmljYSBDYXN1Y2NpICA8ZW5yaWNh QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9odG1sL0hUTUxJbWFnZUVsZW1lbnQuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxJ bWFnZUVsZW1lbnQuY3BwCmluZGV4IGQyMjNiMWUuLjI5ZWE1OTIgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvaHRtbC9IVE1MSW1hZ2VFbGVtZW50LmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTEltYWdl RWxlbWVudC5jcHAKQEAgLTE4MCw3ICsxODAsNyBAQCBTdHJpbmcgSFRNTEltYWdlRWxlbWVudDo6 YWx0VGV4dCgpIGNvbnN0CiAKIFJlbmRlck9iamVjdCogSFRNTEltYWdlRWxlbWVudDo6Y3JlYXRl UmVuZGVyZXIoUmVuZGVyQXJlbmEqIGFyZW5hLCBSZW5kZXJTdHlsZSogc3R5bGUpCiB7Ci0gICAg IGlmIChzdHlsZS0+Y29udGVudERhdGEoKSkKKyAgICBpZiAoc3R5bGUtPmNvbnRlbnREYXRhKCkp CiAgICAgICAgIHJldHVybiBSZW5kZXJPYmplY3Q6OmNyZWF0ZU9iamVjdCh0aGlzLCBzdHlsZSk7 CiAKICAgICBSZW5kZXJJbWFnZSogaW1hZ2UgPSBuZXcgKGFyZW5hKSBSZW5kZXJJbWFnZSh0aGlz KTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckltYWdlLmggYi9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJJbWFnZS5oCmluZGV4IGE4NjY2ZWUuLjFhYTAwM2UgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckltYWdlLmgKKysrIGIvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVySW1hZ2UuaApAQCAtNjEsNyArNjEsMTEgQEAgcHJvdGVjdGVkOgogICAgIGJvb2wg aXNXaWR0aFNwZWNpZmllZCgpIGNvbnN0OwogICAgIGJvb2wgaXNIZWlnaHRTcGVjaWZpZWQoKSBj b25zdDsKIAotICAgIHZpcnR1YWwgdm9pZCBpbnRyaW5zaWNTaXplQ2hhbmdlZCgpIHsgaW1hZ2VD aGFuZ2VkKG1faW1hZ2VSZXNvdXJjZS0+aW1hZ2VQdHIoKSk7IH0KKyAgICB2aXJ0dWFsIHZvaWQg aW50cmluc2ljU2l6ZUNoYW5nZWQoKQorICAgIHsKKyAgICAgICAgaWYgKG1faW1hZ2VSZXNvdXJj ZSkKKyAgICAgICAgICAgIGltYWdlQ2hhbmdlZChtX2ltYWdlUmVzb3VyY2UtPmltYWdlUHRyKCkp OworICAgIH0KIAogcHJpdmF0ZToKICAgICB2aXJ0dWFsIGNvbnN0IGNoYXIqIHJlbmRlck5hbWUo KSBjb25zdCB7IHJldHVybiAiUmVuZGVySW1hZ2UiOyB9Cg==