Title: [159010] trunk/Source/WebCore
- Revision
- 159010
- Author
- [email protected]
- Date
- 2013-11-09 21:47:40 -0800 (Sat, 09 Nov 2013)
Log Message
Use RENDER_OBJECT_TYPE_CASTS for more types.
<https://webkit.org/b/124112>
Generate toRenderFoo() type casting helpers for these classes:
- RenderCombineText
- RenderDetailsMarker
- RenderListMarker
- RenderVideo
- RenderView
Reviewed by Anders Carlsson.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (159009 => 159010)
--- trunk/Source/WebCore/ChangeLog 2013-11-10 05:08:43 UTC (rev 159009)
+++ trunk/Source/WebCore/ChangeLog 2013-11-10 05:47:40 UTC (rev 159010)
@@ -1,5 +1,20 @@
2013-11-09 Andreas Kling <[email protected]>
+ Use RENDER_OBJECT_TYPE_CASTS for more types.
+ <https://webkit.org/b/124112>
+
+ Generate toRenderFoo() type casting helpers for these classes:
+
+ - RenderCombineText
+ - RenderDetailsMarker
+ - RenderListMarker
+ - RenderVideo
+ - RenderView
+
+ Reviewed by Anders Carlsson.
+
+2013-11-09 Andreas Kling <[email protected]>
+
Move MathML type checking virtuals to RenderObject.
<https://webkit.org/b/124111>
Modified: trunk/Source/WebCore/rendering/RenderCombineText.h (159009 => 159010)
--- trunk/Source/WebCore/rendering/RenderCombineText.h 2013-11-10 05:08:43 UTC (rev 159009)
+++ trunk/Source/WebCore/rendering/RenderCombineText.h 2013-11-10 05:47:40 UTC (rev 159010)
@@ -57,20 +57,8 @@
bool m_needsFontUpdate : 1;
};
-inline RenderCombineText& toRenderCombineText(RenderObject& object)
-{
- ASSERT_WITH_SECURITY_IMPLICATION(object.isCombineText());
- return static_cast<RenderCombineText&>(object);
-}
+RENDER_OBJECT_TYPE_CASTS(RenderCombineText, isCombineText());
-inline const RenderCombineText& toRenderCombineText(const RenderObject& object)
-{
- ASSERT_WITH_SECURITY_IMPLICATION(object.isCombineText());
- return static_cast<const RenderCombineText&>(object);
-}
-
-void toRenderCombineText(const RenderCombineText&);
-
} // namespace WebCore
#endif // RenderCombineText_h
Modified: trunk/Source/WebCore/rendering/RenderDetailsMarker.h (159009 => 159010)
--- trunk/Source/WebCore/rendering/RenderDetailsMarker.h 2013-11-10 05:08:43 UTC (rev 159009)
+++ trunk/Source/WebCore/rendering/RenderDetailsMarker.h 2013-11-10 05:47:40 UTC (rev 159010)
@@ -45,14 +45,8 @@
Path getPath(const LayoutPoint& origin) const;
};
-inline const RenderDetailsMarker& toRenderDetailsMarker(const RenderObject& object)
-{
- ASSERT_WITH_SECURITY_IMPLICATION(object.isDetailsMarker());
- return static_cast<const RenderDetailsMarker&>(object);
-}
+RENDER_OBJECT_TYPE_CASTS(RenderDetailsMarker, isDetailsMarker());
-void toRenderDetailsMarker(const RenderDetailsMarker&);
-
}
#endif
Modified: trunk/Source/WebCore/rendering/RenderListMarker.h (159009 => 159010)
--- trunk/Source/WebCore/rendering/RenderListMarker.h 2013-11-10 05:08:43 UTC (rev 159009)
+++ trunk/Source/WebCore/rendering/RenderListMarker.h 2013-11-10 05:47:40 UTC (rev 159010)
@@ -85,20 +85,8 @@
RenderListItem& m_listItem;
};
-inline RenderListMarker& toRenderListMarker(RenderObject& object)
-{
- ASSERT_WITH_SECURITY_IMPLICATION(object.isListMarker());
- return static_cast<RenderListMarker&>(object);
-}
+RENDER_OBJECT_TYPE_CASTS(RenderListMarker, isListMarker());
-inline const RenderListMarker& toRenderListMarker(const RenderObject& object)
-{
- ASSERT_WITH_SECURITY_IMPLICATION(object.isListMarker());
- return static_cast<const RenderListMarker&>(object);
-}
-
-void toRenderListMarker(const RenderListMarker&);
-
} // namespace WebCore
#endif // RenderListMarker_h
Modified: trunk/Source/WebCore/rendering/RenderVideo.h (159009 => 159010)
--- trunk/Source/WebCore/rendering/RenderVideo.h 2013-11-10 05:08:43 UTC (rev 159009)
+++ trunk/Source/WebCore/rendering/RenderVideo.h 2013-11-10 05:47:40 UTC (rev 159010)
@@ -92,20 +92,8 @@
LayoutSize m_cachedImageSize;
};
-inline RenderVideo& toRenderVideo(RenderObject& object)
-{
- ASSERT_WITH_SECURITY_IMPLICATION(object.isVideo());
- return static_cast<RenderVideo&>(object);
-}
+RENDER_OBJECT_TYPE_CASTS(RenderVideo, isVideo());
-inline const RenderVideo& toRenderVideo(const RenderObject& object)
-{
- ASSERT_WITH_SECURITY_IMPLICATION(object.isVideo());
- return static_cast<const RenderVideo&>(object);
-}
-
-void toRenderVideo(const RenderVideo&);
-
} // namespace WebCore
#endif
Modified: trunk/Source/WebCore/rendering/RenderView.h (159009 => 159010)
--- trunk/Source/WebCore/rendering/RenderView.h 2013-11-10 05:08:43 UTC (rev 159009)
+++ trunk/Source/WebCore/rendering/RenderView.h 2013-11-10 05:47:40 UTC (rev 159010)
@@ -348,20 +348,8 @@
#endif
};
-inline RenderView& toRenderView(RenderObject& object)
-{
- ASSERT_WITH_SECURITY_IMPLICATION(object.isRenderView());
- return static_cast<RenderView&>(object);
-}
+RENDER_OBJECT_TYPE_CASTS(RenderView, isRenderView());
-inline const RenderView& toRenderView(const RenderObject& object)
-{
- ASSERT_WITH_SECURITY_IMPLICATION(object.isRenderView());
- return static_cast<const RenderView&>(object);
-}
-
-void toRenderView(const RenderView&);
-
// Stack-based class to assist with LayoutState push/pop
class LayoutStateMaintainer {
WTF_MAKE_NONCOPYABLE(LayoutStateMaintainer);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
