Changeset 106511 in webkit

Timestamp:

Feb 1, 2012 4:01:45 PM (12 years ago)

Author:

mitz@apple.com

Message:

Source/WebCore: WebCore part of <rdar://problem/10442663> Paginated display does not respect page-break-{before,after}
​https://bugs.webkit.org/show_bug.cgi?id=77505

Reviewed by Darin Adler.

• page/Page.h:

(WebCore::Page::Pagination::Pagination): Added initializer for the behavesLikeColumns member
variable.
(WebCore::Page::Pagination::operator==): Added comparison of behavesLikeColumns values.
(Pagination): Added behavesLikeColumns member variable. When set to false (the default),
paginated display respects the page-break-{before,after} properties rather than the
column-break-{before,after} ones.

• rendering/ColumnInfo.h:

(WebCore::ColumnInfo::ColumnInfo): Added initializer for the m_paginationUnit member.
(WebCore::ColumnInfo::paginationUnit): Added this getter.
(WebCore::ColumnInfo::setPaginationUnit): Added this setter.
(ColumnInfo): Added m_paginationUnit member. It defaults to Column.

• rendering/LayoutState.h:

(WebCore::LayoutState::isPaginatingColumns): Changed to check the pagination unit.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::layoutBlock): Added code to set the pagination unit in the ColumnInfo.
(WebCore::RenderBlock::paginationUnit): Added. The base class implementation returns Column.

• rendering/RenderBlock.h:
• rendering/RenderView.cpp:

(WebCore::RenderView::paginationUnit): Added this override that returns Page, unless
this is the RenderView for the main frame and pagination is set to behave like columns.

• rendering/RenderView.h:

Source/WebKit/mac: WebKit/mac part of <rdar://problem/10442663> Paginated display does not respect page-break-{before,after}
​https://bugs.webkit.org/show_bug.cgi?id=77505

Reviewed by Darin Adler.

• WebView/WebView.mm:

(-[WebView _setPaginationBehavesLikeColumns:]): Added this setter.
(-[WebView _paginationBehavesLikeColumns]): Added this getter.

• WebView/WebViewPrivate.h:

Source/WebKit2: WebKit2 part of <rdar://problem/10442663> Paginated display does not respect page-break-{before,after}
​https://bugs.webkit.org/show_bug.cgi?id=77505

Reviewed by Darin Adler.

• Shared/WebPageCreationParameters.cpp:

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

• Shared/WebPageCreationParameters.h:

(WebPageCreationParameters): Added paginationBehavesLikeColumns boolean.

• UIProcess/API/C/WKPage.cpp:

(WKPageSetPaginationBehavesLikeColumns): Added this setter.
(WKPageGetPaginationBehavesLikeColumns): Added this getter.

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

(-[WKBrowsingContextController setPaginationBehavesLikeColumns:]): Added this Objective-C
wrapper around WKPageSetPaginationBehavesLikeColumns.
(-[WKBrowsingContextController paginationBehavesLikeColumns]): Added this Objective-C wrapper
around WKPageGetPaginationBehavesLikeColumns.

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

(WebKit::WebPageProxy::WebPageProxy): Added call to setPaginationBehavesLikeColumns() with
the value from the creation parameters.
(WebKit::WebPageProxy::setPaginationBehavesLikeColumns): Added this setter.
(WebKit::WebPageProxy::creationParameters): Populate paginationBehavesLikeColumns.

• UIProcess/WebPageProxy.h:

(WebKit::WebPageProxy::paginationBehavesLikeColumns): Added this getter.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::setPaginationBehavesLikeColumns): Added this setter.

• WebProcess/WebPage/WebPage.h:
• WebProcess/WebPage/WebPage.messages.in: Added SetPaginationBehavesLikeColumns message.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/Page.h (modified) (2 diffs)
• WebCore/rendering/ColumnInfo.h (modified) (3 diffs)
• WebCore/rendering/LayoutState.h (modified) (3 diffs)
• WebCore/rendering/RenderBlock.cpp (modified) (2 diffs)
• WebCore/rendering/RenderBlock.h (modified) (3 diffs)
• WebCore/rendering/RenderView.cpp (modified) (1 diff)
• WebCore/rendering/RenderView.h (modified) (1 diff)
• 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 @@
+2012-02-01  Dan Bernstein  <mitz@apple.com>
+
+        WebCore part of <rdar://problem/10442663> Paginated display does not respect page-break-{before,after}
+        https://bugs.webkit.org/show_bug.cgi?id=77505
+
+        Reviewed by Darin Adler.
+
+        * page/Page.h:
+        (WebCore::Page::Pagination::Pagination): Added initializer for the behavesLikeColumns member
+        variable.
+        (WebCore::Page::Pagination::operator==): Added comparison of behavesLikeColumns values.
+        (Pagination): Added behavesLikeColumns member variable. When set to false (the default),
+        paginated display respects the page-break-{before,after} properties rather than the
+        column-break-{before,after} ones.
+        * rendering/ColumnInfo.h:
+        (WebCore::ColumnInfo::ColumnInfo): Added initializer for the m_paginationUnit member.
+        (WebCore::ColumnInfo::paginationUnit): Added this getter.
+        (WebCore::ColumnInfo::setPaginationUnit): Added this setter.
+        (ColumnInfo): Added m_paginationUnit member. It defaults to Column.
+        * rendering/LayoutState.h:
+        (WebCore::LayoutState::isPaginatingColumns): Changed to check the pagination unit.
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::layoutBlock): Added code to set the pagination unit in the ColumnInfo.
+        (WebCore::RenderBlock::paginationUnit): Added. The base class implementation returns Column.
+        * rendering/RenderBlock.h:
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::paginationUnit): Added this override that returns Page, unless
+        this is the RenderView for the main frame and pagination is set to behave like columns.
+        * rendering/RenderView.h:
+
 2012-02-01  Florin Malita  <fmalita@google.com>
 

trunk/Source/WebCore/page/Page.h

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

trunk/Source/WebCore/rendering/ColumnInfo.h

@@ -45 +45 @@
         , m_maximumDistanceBetweenForcedBreaks(0)
         , m_forcedBreakOffset(0)
+        , m_paginationUnit(Column)
     {
     }
@@ -94 +95 @@
     }
 
+    enum PaginationUnit { Column, Page };
+    PaginationUnit paginationUnit() const { return m_paginationUnit; }
+    void setPaginationUnit(PaginationUnit paginationUnit) { m_paginationUnit = paginationUnit; }
+
 private:
     LayoutUnit m_desiredColumnWidth;
@@ -105 +110 @@
     int m_maximumDistanceBetweenForcedBreaks;
     int m_forcedBreakOffset;
+    PaginationUnit m_paginationUnit;
 };
 

trunk/Source/WebCore/rendering/LayoutState.h

@@ -27 +27 @@
 #define LayoutState_h
 
+#include "ColumnInfo.h"
 #include "LayoutTypes.h"
 #include <wtf/HashMap.h>
@@ -33 +34 @@
 namespace WebCore {
 
-class ColumnInfo;
 class RenderArena;
 class RenderBlock;
@@ -70 +70 @@
 
     void clearPaginationInformation();
-    bool isPaginatingColumns() const { return m_columnInfo; }
+    bool isPaginatingColumns() const { return m_columnInfo && m_columnInfo->paginationUnit() == ColumnInfo::Column; }
     bool isPaginated() const { return m_isPaginated; }
     

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -1262 +1262 @@
         if (!hasSpecifiedPageLogicalHeight && !pageLogicalHeight)
             colInfo->clearForcedBreaks();
+
+        colInfo->setPaginationUnit(paginationUnit());
     }
 
@@ -6389 +6391 @@
     }
     return true;
+}
+
+ColumnInfo::PaginationUnit RenderBlock::paginationUnit() const
+{
+    return ColumnInfo::Column;
 }
 

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -24 +24 @@
 #define RenderBlock_h
 
+#include "ColumnInfo.h"
 #include "GapRects.h"
 #include "PODIntervalTree.h"
@@ -36 +37 @@
 
 class BidiContext;
-class ColumnInfo;
 class InlineIterator;
 class LayoutStateMaintainer;
@@ -906 +906 @@
     bool hasNextPage(LayoutUnit logicalOffset, PageBoundaryRule = ExcludePageBoundary) const;
 
+    virtual ColumnInfo::PaginationUnit paginationUnit() const;
+
     LayoutUnit applyBeforeBreak(RenderBox* child, LayoutUnit logicalOffset); // If the child has a before break, then return a new yPos that shifts to the top of the next page/column.
     LayoutUnit applyAfterBreak(RenderBox* child, LayoutUnit logicalOffset, MarginInfo&); // If the child has an after break, then return a new offset that shifts to the top of the next page/column.

trunk/Source/WebCore/rendering/RenderView.cpp

@@ -200 +200 @@
 }
 
+ColumnInfo::PaginationUnit RenderView::paginationUnit() const
+{
+    if (m_frameView) {
+        if (Frame* frame = m_frameView->frame()) {
+            if (Page* page = frame->page())
+                return (frame == page->mainFrame() && page->pagination().behavesLikeColumns) ? ColumnInfo::Column : ColumnInfo::Page;
+        }
+    }
+    return ColumnInfo::Page;
+}
+
 void RenderView::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {

trunk/Source/WebCore/rendering/RenderView.h

@@ -199 +199 @@
 private:
     virtual void calcColumnWidth() OVERRIDE;
+    virtual ColumnInfo::PaginationUnit paginationUnit() const OVERRIDE;
 
     bool shouldRepaint(const IntRect& r) const;

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2012-02-01  Dan Bernstein  <mitz@apple.com>
+
+        WebKit/mac part of <rdar://problem/10442663> Paginated display does not respect page-break-{before,after}
+        https://bugs.webkit.org/show_bug.cgi?id=77505
+
+        Reviewed by Darin Adler.
+
+        * WebView/WebView.mm:
+        (-[WebView _setPaginationBehavesLikeColumns:]): Added this setter.
+        (-[WebView _paginationBehavesLikeColumns]): Added this getter.
+        * WebView/WebViewPrivate.h:
+
 2012-01-25  Eric Seidel  <eric@webkit.org>
 

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

@@ -2792 +2792 @@
 }
 
+- (void)_setPaginationBehavesLikeColumns:(BOOL)behavesLikeColumns
+{
+    Page* page = core(self);
+    if (!page)
+        return;
+
+    Page::Pagination pagination = page->pagination();
+    pagination.behavesLikeColumns = behavesLikeColumns;
+}
+
+- (BOOL)_paginationBehavesLikeColumns
+{
+    Page* page = core(self);
+    if (!page)
+        return NO;
+
+    return page->pagination().behavesLikeColumns;
+}
+
 - (void)_setPageLength:(CGFloat)pageLength
 {

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

@@ -558 +558 @@
 - (void)_setPaginationMode:(WebPaginationMode)paginationMode;
 - (WebPaginationMode)_paginationMode;
+
+// Whether the column-break-{before,after} properties are respected instead of the
+// page-break-{before,after} properties.
+- (void)_setPaginationBehavesLikeColumns:(BOOL)behavesLikeColumns;
+- (BOOL)_paginationBehavesLikeColumns;
+
 // Set to 0 to have the page length equal the view length.
 - (void)_setPageLength:(CGFloat)pageLength;

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-02-01  Dan Bernstein  <mitz@apple.com>
+
+        WebKit2 part of <rdar://problem/10442663> Paginated display does not respect page-break-{before,after}
+        https://bugs.webkit.org/show_bug.cgi?id=77505
+
+        Reviewed by Darin Adler.
+
+        * Shared/WebPageCreationParameters.cpp:
+        (WebKit::WebPageCreationParameters::encode): Encode paginationBehavesLikeColumns.
+        (WebKit::WebPageCreationParameters::decode): Decode paginationBehavesLikeColumns.
+        * Shared/WebPageCreationParameters.h:
+        (WebPageCreationParameters): Added paginationBehavesLikeColumns boolean.
+        * UIProcess/API/C/WKPage.cpp:
+        (WKPageSetPaginationBehavesLikeColumns): Added this setter.
+        (WKPageGetPaginationBehavesLikeColumns): Added this getter.
+        * UIProcess/API/C/WKPagePrivate.h:
+        * UIProcess/API/mac/WKBrowsingContextController.mm:
+        (-[WKBrowsingContextController setPaginationBehavesLikeColumns:]): Added this Objective-C
+        wrapper around WKPageSetPaginationBehavesLikeColumns.
+        (-[WKBrowsingContextController paginationBehavesLikeColumns]): Added this Objective-C wrapper
+        around WKPageGetPaginationBehavesLikeColumns.
+        * UIProcess/API/mac/WKBrowsingContextControllerPrivate.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::WebPageProxy): Added call to setPaginationBehavesLikeColumns() with
+        the value from the creation parameters.
+        (WebKit::WebPageProxy::setPaginationBehavesLikeColumns): Added this setter.
+        (WebKit::WebPageProxy::creationParameters): Populate paginationBehavesLikeColumns.
+        * UIProcess/WebPageProxy.h:
+        (WebKit::WebPageProxy::paginationBehavesLikeColumns): Added this getter.
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::setPaginationBehavesLikeColumns): Added this setter.
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/WebPage.messages.in: Added SetPaginationBehavesLikeColumns message.
+
 2012-02-01  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp

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

trunk/Source/WebKit2/Shared/WebPageCreationParameters.h

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

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

@@ -380 +380 @@
 }
 
+void WKPageSetPaginationBehavesLikeColumns(WKPageRef pageRef, bool behavesLikeColumns)
+{
+    toImpl(pageRef)->setPaginationBehavesLikeColumns(behavesLikeColumns);
+}
+
+bool WKPageGetPaginationBehavesLikeColumns(WKPageRef pageRef)
+{
+    return toImpl(pageRef)->paginationBehavesLikeColumns();
+}
+
 void WKPageSetPageLength(WKPageRef pageRef, double pageLength)
 {

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 WKPageSetPaginationBehavesLikeColumns(WKPageRef page, bool behavesLikeColumns);
+WK_EXPORT bool WKPageGetPaginationBehavesLikeColumns(WKPageRef page);
 WK_EXPORT void WKPageSetPageLength(WKPageRef page, double pagesPerView);
 WK_EXPORT double WKPageGetPageLength(WKPageRef page);

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

@@ -244 +244 @@
 }
 
+- (void)setPaginationBehavesLikeColumns:(BOOL)behavesLikeColumns
+{
+    WKPageSetPaginationBehavesLikeColumns(self._pageRef, behavesLikeColumns);
+}
+
+- (BOOL)paginationBehavesLikeColumns
+{
+    return WKPageGetPaginationBehavesLikeColumns(self._pageRef);
+}
+
 - (void)setPageLength:(CGFloat)pageLength
 {

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

@@ -36 +36 @@
 
 @property WKBrowsingContextPaginationMode paginationMode;
+// Whether the column-break-{before,after} properties are respected instead of the
+// page-break-{before,after} properties.
+@property BOOL paginationBehavesLikeColumns;
 // Set to 0 to have the page length equal the view length.
 @property CGFloat pageLength;

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -167 +167 @@
     , m_useFixedLayout(false)
     , m_paginationMode(Page::Pagination::Unpaginated)
+    , m_paginationBehavesLikeColumns(false)
     , m_pageLength(0)
     , m_gapBetweenPages(0)
@@ -1314 +1315 @@
 }
 
+void WebPageProxy::setPaginationBehavesLikeColumns(bool behavesLikeColumns)
+{
+    if (behavesLikeColumns == m_paginationBehavesLikeColumns)
+        return;
+
+    m_paginationBehavesLikeColumns = behavesLikeColumns;
+
+    if (!isValid())
+        return;
+    process()->send(Messages::WebPage::SetPaginationBehavesLikeColumns(behavesLikeColumns), m_pageID);
+}
+
 void WebPageProxy::setPageLength(double pageLength)
 {
@@ -3271 +3284 @@
     parameters.fixedLayoutSize = m_fixedLayoutSize;
     parameters.paginationMode = m_paginationMode;
+    parameters.paginationBehavesLikeColumns = m_paginationBehavesLikeColumns;
     parameters.pageLength = m_pageLength;
     parameters.gapBetweenPages = m_gapBetweenPages;

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -442 +442 @@
     void setPaginationMode(WebCore::Page::Pagination::Mode);
     WebCore::Page::Pagination::Mode paginationMode() const { return m_paginationMode; }
+    void setPaginationBehavesLikeColumns(bool);
+    bool paginationBehavesLikeColumns() const { return m_paginationBehavesLikeColumns; }
     void setPageLength(double);
     double pageLength() const { return m_pageLength; }
@@ -948 +950 @@
 
     WebCore::Page::Pagination::Mode m_paginationMode;
+    bool m_paginationBehavesLikeColumns;
     double m_pageLength;
     double m_gapBetweenPages;

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

@@ -262 +262 @@
 
     setPaginationMode(parameters.paginationMode);
+    setPaginationBehavesLikeColumns(parameters.paginationBehavesLikeColumns);
     setPageLength(parameters.pageLength);
     setGapBetweenPages(parameters.gapBetweenPages);
@@ -1024 +1025 @@
 }
 
+void WebPage::setPaginationBehavesLikeColumns(bool behavesLikeColumns)
+{
+    Page::Pagination pagination = m_page->pagination();
+    pagination.behavesLikeColumns = behavesLikeColumns;
+    m_page->setPagination(pagination);
+}
+
 void WebPage::setPageLength(double pageLength)
 {

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

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

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

@@ -127 +127 @@
 
     SetPaginationMode(uint32_t mode);
+    SetPaginationBehavesLikeColumns(bool behavesLikeColumns);
     SetPageLength(double pageLength);
     SetGapBetweenPages(double gap);