Changeset 58629 in webkit

Timestamp:

Apr 30, 2010 10:34:28 PM (14 years ago)

Author:

hamaji@chromium.org

Message:

2010-04-30 Shinichiro Hamaji <​hamaji@chromium.org>

Reviewed by Darin Adler.

Add layoutTestController.setPrinting()
​https://bugs.webkit.org/show_bug.cgi?id=37203

• platform/mac/Skipped:
• platform/mac/printing/media-queries-print-expected.txt:

2010-04-30 Shinichiro Hamaji <​hamaji@chromium.org>

Reviewed by Darin Adler.

Add layoutTestController.setPrinting()
​https://bugs.webkit.org/show_bug.cgi?id=37203

Use the renderer's width insteead of screen's width as the width of
a screen depends on machines.

• rendering/RenderTreeAsText.cpp: (WebCore::externalRepresentation):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/Skipped (modified) (1 diff)
• LayoutTests/platform/mac/printing/media-queries-print-expected.txt (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderTreeAsText.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-04-30  Shinichiro Hamaji  <hamaji@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Add layoutTestController.setPrinting()
+        https://bugs.webkit.org/show_bug.cgi?id=37203
+
+        * platform/mac/Skipped:
+        * platform/mac/printing/media-queries-print-expected.txt:
+
 2010-04-28  Joseph Pecoraro  <joepeck@webkit.org>
 

trunk/LayoutTests/platform/mac/Skipped

@@ -176 +176 @@
 fast/css/font-face-woff.html
 
-# It seems this depends on the size of physical screen?
-printing/media-queries-print.html
-
 # EventSendingController does not send events on areas outside the WebView.
 scrollbars/scrollbar-click-does-not-blur-content.html

trunk/LayoutTests/platform/mac/printing/media-queries-print-expected.txt

@@ -1 @@
-layer at (0,0) size 2400x585
-  RenderView at (0,0) size 2400x585
-layer at (0,0) size 2400x585
-  RenderBlock {HTML} at (0,0) size 2400x585
-    RenderBody {BODY} at (8,8) size 2384x569
+layer at (0,0) size 1000x585
+  RenderView at (0,0) size 1000x585
+layer at (0,0) size 1000x585
+  RenderBlock {HTML} at (0,0) size 1000x585
+    RenderBody {BODY} at (8,8) size 984x569
       RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#008000]
-      RenderBlock (anonymous) at (0,100) size 2384x18
+      RenderBlock (anonymous) at (0,100) size 984x18
         RenderInline {SPAN} at (0,0) size 533x18
           RenderText {#text} at (0,0) size 533x18

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-30  Shinichiro Hamaji  <hamaji@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Add layoutTestController.setPrinting()
+        https://bugs.webkit.org/show_bug.cgi?id=37203
+
+        Use the renderer's width insteead of screen's width as the width of
+        a screen depends on machines.
+
+        * rendering/RenderTreeAsText.cpp:
+        (WebCore::externalRepresentation):
+
 2010-04-30  Joseph Pecoraro  <joepeck@webkit.org>
 

trunk/WebCore/rendering/RenderTreeAsText.cpp

@@ -30 +30 @@
 #include "CharacterNames.h"
 #include "Document.h"
-#include "DOMWindow.h"
 #include "Frame.h"
 #include "FrameView.h"
@@ -46 +45 @@
 #include "RenderView.h"
 #include "RenderWidget.h"
-#include "Screen.h"
 #include "SelectionController.h"
 #include "TextStream.h"
@@ -622 +620 @@
 {
     PrintContext printContext(frame);
-    if (behavior & RenderAsTextPrintingMode)
-        printContext.begin(frame->domWindow()->screen()->width());
+    if (behavior & RenderAsTextPrintingMode) {
+        if (!frame->contentRenderer())
+            return String();
+        printContext.begin(frame->contentRenderer()->width());
+    }
 
     frame->document()->updateLayout();