Changeset 172518 in webkit

Timestamp:

Aug 13, 2014, 4:20:44 AM (11 years ago)

Author:

Antti Koivisto

Message:

Don't recurse into non-rendered subtrees when computing style
​https://bugs.webkit.org/show_bug.cgi?id=135844

Reviewed by Andreas Kling.

Rebase.

• http/tests/security/video-poster-cross-origin-crash-expected.txt:
• platform/mac/fast/ruby/ruby-base-merge-block-children-crash-2-expected.txt:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• http/tests/security/video-poster-cross-origin-crash-expected.txt (modified) (1 diff)
• platform/mac/fast/ruby/ruby-base-merge-block-children-crash-2-expected.txt (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-08-13  Antti Koivisto  <antti@apple.com>
+
+        Don't recurse into non-rendered subtrees when computing style
+        https://bugs.webkit.org/show_bug.cgi?id=135844
+
+        Reviewed by Andreas Kling.
+        
+        Rebase.
+
+        * http/tests/security/video-poster-cross-origin-crash-expected.txt:
+        * platform/mac/fast/ruby/ruby-base-merge-block-children-crash-2-expected.txt:
+
 2014-08-11  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/LayoutTests/http/tests/security/video-poster-cross-origin-crash-expected.txt

@@ -1 @@
-CONSOLE MESSAGE: Cross-origin image load denied by Cross-Origin Resource Sharing policy.
 CONSOLE MESSAGE: Cross-origin image load denied by Cross-Origin Resource Sharing policy.
 >>>

trunk/LayoutTests/platform/mac/fast/ruby/ruby-base-merge-block-children-crash-2-expected.txt

@@ -5 +5 @@
     RenderBody {BODY} at (8,8) size 784x584
       RenderBlock {SUMMARY} at (0,0) size 784x184
-        RenderInline {I} at (0,0) size 304x18
+        RenderInline {I} at (0,0) size 604x18
           RenderRuby (inline) {RUBY} at (0,0) size 300x18
             RenderRubyRun (anonymous) at (0,171) size 0x0
@@ -21 +21 @@
           RenderText {#text} at (300,157) size 4x18
             text run at (300,157) width 4: " "
-        RenderEmbeddedObject {OBJECT} at (304,21) size 300x150
+          RenderEmbeddedObject {OBJECT} at (304,21) size 300x150
         RenderText {#text} at (0,0) size 0x0
       RenderBlock {DIV} at (0,184) size 784x18
@@ -30 +30 @@
           text run at (138,0) width 455: ". This test must be run under Guard Malloc. It passes if it does not crash."
 selection start: position 0 of child 1 {OBJECT} of child 3 {H1} of child 0 {RUBY} of child 1 {I} of child 0 {SUMMARY} of body
-selection end:   position 0 of child 3 {#text} of child 0 {SUMMARY} of body
+selection end:   position 1 of child 2 {OBJECT} of child 1 {I} of child 0 {SUMMARY} of body