Changeset 85936 in webkit

Timestamp:

May 6, 2011 1:27:55 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-05-06 Luke Macpherson <​macpherson@chromium.org>

Reviewed by Eric Seidel.

Make RenderStyle::setPageBreakInside() reject unsupported enum values.
​https://bugs.webkit.org/show_bug.cgi?id=60235

No tests added as no functionality changed.

• css/CSSStyleSelector.cpp: (WebCore::CSSStyleSelector::applyProperty): Remove special-case code and use appropriate macro.
• rendering/style/RenderStyle.h: (WebCore::InheritedFlags::setPageBreakInside): Assert that only supported values are used.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSStyleSelector.cpp (modified) (1 diff)
• rendering/style/RenderStyle.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-06  Luke Macpherson   <macpherson@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Make RenderStyle::setPageBreakInside() reject unsupported enum values.
+        https://bugs.webkit.org/show_bug.cgi?id=60235
+
+        No tests added as no functionality changed.
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::applyProperty):
+        Remove special-case code and use appropriate macro.
+        * rendering/style/RenderStyle.h:
+        (WebCore::InheritedFlags::setPageBreakInside):
+        Assert that only supported values are used.
+
 2011-05-06  Luke Macpherson   <macpherson@chromium.org>
 

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -3737 +3737 @@
         HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE_WITH_VALUE(pageBreakAfter, PageBreakAfter, PageBreak)
         return;
-    case CSSPropertyPageBreakInside: {
-        HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(pageBreakInside, PageBreakInside, PageBreak)
-        if (!primitiveValue)
-            return;
-        EPageBreak pageBreak = *primitiveValue;
-        if (pageBreak != PBALWAYS)
-            m_style->setPageBreakInside(pageBreak);
-        return;
-    }
-        
+    case CSSPropertyPageBreakInside:
+        HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE_WITH_VALUE(pageBreakInside, PageBreakInside, PageBreak)
+        return;
     case CSSPropertyPosition:
         HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(position, Position)

trunk/Source/WebCore/rendering/style/RenderStyle.h

@@ -1014 +1014 @@
     void setWidows(short w) { SET_VAR(rareInheritedData, widows, w); }
     void setOrphans(short o) { SET_VAR(rareInheritedData, orphans, o); }
-    void setPageBreakInside(EPageBreak b) { noninherited_flags._page_break_inside = b; }
+    // For valid values of page-break-inside see http://www.w3.org/TR/CSS21/page.html#page-break-props
+    void setPageBreakInside(EPageBreak b) { ASSERT(b == PBAUTO || b == PBAVOID); 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; }