Title: [93631] trunk/Source/WebCore
- Revision
- 93631
- Author
- [email protected]
- Date
- 2011-08-23 13:10:46 -0700 (Tue, 23 Aug 2011)
Log Message
Fixed warnings produced by gcc-4.6.0.
https://bugs.webkit.org/show_bug.cgi?id=62168
Patch by Ahmad Sharif <[email protected]> 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (93630 => 93631)
--- trunk/Source/WebCore/ChangeLog 2011-08-23 20:08:09 UTC (rev 93630)
+++ trunk/Source/WebCore/ChangeLog 2011-08-23 20:10:46 UTC (rev 93631)
@@ -1,3 +1,17 @@
+2011-08-23 Ahmad Sharif <[email protected]>
+
+ 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 <[email protected]>
Text overlaps with the floats
Modified: trunk/Source/WebCore/dom/Element.cpp (93630 => 93631)
--- trunk/Source/WebCore/dom/Element.cpp 2011-08-23 20:08:09 UTC (rev 93630)
+++ trunk/Source/WebCore/dom/Element.cpp 2011-08-23 20:10:46 UTC (rev 93631)
@@ -1097,7 +1097,7 @@
{
// 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();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
