Changeset 165557 in webkit

Timestamp:

Mar 13, 2014 12:44:22 PM (10 years ago)

Author:

Antti Koivisto

Message:

REGRESSION(r165542): printing/page-rule-selection.html failing
​https://bugs.webkit.org/show_bug.cgi?id=130205

Reviewed by Andreas Kling.

• css/StyleResolver.cpp:

(WebCore::StyleResolver::keyframeStylesForAnimation):
(WebCore::StyleResolver::styleForPage):

Use Document style as parent when resolving page style.

(WebCore::StyleResolver::applyPropertyToStyle):

• css/StyleResolver.h:

Get rid of the default null parameter.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/StyleResolver.cpp (modified) (3 diffs)
• css/StyleResolver.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-13  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION(r165542): printing/page-rule-selection.html failing
+        https://bugs.webkit.org/show_bug.cgi?id=130205
+
+        Reviewed by Andreas Kling.
+
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::keyframeStylesForAnimation):
+        (WebCore::StyleResolver::styleForPage):
+        
+            Use Document style as parent when resolving page style.
+
+        (WebCore::StyleResolver::applyPropertyToStyle):
+        * css/StyleResolver.h:
+        
+            Get rid of the default null parameter.
+
 2014-03-13  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -893 +893 @@
         // Apply the declaration to the style. This is a simplified version of the logic in styleForElement
         initElement(e);
-        m_state.initForStyleResolve(document(), e);
+        m_state.initForStyleResolve(document(), e, nullptr);
 
         const StyleKeyframe* keyframe = keyframes[i].get();
@@ -990 +990 @@
 PassRef<RenderStyle> StyleResolver::styleForPage(int pageIndex)
 {
-    m_state.initForStyleResolve(document(), document().documentElement()); // m_rootElementStyle will be set to the document style.
+    m_state.initForStyleResolve(m_document, m_document.documentElement(), m_document.renderStyle());
 
     m_state.setStyle(RenderStyle::create());
@@ -1856 +1856 @@
 {
     initElement(0);
-    m_state.initForStyleResolve(document(), 0, style);
+    m_state.initForStyleResolve(document(), nullptr, style);
     m_state.setStyle(*style);
     applyPropertyToCurrentStyle(id, value);

trunk/Source/WebCore/css/StyleResolver.h

@@ -350 +350 @@
     public:
         void initElement(Element*);
-        void initForStyleResolve(Document&, Element*, RenderStyle* parentStyle = 0, RenderRegion* regionForStyling = 0);
+        void initForStyleResolve(Document&, Element*, RenderStyle* parentStyle, RenderRegion* regionForStyling = nullptr);
         void clear();