Changeset 54045 in webkit

Timestamp:

Jan 28, 2010 11:01:43 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-28 Hayato Ito <​hayato@chromium.org>

Reviewed by Darin Adler.

Change CSS 'page-break-inside' property from inherited one to non-inherited one because CSS specification defines so.

Note: Currently, the 'page-break-inside' property is used only when parsing the CSS. That property is not used when rendering.

​https://bugs.webkit.org/show_bug.cgi?id=34195

• fast/css/getComputedStyle/computed-style-page-break-inside-expected.txt: Added.
• fast/css/getComputedStyle/computed-style-page-break-inside.html: Added.
• fast/css/getComputedStyle/script-tests/computed-style-page-break-inside.js: Added.

2010-01-28 Hayato Ito <​hayato@chromium.org>

Reviewed by Darin Adler.

Change CSS 'page-break-inside' property from inherited one to non-inherited one because CSS specification defines so.

Note: Currently, the 'page-break-inside' property is used only when parsing the CSS. That property is not used when rendering.

​https://bugs.webkit.org/show_bug.cgi?id=34195

• rendering/style/RenderStyle.h: (WebCore::InheritedFlags::NonInheritedFlags::operator==): (WebCore::InheritedFlags::setBitDefaults): (WebCore::InheritedFlags::pageBreakInside): (WebCore::InheritedFlags::setPageBreakInside):
• rendering/style/StyleInheritedData.cpp: (WebCore::StyleInheritedData::StyleInheritedData): (WebCore::StyleInheritedData::operator==):
• rendering/style/StyleInheritedData.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/getComputedStyle/computed-style-page-break-inside-expected.txt (added)
• LayoutTests/fast/css/getComputedStyle/computed-style-page-break-inside.html (added)
• LayoutTests/fast/css/getComputedStyle/script-tests/computed-style-page-break-inside.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/style/RenderStyle.h (modified) (6 diffs)
• WebCore/rendering/style/StyleInheritedData.cpp (modified) (3 diffs)
• WebCore/rendering/style/StyleInheritedData.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-01-28  Hayato Ito  <hayato@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Change CSS 'page-break-inside' property from inherited one to non-inherited one because CSS specification defines so.
+
+        Note: Currently, the 'page-break-inside' property is used only when parsing the CSS. That property is not used when rendering.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34195
+
+        * fast/css/getComputedStyle/computed-style-page-break-inside-expected.txt: Added.
+        * fast/css/getComputedStyle/computed-style-page-break-inside.html: Added.
+        * fast/css/getComputedStyle/script-tests/computed-style-page-break-inside.js: Added.
+
 2010-01-28  Michael Nordman  <michaeln@google.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-28  Hayato Ito  <hayato@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Change CSS 'page-break-inside' property from inherited one to non-inherited one because CSS specification defines so.
+
+        Note: Currently, the 'page-break-inside' property is used only when parsing the CSS. That property is not used when rendering.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34195
+
+        * rendering/style/RenderStyle.h:
+        (WebCore::InheritedFlags::NonInheritedFlags::operator==):
+        (WebCore::InheritedFlags::setBitDefaults):
+        (WebCore::InheritedFlags::pageBreakInside):
+        (WebCore::InheritedFlags::setPageBreakInside):
+        * rendering/style/StyleInheritedData.cpp:
+        (WebCore::StyleInheritedData::StyleInheritedData):
+        (WebCore::StyleInheritedData::operator==):
+        * rendering/style/StyleInheritedData.h:
+
 2010-01-28  Michael Nordman  <michaeln@google.com>
 

trunk/WebCore/rendering/style/RenderStyle.h

@@ -209 +209 @@
         bool operator==(const NonInheritedFlags& other) const
         {
-            return (_effectiveDisplay == other._effectiveDisplay) &&
-            (_originalDisplay == other._originalDisplay) &&
-            (_overflowX == other._overflowX) &&
-            (_overflowY == other._overflowY) &&
-            (_vertical_align == other._vertical_align) &&
-            (_clear == other._clear) &&
-            (_position == other._position) &&
-            (_floating == other._floating) &&
-            (_table_layout == other._table_layout) &&
-            (_page_break_before == other._page_break_before) &&
-            (_page_break_after == other._page_break_after) &&
-            (_styleType == other._styleType) &&
-            (_affectedByHover == other._affectedByHover) &&
-            (_affectedByActive == other._affectedByActive) &&
-            (_affectedByDrag == other._affectedByDrag) &&
-            (_pseudoBits == other._pseudoBits) &&
-            (_unicodeBidi == other._unicodeBidi);
+            return _effectiveDisplay == other._effectiveDisplay
+                && _originalDisplay == other._originalDisplay
+                && _overflowX == other._overflowX
+                && _overflowY == other._overflowY
+                && _vertical_align == other._vertical_align
+                && _clear == other._clear
+                && _position == other._position
+                && _floating == other._floating
+                && _table_layout == other._table_layout
+                && _page_break_before == other._page_break_before
+                && _page_break_after == other._page_break_after
+                && _page_break_inside == other._page_break_inside
+                && _styleType == other._styleType
+                && _affectedByHover == other._affectedByHover
+                && _affectedByActive == other._affectedByActive
+                && _affectedByDrag == other._affectedByDrag
+                && _pseudoBits == other._pseudoBits
+                && _unicodeBidi == other._unicodeBidi;
         }
 
@@ -242 +243 @@
         unsigned _page_break_before : 2; // EPageBreak
         unsigned _page_break_after : 2; // EPageBreak
+        unsigned _page_break_inside : 2; // EPageBreak
 
         unsigned _styleType : 5; // PseudoId
@@ -249 +251 @@
         unsigned _pseudoBits : 7;
         unsigned _unicodeBidi : 2; // EUnicodeBidi
-        // 48 bits
+        // 50 bits
     } noninherited_flags;
 
@@ -285 +287 @@
         noninherited_flags._page_break_before = initialPageBreak();
         noninherited_flags._page_break_after = initialPageBreak();
+        noninherited_flags._page_break_inside = initialPageBreak();
         noninherited_flags._styleType = NOPSEUDO;
         noninherited_flags._affectedByHover = false;
@@ -586 +589 @@
     short widows() const { return inherited->widows; }
     short orphans() const { return inherited->orphans; }
-    EPageBreak pageBreakInside() const { return static_cast<EPageBreak>(inherited->page_break_inside); }
+    EPageBreak pageBreakInside() const { return static_cast<EPageBreak>(noninherited_flags._page_break_inside); }
     EPageBreak pageBreakBefore() const { return static_cast<EPageBreak>(noninherited_flags._page_break_before); }
     EPageBreak pageBreakAfter() const { return static_cast<EPageBreak>(noninherited_flags._page_break_after); }
@@ -922 +925 @@
     void setWidows(short w) { SET_VAR(inherited, widows, w); }
     void setOrphans(short o) { SET_VAR(inherited, orphans, o); }
-    void setPageBreakInside(EPageBreak b) { SET_VAR(inherited, page_break_inside, b); }
+    void setPageBreakInside(EPageBreak b) { noninherited_flags._page_break_inside = b; }
     void setPageBreakBefore(EPageBreak b) { noninherited_flags._page_break_before = b; }
     void setPageBreakAfter(EPageBreak b) { noninherited_flags._page_break_after = b; }

trunk/WebCore/rendering/style/StyleInheritedData.cpp

@@ -38 +38 @@
     , widows(RenderStyle::initialWidows())
     , orphans(RenderStyle::initialOrphans())
-    , page_break_inside(RenderStyle::initialPageBreak())
 {
 }
@@ -59 +58 @@
     , widows(o.widows)
     , orphans(o.orphans)
-    , page_break_inside(o.page_break_inside)
 {
 }
@@ -85 +83 @@
         vertical_border_spacing == o.vertical_border_spacing &&
         widows == o.widows &&
-        orphans == o.orphans &&
-        page_break_inside == o.page_break_inside;
+        orphans == o.orphans;
 }
 

trunk/WebCore/rendering/style/StyleInheritedData.h

@@ -69 +69 @@
     short widows;
     short orphans;
-    unsigned page_break_inside : 2; // EPageBreak
     
 private: