Changeset 101574 in webkit

Timestamp:

Nov 30, 2011 5:14:25 PM (12 years ago)

Author:

mitz@apple.com

Message:

Source/WebCore: WebCore part of: Allow the length of a page along the pagination axis to differ from the length of the view
​https://bugs.webkit.org/show_bug.cgi?id=73476

Reviewed by Anders Carlsson.

• page/Page.cpp:

(WebCore::Page::setPagination): Changed to use Pagination::operator==.

• page/Page.h:

(WebCore::Page::Pagination::Pagination): Added initializer for the new pageLength member variable.
(WebCore::Page::Pagination::operator==): Added.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::layoutColumns): Narrowed the scope of a local variable.

• rendering/RenderBlock.h: Promoted setDesiredColumnCountAndWidth() from private to protected,

allowing its use from RenderView::calcColumnWidth(). Made calcColumnWidth() virtual.

• rendering/RenderView.cpp:

(WebCore::RenderView::calcColumnWidth): Added. Uses the page length specified in the pagination
parameters to set the column width, if pages are to be laid out one next to the other.
(WebCore::RenderView::viewLogicalHeight): Added. Uses the page length specified in the pagination
parameters as the height, if pages are to be laid out one after the other.

• rendering/RenderView.h:

Source/WebKit/mac: WebKit/mac part of: Allow the length of a page along the pagination axis to differ from the length of the view
​https://bugs.webkit.org/show_bug.cgi?id=73476

Reviewed by Anders Carlsson.

• WebView/WebView.mm:

(-[WebView _setPageLength:]): Added this accessor.
(-[WebView _pageLength]): Ditto.

• WebView/WebViewPrivate.h:

Source/WebKit2: WebKit2 part of: Allow the length of a page along the pagination axis to differ from the length of the view
​https://bugs.webkit.org/show_bug.cgi?id=73476

Reviewed by Anders Carlsson.

• Shared/WebPageCreationParameters.cpp:

(WebKit::WebPageCreationParameters::encode): Encode pageLength.
(WebKit::WebPageCreationParameters::decode): Decode pageLength.

• Shared/WebPageCreationParameters.h: Added pageLength.
• UIProcess/API/C/WKPage.cpp:

(WKPageSetPageLength): Added this accessor.
(WKPageGetPageLength): Ditto.

• UIProcess/API/C/WKPagePrivate.h:
• UIProcess/API/mac/WKBrowsingContextController.mm:

(-[WKBrowsingContextController setPageLength:]): Ditto.
(-[WKBrowsingContextController pageLength]): Ditto.

• UIProcess/API/mac/WKBrowsingContextControllerPrivate.h:
• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::WebPageProxy): Added initializer for m_pageLength.
(WebKit::WebPageProxy::setPageLength): Added.
(WebKit::WebPageProxy::creationParameters): Initialize pageLength.

• UIProcess/WebPageProxy.h:

(WebKit::WebPageProxy::pageLength): Added.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::WebPage): Set the page length based on the creation parameters.
(WebKit::WebPage::setPageLength): Added.

• WebProcess/WebPage/WebPage.h:
• WebProcess/WebPage/WebPage.messages.in: Added SetPageLength.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/Page.cpp (modified) (1 diff)
• WebCore/page/Page.h (modified) (1 diff)
• WebCore/rendering/RenderBlock.cpp (modified) (1 diff)
• WebCore/rendering/RenderBlock.h (modified) (3 diffs)
• WebCore/rendering/RenderView.cpp (modified) (2 diffs)
• WebCore/rendering/RenderView.h (modified) (2 diffs)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebView.mm (modified) (1 diff)
• WebKit/mac/WebView/WebViewPrivate.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/WebPageCreationParameters.cpp (modified) (2 diffs)
• WebKit2/Shared/WebPageCreationParameters.h (modified) (1 diff)
• WebKit2/UIProcess/API/C/WKPage.cpp (modified) (1 diff)
• WebKit2/UIProcess/API/C/WKPagePrivate.h (modified) (1 diff)
• WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm (modified) (1 diff)
• WebKit2/UIProcess/API/mac/WKBrowsingContextControllerPrivate.h (modified) (1 diff)
• WebKit2/UIProcess/WebPageProxy.cpp (modified) (3 diffs)
• WebKit2/UIProcess/WebPageProxy.h (modified) (2 diffs)
• WebKit2/WebProcess/WebPage/WebPage.cpp (modified) (2 diffs)
• WebKit2/WebProcess/WebPage/WebPage.h (modified) (1 diff)
• WebKit2/WebProcess/WebPage/WebPage.messages.in (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-30  Dan Bernstein  <mitz@apple.com>
+
+        WebCore part of: Allow the length of a page along the pagination axis to differ from the length of the view
+        https://bugs.webkit.org/show_bug.cgi?id=73476
+
+        Reviewed by Anders Carlsson.
+
+        * page/Page.cpp:
+        (WebCore::Page::setPagination): Changed to use Pagination::operator==.
+        * page/Page.h:
+        (WebCore::Page::Pagination::Pagination): Added initializer for the new pageLength member variable.
+        (WebCore::Page::Pagination::operator==): Added.
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::layoutColumns): Narrowed the scope of a local variable.
+        * rendering/RenderBlock.h: Promoted setDesiredColumnCountAndWidth() from private to protected,
+        allowing its use from RenderView::calcColumnWidth(). Made calcColumnWidth() virtual.
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::calcColumnWidth): Added. Uses the page length specified in the pagination
+        parameters to set the column width, if pages are to be laid out one next to the other.
+        (WebCore::RenderView::viewLogicalHeight): Added. Uses the page length specified in the pagination
+        parameters as the height, if pages are to be laid out one after the other.
+        * rendering/RenderView.h:
+
 2011-11-30  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebCore/page/Page.cpp

@@ -678 +678 @@
 void Page::setPagination(const Pagination& pagination)
 {
-    if (m_pagination.mode == pagination.mode && m_pagination.gap == pagination.gap)
+    if (m_pagination == pagination)
         return;
 

trunk/Source/WebCore/page/Page.h

@@ -262 +262 @@
             Pagination()
                 : mode(Unpaginated)
+                , pageLength(0)
                 , gap(0)
             {
             };
 
+            bool operator==(const Pagination& other) const
+            {
+                return mode == other.mode && pageLength == other.pageLength && gap == other.gap;
+            }
+
             Mode mode;
+            unsigned pageLength;
             unsigned gap;
         };

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -4620 +4620 @@
     // the distance between forced page breaks is so that we can avoid making the minimum column height too tall.
     ColumnInfo* colInfo = columnInfo();
-    int desiredColumnCount = colInfo->desiredColumnCount();
     if (!hasSpecifiedPageLogicalHeight) {
         LayoutUnit columnHeight = pageLogicalHeight;
         int minColumnCount = colInfo->forcedBreaks() + 1;
+        int desiredColumnCount = colInfo->desiredColumnCount();
         if (minColumnCount >= desiredColumnCount) {
             // The forced page breaks are in control of the balancing.  Just set the column height to the

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -415 +415 @@
     void simplifiedNormalFlowLayout();
 
+    void setDesiredColumnCountAndWidth(int, LayoutUnit);
+
     void computeOverflow(LayoutUnit oldClientAfterEdge, bool recomputeFloats = false);
     virtual void addOverflowFromChildren();
@@ -751 +753 @@
     LayoutUnit desiredColumnWidth() const;
     unsigned desiredColumnCount() const;
-    void setDesiredColumnCountAndWidth(int count, LayoutUnit width);
 
     void paintContinuationOutlines(PaintInfo&, const LayoutPoint&);
@@ -770 +771 @@
     void offsetForContents(LayoutPoint&) const;
 
-    void calcColumnWidth();
+    virtual void calcColumnWidth();
     bool layoutColumns(bool hasSpecifiedPageLogicalHeight, LayoutUnit pageLogicalHeight, LayoutStateMaintainer&);
     void makeChildrenAnonymousColumnBlocks(RenderObject* beforeChild, RenderBlock* newBlockBox, RenderObject* newChild);

trunk/Source/WebCore/rendering/RenderView.cpp

@@ -186 +186 @@
 }
 
+void RenderView::calcColumnWidth()
+{
+    int columnWidth = contentLogicalWidth();
+    if (m_frameView && style()->hasInlineColumnAxis()) {
+        if (Frame* frame = m_frameView->frame()) {
+            if (Page* page = frame->page()) {
+                if (int pageLength = page->pagination().pageLength)
+                    columnWidth = pageLength;
+            }
+        }
+    }
+    setDesiredColumnCountAndWidth(1, columnWidth);
+}
+
 void RenderView::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
@@ -735 +749 @@
 }
 
+int RenderView::viewLogicalHeight() const
+{
+    int height = style()->isHorizontalWritingMode() ? viewHeight() : viewWidth();
+
+    if (hasColumns() && !style()->hasInlineColumnAxis()) {
+        if (Frame* frame = m_frameView->frame()) {
+            if (Page* page = frame->page()) {
+                if (frame == page->mainFrame()) {
+                    if (int pageLength = page->pagination().pageLength)
+                        height = pageLength;
+                }
+            }
+        }
+    }
+
+    return height;
+}
+
 float RenderView::zoomFactor() const
 {

trunk/Source/WebCore/rendering/RenderView.h

@@ -62 +62 @@
     int viewWidth() const;
     int viewLogicalWidth() const { return style()->isHorizontalWritingMode() ? viewWidth() : viewHeight(); }
-    int viewLogicalHeight() const { return style()->isHorizontalWritingMode() ? viewHeight() : viewWidth(); }
+    int viewLogicalHeight() const;
 
     float zoomFactor() const;
@@ -195 +195 @@
 
 private:
+    virtual void calcColumnWidth() OVERRIDE;
+
     bool shouldRepaint(const IntRect& r) const;
 

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2011-11-30  Dan Bernstein  <mitz@apple.com>
+
+        WebKit/mac part of: Allow the length of a page along the pagination axis to differ from the length of the view
+        https://bugs.webkit.org/show_bug.cgi?id=73476
+
+        Reviewed by Anders Carlsson.
+
+        * WebView/WebView.mm:
+        (-[WebView _setPageLength:]): Added this accessor.
+        (-[WebView _pageLength]): Ditto.
+        * WebView/WebViewPrivate.h:
+
 2011-11-30  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -2779 +2779 @@
 }
 
+- (void)_setPageLength:(CGFloat)pageLength
+{
+    Page* page = core(self);
+    if (!page)
+        return;
+
+    Page::Pagination pagination = page->pagination();
+    pagination.pageLength = pageLength;
+
+    page->setPagination(pagination);
+}
+
+- (CGFloat)_pageLength
+{
+    Page* page = core(self);
+    if (!page)
+        return 1;
+
+    return page->pagination().pageLength;
+}
+
 - (void)_setGapBetweenPages:(CGFloat)pageGap
 {

trunk/Source/WebKit/mac/WebView/WebViewPrivate.h

@@ -564 +564 @@
 - (void)_setPaginationMode:(WebPaginationMode)paginationMode;
 - (WebPaginationMode)_paginationMode;
+// Set to 0 to have the page length equal the view length.
+- (void)_setPageLength:(CGFloat)pageLength;
+- (CGFloat)_pageLength;
 - (void)_setGapBetweenPages:(CGFloat)pageGap;
 - (CGFloat)_gapBetweenPages;

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-11-30  Dan Bernstein  <mitz@apple.com>
+
+        WebKit2 part of: Allow the length of a page along the pagination axis to differ from the length of the view
+        https://bugs.webkit.org/show_bug.cgi?id=73476
+
+        Reviewed by Anders Carlsson.
+
+        * Shared/WebPageCreationParameters.cpp:
+        (WebKit::WebPageCreationParameters::encode): Encode pageLength.
+        (WebKit::WebPageCreationParameters::decode): Decode pageLength.
+        * Shared/WebPageCreationParameters.h: Added pageLength.
+        * UIProcess/API/C/WKPage.cpp:
+        (WKPageSetPageLength): Added this accessor.
+        (WKPageGetPageLength): Ditto.
+        * UIProcess/API/C/WKPagePrivate.h:
+        * UIProcess/API/mac/WKBrowsingContextController.mm:
+        (-[WKBrowsingContextController setPageLength:]): Ditto.
+        (-[WKBrowsingContextController pageLength]): Ditto.
+        * UIProcess/API/mac/WKBrowsingContextControllerPrivate.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::WebPageProxy): Added initializer for m_pageLength.
+        (WebKit::WebPageProxy::setPageLength): Added.
+        (WebKit::WebPageProxy::creationParameters): Initialize pageLength.
+        * UIProcess/WebPageProxy.h:
+        (WebKit::WebPageProxy::pageLength): Added.
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::WebPage): Set the page length based on the creation parameters.
+        (WebKit::WebPage::setPageLength): Added.
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/WebPage.messages.in: Added SetPageLength.
+
 2011-11-30  Alejandro G. Castro  <alex@igalia.com>
 

trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp

@@ -48 +48 @@
     encoder->encode(fixedLayoutSize);
     encoder->encodeEnum(paginationMode);
+    encoder->encode(pageLength);
     encoder->encode(gapBetweenPages);
     encoder->encode(userAgent);
@@ -95 +96 @@
     if (!decoder->decodeEnum(parameters.paginationMode))
         return false;
+    if (!decoder->decode(parameters.pageLength))
+        return false;
     if (!decoder->decode(parameters.gapBetweenPages))
         return false;

trunk/Source/WebKit2/Shared/WebPageCreationParameters.h

@@ -65 +65 @@
 
     WebCore::Page::Pagination::Mode paginationMode;
+    double pageLength;
     double gapBetweenPages;
 

trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp

@@ -380 +380 @@
 }
 
+void WKPageSetPageLength(WKPageRef pageRef, double pageLength)
+{
+    toImpl(pageRef)->setPageLength(pageLength);
+}
+
+double WKPageGetPageLength(WKPageRef pageRef)
+{
+    return toImpl(pageRef)->pageLength();
+}
+
 void WKPageSetGapBetweenPages(WKPageRef pageRef, double gap)
 {

trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h

@@ -62 +62 @@
 WK_EXPORT void WKPageSetPaginationMode(WKPageRef page, WKPaginationMode paginationMode);
 WK_EXPORT WKPaginationMode WKPageGetPaginationMode(WKPageRef page);
+WK_EXPORT void WKPageSetPageLength(WKPageRef page, double pagesPerView);
+WK_EXPORT double WKPageGetPageLength(WKPageRef page);
 WK_EXPORT void WKPageSetGapBetweenPages(WKPageRef page, double gap);
 WK_EXPORT double WKPageGetGapBetweenPages(WKPageRef page);

trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm

@@ -235 +235 @@
 }
 
+- (void)setPageLength:(CGFloat)pageLength
+{
+    WKPageSetPageLength(self.pageRef, pageLength);
+}
+
+- (CGFloat)pageLength
+{
+    return WKPageGetPageLength(self.pageRef);
+}
+
 - (void)setGapBetweenPages:(CGFloat)gapBetweenPages
 {

trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextControllerPrivate.h

@@ -36 +36 @@
 
 @property WKBrowsingContextPaginationMode paginationMode;
+// Set to 0 to have the page length equal the view length.
+@property CGFloat pageLength;
 @property CGFloat gapBetweenPages;
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -162 +162 @@
     , m_useFixedLayout(false)
     , m_paginationMode(Page::Pagination::Unpaginated)
+    , m_pageLength(0)
     , m_gapBetweenPages(0)
     , m_isValid(true)
@@ -1297 +1298 @@
 }
 
+void WebPageProxy::setPageLength(double pageLength)
+{
+    if (pageLength == m_pageLength)
+        return;
+
+    m_pageLength = pageLength;
+
+    if (!isValid())
+        return;
+    process()->send(Messages::WebPage::SetPageLength(pageLength), m_pageID);
+}
+
 void WebPageProxy::setGapBetweenPages(double gap)
 {
@@ -3192 +3205 @@
     parameters.fixedLayoutSize = m_fixedLayoutSize;
     parameters.paginationMode = m_paginationMode;
+    parameters.pageLength = m_pageLength;
     parameters.gapBetweenPages = m_gapBetweenPages;
     parameters.userAgent = userAgent();

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -416 +416 @@
     void setPaginationMode(WebCore::Page::Pagination::Mode);
     WebCore::Page::Pagination::Mode paginationMode() const { return m_paginationMode; }
+    void setPageLength(double);
+    double pageLength() const { return m_pageLength; }
     void setGapBetweenPages(double);
     double gapBetweenPages() const { return m_gapBetweenPages; }
@@ -901 +903 @@
 
     WebCore::Page::Pagination::Mode m_paginationMode;
+    double m_pageLength;
     double m_gapBetweenPages;
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -250 +250 @@
 
     setPaginationMode(parameters.paginationMode);
+    setPageLength(parameters.pageLength);
     setGapBetweenPages(parameters.gapBetweenPages);
 
@@ -932 +933 @@
     Page::Pagination pagination = m_page->pagination();
     pagination.mode = static_cast<Page::Pagination::Mode>(mode);
+    m_page->setPagination(pagination);
+}
+
+void WebPage::setPageLength(double pageLength)
+{
+    Page::Pagination pagination = m_page->pagination();
+    pagination.pageLength = pageLength;
     m_page->setPagination(pagination);
 }

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

@@ -269 +269 @@
 
     void setPaginationMode(uint32_t /* WebCore::Page::Pagination::Mode */);
+    void setPageLength(double);
     void setGapBetweenPages(double);
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in

@@ -123 +123 @@
 
     SetPaginationMode(uint32_t mode);
+    SetPageLength(double pageLength);
     SetGapBetweenPages(double gap);