Changeset 93631 in webkit

Timestamp:

Aug 23, 2011 1:10:46 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Fixed warnings produced by gcc-4.6.0.
​https://bugs.webkit.org/show_bug.cgi?id=62168

Patch by Ahmad Sharif <​asharif@chromium.org> on 2011-08-23
Reviewed by Adam Barth.

• dom/Element.cpp:

(WebCore::Element::recalcStyle):

• platform/ScrollAnimatorNone.cpp:

(WebCore::ScrollAnimatorNone::PerAxisData::curveAt):
(WebCore::ScrollAnimatorNone::PerAxisData::curveDerivativeAt):

• thirdparty: Copied from Source/WebCore/thirdparty.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Element.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-23  Ahmad Sharif  <asharif@chromium.org>
+
+        Fixed warnings produced by gcc-4.6.0.
+        https://bugs.webkit.org/show_bug.cgi?id=62168
+
+        Reviewed by Adam Barth.
+
+        * dom/Element.cpp:
+        (WebCore::Element::recalcStyle):
+        * platform/ScrollAnimatorNone.cpp:
+        (WebCore::ScrollAnimatorNone::PerAxisData::curveAt):
+        (WebCore::ScrollAnimatorNone::PerAxisData::curveDerivativeAt):
+        * thirdparty: Copied from Source/WebCore/thirdparty.
+
 2011-08-23  Alexandru Chiculita  <achicu@adobe.com>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -1098 +1098 @@
     // Ref currentStyle in case it would otherwise be deleted when setRenderStyle() is called.
     RefPtr<RenderStyle> currentStyle(renderStyle());
-    bool hasParentStyle = parentNodeForRenderingAndStyle() ? parentNodeForRenderingAndStyle()->renderStyle() : false;
+    bool hasParentStyle = parentNodeForRenderingAndStyle() ? static_cast<bool>(parentNodeForRenderingAndStyle()->renderStyle()) : false;
     bool hasDirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByDirectAdjacentRules();
     bool hasIndirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByForwardPositionalRules();