Attachment 121333 Details for Bug 50312 – Patch

[patch] Patch

bug-50312-20120105144455.patch (text/plain), 3.91 KB, created by Eric Seidel (no email) on 2012-01-05 14:44:56 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Seidel (no email)

Created: 2012-01-05 14:44:56 PST

Size: 3.91 KB

patch

obsolete

>Subversion Revision: 104060
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 3302450a25e0b1c5c589051e128b44ed5b94c8ea..9e31c52e8f31af6661d2ff195fa76ed0420f02d2 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2012-01-05  Eric Seidel  <eric@webkit.org>
>+
>+        Assertion failure in WebCore::HTMLFrameElementBase::insertedIntoDocument()
>+        https://bugs.webkit.org/show_bug.cgi?id=50312
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Remove the ASSERT, and corresponding lazyAttach.  I believe this
>+        lazyAttach is unecessary now.
>+
>+        Test: fast/frames/assert-on-insertedIntoDocument.html
>+
>+        * html/HTMLFrameElementBase.cpp:
>+        (WebCore::HTMLFrameElementBase::insertedIntoDocument):
>+
> 2012-01-03  Antti Koivisto  <antti@apple.com>
> 
>         Reviewed by Dave Hyatt.
>diff --git a/Source/WebCore/html/HTMLFrameElementBase.cpp b/Source/WebCore/html/HTMLFrameElementBase.cpp
>index f5d22a418d19fb64d1ec5d79c595e79ce95b18ea..e0ab6a3a6aa3af76c56e0fcddc58e7de15fa0813 100644
>--- a/Source/WebCore/html/HTMLFrameElementBase.cpp
>+++ b/Source/WebCore/html/HTMLFrameElementBase.cpp
>@@ -201,16 +201,6 @@ void HTMLFrameElementBase::insertedIntoDocument()
>     if (!document()->frame())
>         return;
> 
>-    // Loads may cause synchronous javascript execution (e.g. beforeload or
>-    // src=javascript), which could try to access the renderer before the normal
>-    // parser machinery would call lazyAttach() and set us as needing style
>-    // resolve.  Any code which expects this to be attached will resolve style
>-    // before using renderer(), so this will make sure we attach in time.
>-    // FIXME: Normally lazyAttach marks the renderer as attached(), but we don't
>-    // want to do that here, as as callers expect to call attach() right after
>-    // this and attach() will ASSERT(!attached())
>-    ASSERT(!renderer()); // This recalc is unecessary if we already have a renderer.
>-    lazyAttach(DoNotSetAttached);
>     setNameAndOpenURL();
> }
> 
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index e5281674e6168d404c2e990da607b26495076cb2..d03ad9825bae1093fb294f84bc8f942e847defa9 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,13 @@
>+2012-01-05  Eric Seidel  <eric@webkit.org>
>+
>+        Assertion failure in WebCore::HTMLFrameElementBase::insertedIntoDocument()
>+        https://bugs.webkit.org/show_bug.cgi?id=50312
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * fast/frames/assert-on-insertedIntoDocument-expected.txt: Added.
>+        * fast/frames/assert-on-insertedIntoDocument.html: Added.
>+
> 2012-01-04  Alpha Lam  <hclam@chromium.org>
> 
>         Not reviewed. Update Chromium port test expectations.
>diff --git a/LayoutTests/fast/frames/assert-on-insertedIntoDocument-expected.txt b/LayoutTests/fast/frames/assert-on-insertedIntoDocument-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..780e9f5b58bafe9b66ce2cfc22b9ef7f7eb477a4
>--- /dev/null
>+++ b/LayoutTests/fast/frames/assert-on-insertedIntoDocument-expected.txt
>@@ -0,0 +1,2 @@
>+
>+PASS - this test did not ASSERT in debug mode.
>diff --git a/LayoutTests/fast/frames/assert-on-insertedIntoDocument.html b/LayoutTests/fast/frames/assert-on-insertedIntoDocument.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..eda9ce15d23af489f04e0ae2ef260948f179ef6b
>--- /dev/null
>+++ b/LayoutTests/fast/frames/assert-on-insertedIntoDocument.html
>@@ -0,0 +1,14 @@
>+<body>
>+<script>
>+if (window.layoutTestController)
>+    layoutTestController.dumpAsText();
>+
>+var subtree = document.createElement('div');
>+var styleElement = document.createElement('style');
>+styleElement.textContent = "iframe { border: 3px solid blue; }";
>+subtree.appendChild(styleElement);
>+subtree.appendChild(document.createElement('iframe'));
>+document.body.appendChild(subtree);
>+</script>
>+<div>PASS - this test did not ASSERT in debug mode.</div>
>+</body>
>\ No newline at end of file

Actions: View | Formatted Diff | Diff

Attachments on bug 50312: 75255 | 121333 | 123156