WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/rendering/style/RenderStyle.h

Index: third_party/WebKit/WebCore/rendering/style/RenderStyle.h
===================================================================
--- third_party/WebKit/WebCore/rendering/style/RenderStyle.h	(revision 9391)
+++ third_party/WebKit/WebCore/rendering/style/RenderStyle.h	(working copy)
@@ -655,7 +655,7 @@
     bool hasTransitions() const { return rareNonInheritedData->m_transitions && rareNonInheritedData->m_transitions->size() > 0; }
 
     // return the first found Animation (including 'all' transitions)
-    const Animation* transitionForProperty(int property);
+    const Animation* transitionForProperty(int property) const;
 
     int lineClamp() const { return rareNonInheritedData->lineClamp; }
     bool textSizeAdjust() const { return rareInheritedData->textSizeAdjust; }
@@ -971,7 +971,7 @@
 #endif
 
     const ContentData* contentData() const { return rareNonInheritedData->m_content.get(); }
-    bool contentDataEquivalent(const RenderStyle* otherStyle) const;
+    bool contentDataEquivalent(const RenderStyle* otherStyle) const { return const_cast<RenderStyle*>(this)->rareNonInheritedData->contentDataEquivalent(*const_cast<RenderStyle*>(otherStyle)->rareNonInheritedData); }
     void clearContent();
     void setContent(StringImpl*, bool add = false);
     void setContent(PassRefPtr<StyleImage>, bool add = false);