Changeset 96258 in webkit

Timestamp:

Sep 28, 2011 1:55:50 PM (13 years ago)

Author:

Dimitri Glazkov

Message:

REGRESSION(r95573): Crash when loading SVG documents in a flattened frame or any SVG document in Chromium/Mac.
​https://bugs.webkit.org/show_bug.cgi?id=68938

Source/WebCore:

Reviewed by David Hyatt.

Test: all svg tests in LayoutTests.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::computeBlockPreferredLogicalWidths): Added a null-check for containingBlock.

Tools:

Made Chromium/Mac DRT better match how Chromium/Mac queries WebKit.

Reviewed by David Hyatt.

• DumpRenderTree/chromium/WebViewHost.cpp:

(WebViewHost::didUpdateLayout): Added width/height queries.

• DumpRenderTree/chromium/WebViewHost.h: Updated defs.

LayoutTests:

Reviewed by David Hyatt.

• fast/frames/flattening/crash-svg-document-expected.txt: Added.
• fast/frames/flattening/crash-svg-document.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/frames/flattening/crash-svg-document-expected.txt (added)
• LayoutTests/fast/frames/flattening/crash-svg-document.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (4 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/chromium/WebViewHost.cpp (modified) (1 diff)
• Tools/DumpRenderTree/chromium/WebViewHost.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-28  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        REGRESSION(r95573): Crash when loading SVG documents in a flattened frame or any SVG document in Chromium/Mac.
+        https://bugs.webkit.org/show_bug.cgi?id=68938
+
+        Reviewed by David Hyatt.
+
+        * fast/frames/flattening/crash-svg-document-expected.txt: Added.
+        * fast/frames/flattening/crash-svg-document.html: Added.
+
 2011-09-28 Una Sabovic  <una.sabovic@palm.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-27  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        REGRESSION(r95573): Crash when loading SVG documents in a flattened frame or any SVG document in Chromium/Mac.
+        https://bugs.webkit.org/show_bug.cgi?id=68938
+
+        Reviewed by David Hyatt.
+
+        Test: all svg tests in LayoutTests.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::computeBlockPreferredLogicalWidths): Added a null-check for containingBlock.
+
 2011-09-28  Una Sabovic  <una.sabovic@palm.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -4888 +4888 @@
     float inlineMin = 0;
 
-    LayoutUnit cw = containingBlock()->contentLogicalWidth();
+    RenderBlock* containingBlock = this->containingBlock();
+    LayoutUnit cw = containingBlock ? containingBlock->contentLogicalWidth() : 0;
 
     // If we are at the start of a line, we want to ignore all white-space.
@@ -5153 +5154 @@
 
     RenderObject *child = firstChild();
+    RenderBlock* containingBlock = this->containingBlock();
     LayoutUnit floatLeftWidth = 0, floatRightWidth = 0;
     while (child) {
@@ -5201 +5203 @@
                 // margins of the object.  For negative margins, we will attempt to overlap the float if the negative margin
                 // is smaller than the float width.
-                bool ltr = containingBlock()->style()->isLeftToRightDirection();
+                bool ltr = containingBlock ? containingBlock->style()->isLeftToRightDirection() : style()->isLeftToRightDirection();
                 LayoutUnit marginLogicalLeft = ltr ? marginStart : marginEnd;
                 LayoutUnit marginLogicalRight = ltr ? marginEnd : marginStart;
@@ -5235 +5237 @@
         // We can achieve this effect by making the maxwidth of blocks that contain tables
         // with percentage widths be infinite (as long as they are not inside a table cell).
-        if (document()->inQuirksMode() && child->style()->logicalWidth().isPercent() &&
-            !isTableCell() && child->isTable() && m_maxPreferredLogicalWidth < BLOCK_MAX_WIDTH) {
-            RenderBlock* cb = containingBlock();
+        if (containingBlock && document()->inQuirksMode() && child->style()->logicalWidth().isPercent()
+            && !isTableCell() && child->isTable() && m_maxPreferredLogicalWidth < BLOCK_MAX_WIDTH) {
+            RenderBlock* cb = containingBlock;
             while (!cb->isRenderView() && !cb->isTableCell())
                 cb = cb->containingBlock();

trunk/Tools/ChangeLog

@@ +1 @@
+2011-09-27  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        REGRESSION(r95573): Crash when loading SVG documents in a flattened frame or any SVG document in Chromium/Mac.
+        https://bugs.webkit.org/show_bug.cgi?id=68938
+
+        Made Chromium/Mac DRT better match how Chromium/Mac queries WebKit.
+
+        Reviewed by David Hyatt.
+
+        * DumpRenderTree/chromium/WebViewHost.cpp:
+        (WebViewHost::didUpdateLayout): Added width/height queries.
+        * DumpRenderTree/chromium/WebViewHost.h: Updated defs.
+
 2011-09-28  Mihai Parparita  <mihaip@chromium.org>
 

trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp

@@ -795 +795 @@
 }
 
+void WebViewHost::didUpdateLayout(WebFrame*)
+{
+#if OS(MAC_OS_X)
+    static bool queryingPreferredSize = false;
+    if (queryingPreferredSize)
+        return;
+
+    queryingPreferredSize = true;
+    // Query preferred width to emulate the same functionality in Chromium:
+    // see RenderView::CheckPreferredSize (src/content/renderer/render_view.cc)
+    // and TabContentsViewMac::RenderViewCreated (src/chrome/browser/tab_contents/tab_contents_view_mac.mm)
+    webView()->mainFrame()->contentsPreferredWidth();
+    webView()->mainFrame()->documentElementScrollHeight();
+    queryingPreferredSize = false;
+#endif
+}
+
+
 void WebViewHost::loadURLExternally(WebFrame* frame, const WebURLRequest& request, WebNavigationPolicy policy)
 {

trunk/Tools/DumpRenderTree/chromium/WebViewHost.h

@@ -172 +172 @@
     virtual WebKit::WebMediaPlayer* createMediaPlayer(WebKit::WebFrame*, WebKit::WebMediaPlayerClient*);
     virtual WebKit::WebApplicationCacheHost* createApplicationCacheHost(WebKit::WebFrame*, WebKit::WebApplicationCacheHostClient*);
+    virtual void didUpdateLayout(WebKit::WebFrame*);
     virtual void loadURLExternally(WebKit::WebFrame*, const WebKit::WebURLRequest&, WebKit::WebNavigationPolicy);
     virtual void loadURLExternally(WebKit::WebFrame*, const WebKit::WebURLRequest&, WebKit::WebNavigationPolicy, const WebKit::WebString& downloadName);