Changeset 56454 in webkit

Timestamp:

Mar 24, 2010 1:38:05 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-24 Hayato Ito <​hayato@chromium.org>

Reviewed by NOBODY (Need!).

Refactor computePageRects so that Mac can make use of it.
​https://bugs.webkit.org/show_bug.cgi?id=36159

Refactoring only, so no new tests.

• WebCore.base.exp:
• page/PrintContext.cpp: (WebCore::PrintContext::computePageRects): (WebCore::PrintContext::computePageRectsWithPageSize): (WebCore::PrintContext::computePageRectsWithPageSizeInternal): (WebCore::PrintContext::pageNumberForElement): (WebCore::PrintContext::numberOfPages):
• page/PrintContext.h:

2010-03-24 Hayato Ito <​hayato@chromium.org>

Reviewed by Shinichiro Hamaji.

Refactor computePageRects so that Mac can make use of it.
​https://bugs.webkit.org/show_bug.cgi?id=36159

Refactoring only, so no new tests.

• WebView/WebFrame.mm: (-[WebFrame _computePageRectsWithPrintWidthScaleFactor:printHeight:]):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.base.exp (modified) (1 diff)
• WebCore/page/PrintContext.cpp (modified) (6 diffs)
• WebCore/page/PrintContext.h (modified) (2 diffs)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebFrame.mm (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-24  Hayato Ito  <hayato@chromium.org>
+
+        Reviewed by NOBODY (Need!).
+
+        Refactor computePageRects so that Mac can make use of it.
+        https://bugs.webkit.org/show_bug.cgi?id=36159
+
+        Refactoring only, so no new tests.
+
+        * WebCore.base.exp:
+        * page/PrintContext.cpp:
+        (WebCore::PrintContext::computePageRects):
+        (WebCore::PrintContext::computePageRectsWithPageSize):
+        (WebCore::PrintContext::computePageRectsWithPageSizeInternal):
+        (WebCore::PrintContext::pageNumberForElement):
+        (WebCore::PrintContext::numberOfPages):
+        * page/PrintContext.h:
+
 2010-03-24  Jeremy Moskovich  <jeremy@chromium.org>
 

trunk/WebCore/WebCore.base.exp

@@ -253 +253 @@
 __ZN7WebCore12PrintContext13numberOfPagesEPNS_5FrameERKNS_9FloatSizeE
 __ZN7WebCore12PrintContext20pageNumberForElementEPNS_7ElementERKNS_9FloatSizeE
+__ZN7WebCore12PrintContext28computePageRectsWithPageSizeERKNS_9FloatSizeEb
+__ZN7WebCore12PrintContextC1EPNS_5FrameE
+__ZN7WebCore12PrintContextD1Ev
 __ZN7WebCore12RenderObject16repaintRectangleERKNS_7IntRectEb
 __ZN7WebCore12RenderWidget19showSubstituteImageEN3WTF10PassRefPtrINS_5ImageEEE

trunk/WebCore/page/PrintContext.cpp

@@ -59 +59 @@
         return;
 
+    if (userScaleFactor <= 0) {
+        LOG_ERROR("userScaleFactor has bad value %.2f", userScaleFactor);
+        return;
+    }
+
     RenderView* root = toRenderView(m_frame->document()->renderer());
-
-    if (!root) {
-        LOG_ERROR("document to be printed has no renderer");
-        return;
-    }
 
     float ratio = printRect.height() / printRect.width();
@@ -70 +70 @@
     float pageWidth  = (float)root->rightLayoutOverflow();
     float pageHeight = pageWidth * ratio;
-    outPageHeight = pageHeight;   // this is the height of the page adjusted by margins
+    outPageHeight = pageHeight; // this is the height of the page adjusted by margins
     pageHeight -= headerHeight + footerHeight;
 
@@ -78 +78 @@
     }
 
-    computePageRectsWithPageSize(FloatSize(pageWidth, pageHeight), userScaleFactor);
-}
-
-void PrintContext::computePageRectsWithPageSize(const FloatSize& pageSizeInPixels, float userScaleFactor)
-{
+    computePageRectsWithPageSizeInternal(FloatSize(pageWidth / userScaleFactor, pageHeight / userScaleFactor), false);
+}
+
+void PrintContext::computePageRectsWithPageSize(const FloatSize& pageSizeInPixels, bool allowHorizontalMultiPages)
+{
+    m_pageRects.clear();
+    computePageRectsWithPageSizeInternal(pageSizeInPixels, allowHorizontalMultiPages);
+}
+
+void PrintContext::computePageRectsWithPageSizeInternal(const FloatSize& pageSizeInPixels, bool allowHorizontalMultiPages)
+{
+    if (!m_frame->document() || !m_frame->view() || !m_frame->document()->renderer())
+        return;
     RenderView* root = toRenderView(m_frame->document()->renderer());
 
-    if (!root) {
-        LOG_ERROR("document to be printed has no renderer");
-        return;
-    }
-
-    if (userScaleFactor <= 0) {
-        LOG_ERROR("userScaleFactor has bad value %.2f", userScaleFactor);
-        return;
-    }
-
-    float currPageHeight = pageSizeInPixels.height() / userScaleFactor;
-    float docHeight = root->layer()->height();
-    float currPageWidth = pageSizeInPixels.width() / userScaleFactor;
+    const float pageWidth = pageSizeInPixels.width();
+    const float docWidth = root->layer()->width();
+    const float docHeight = root->layer()->height();
+    float currPageHeight = pageSizeInPixels.height();
 
     // always return at least one page, since empty files should print a blank page
@@ -105 +104 @@
         m_frame->view()->adjustPageHeight(&proposedBottom, printedPagesHeight, proposedBottom, printedPagesHeight);
         currPageHeight = max(1.0f, proposedBottom - printedPagesHeight);
-
-        m_pageRects.append(IntRect(0, (int)printedPagesHeight, (int)currPageWidth, (int)currPageHeight));
+        if (allowHorizontalMultiPages) {
+            for (float curWidth = 0; curWidth < docWidth; curWidth += pageWidth)
+                m_pageRects.append(IntRect(curWidth, (int)printedPagesHeight, (int)pageWidth, (int)currPageHeight));
+        } else
+            m_pageRects.append(IntRect(0, (int)printedPagesHeight, (int)pageWidth, (int)currPageHeight));
         printedPagesHeight += currPageHeight;
     } while (printedPagesHeight < docHeight);
@@ -176 +178 @@
     PrintContext printContext(frame);
     printContext.begin(pageRect.width());
-    printContext.computePageRectsWithPageSize(pageSizeInPixels, 1);
+    printContext.computePageRectsWithPageSize(pageSizeInPixels, false);
 
     int top = box->offsetTop();
@@ -197 +199 @@
     PrintContext printContext(frame);
     printContext.begin(pageRect.width());
-    printContext.computePageRectsWithPageSize(pageSizeInPixels, 1);
+    printContext.computePageRectsWithPageSize(pageSizeInPixels, false);
     printContext.end();
     return printContext.pageCount();

trunk/WebCore/page/PrintContext.h

@@ -43 +43 @@
 
     void computePageRects(const FloatRect& printRect, float headerHeight, float footerHeight, float userScaleFactor, float& outPageHeight);
+    void computePageRectsWithPageSize(const FloatSize& pageSizeInPixels, bool allowHorizontalMultiPages);
 
     // TODO: eliminate width param
@@ -57 +58 @@
 
 protected:
-    void computePageRectsWithPageSize(const FloatSize& pageSizeInPixels, float userScaleFactor);
-
     Frame* m_frame;
     Vector<IntRect> m_pageRects;
+
+private:
+    void computePageRectsWithPageSizeInternal(const FloatSize& pageSizeInPixels, bool allowHorizontalMultiPages);
 };
 

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2010-03-24  Hayato Ito  <hayato@chromium.org>
+
+        Reviewed by Shinichiro Hamaji.
+
+        Refactor computePageRects so that Mac can make use of it.
+        https://bugs.webkit.org/show_bug.cgi?id=36159
+
+        Refactoring only, so no new tests.
+
+        * WebView/WebFrame.mm:
+        (-[WebFrame _computePageRectsWithPrintWidthScaleFactor:printHeight:]):
+
 2010-03-24  Kent Tamura  <tkent@chromium.org>
 

trunk/WebKit/mac/WebView/WebFrame.mm

@@ -75 +75 @@
 #import <WebCore/Page.h>
 #import <WebCore/PluginData.h>
+#import <WebCore/PrintContext.h>
 #import <WebCore/RenderLayer.h>
 #import <WebCore/RenderPart.h>
@@ -583 +584 @@
         return pages;
 
-    float currPageHeight = printHeight;
-    float docHeight = root->layer()->height();
     float docWidth = root->layer()->width();
-    float printWidth = docWidth/printWidthScaleFactor;
-    
-    // We need to give the part the opportunity to adjust the page height at each step.
-    for (float i = 0; i < docHeight; i += currPageHeight) {
-        float proposedBottom = min(docHeight, i + printHeight);
-        view->adjustPageHeight(&proposedBottom, i, proposedBottom, i);
-        currPageHeight = max(1.0f, proposedBottom - i);
-        for (float j = 0; j < docWidth; j += printWidth) {
-            NSValue* val = [NSValue valueWithRect: NSMakeRect(j, i, printWidth, currPageHeight)];
-            [pages addObject: val];
-        }
-    }
-    
+    float printWidth = docWidth / printWidthScaleFactor;
+
+    PrintContext printContext(_private->coreFrame);
+    printContext.computePageRectsWithPageSize(FloatSize(printWidth, printHeight), true);
+
+    const Vector<IntRect>& pageRects = printContext.pageRects();
+    const size_t pageCount = pageRects.size();
+    for (size_t pageNumber = 0; pageNumber < pageCount; ++pageNumber)
+        [pages addObject: [NSValue valueWithRect: NSRect(pageRects[pageNumber])]];
     return pages;
 }