Title: [131684] trunk/Source/WebCore
- Revision
- 131684
- Author
- [email protected]
- Date
- 2012-10-17 17:59:39 -0700 (Wed, 17 Oct 2012)
Log Message
Remove StyleContentType since it's not used anymore
https://bugs.webkit.org/show_bug.cgi?id=99659
Patch by Elliott Sprehn <[email protected]> on 2012-10-17
Reviewed by Eric Seidel.
Remove StyleContentType enum since it's not used anymore and
make the is*() type checking methods on ContentData public.
No new tests needed, this is just deleting dead code.
* rendering/style/ContentData.h:
(ContentData):
* rendering/style/RenderStyleConstants.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (131683 => 131684)
--- trunk/Source/WebCore/ChangeLog 2012-10-18 00:59:02 UTC (rev 131683)
+++ trunk/Source/WebCore/ChangeLog 2012-10-18 00:59:39 UTC (rev 131684)
@@ -1,3 +1,19 @@
+2012-10-17 Elliott Sprehn <[email protected]>
+
+ Remove StyleContentType since it's not used anymore
+ https://bugs.webkit.org/show_bug.cgi?id=99659
+
+ Reviewed by Eric Seidel.
+
+ Remove StyleContentType enum since it's not used anymore and
+ make the is*() type checking methods on ContentData public.
+
+ No new tests needed, this is just deleting dead code.
+
+ * rendering/style/ContentData.h:
+ (ContentData):
+ * rendering/style/RenderStyleConstants.h:
+
2012-10-17 Simon Fraser <[email protected]>
Create a GraphicsLayerUpdater class that will do periodic layer flushes for layer trees containing tile caches
Modified: trunk/Source/WebCore/rendering/style/ContentData.h (131683 => 131684)
--- trunk/Source/WebCore/rendering/style/ContentData.h 2012-10-18 00:59:02 UTC (rev 131683)
+++ trunk/Source/WebCore/rendering/style/ContentData.h 2012-10-18 00:59:39 UTC (rev 131684)
@@ -53,7 +53,6 @@
virtual RenderObject* createRenderer(Document*, RenderStyle*) const = 0;
- virtual StyleContentType type() const = 0;
virtual PassOwnPtr<ContentData> clone() const;
ContentData* next() const { return m_next.get(); }
@@ -74,6 +73,7 @@
StyleImage* image() { return m_image.get(); }
void setImage(PassRefPtr<StyleImage> image) { m_image = image; }
+ virtual bool isImage() const OVERRIDE { return true; }
virtual RenderObject* createRenderer(Document*, RenderStyle*) const OVERRIDE;
virtual bool equals(const ContentData& data) const OVERRIDE
@@ -89,8 +89,6 @@
{
}
- virtual StyleContentType type() const { return CONTENT_OBJECT; }
- virtual bool isImage() const { return true; }
virtual PassOwnPtr<ContentData> cloneInternal() const
{
RefPtr<StyleImage> image = const_cast<StyleImage*>(this->image());
@@ -106,6 +104,7 @@
const String& text() const { return m_text; }
void setText(const String& text) { m_text = text; }
+ virtual bool isText() const OVERRIDE { return true; }
virtual RenderObject* createRenderer(Document*, RenderStyle*) const OVERRIDE;
virtual bool equals(const ContentData& data) const OVERRIDE
@@ -121,8 +120,6 @@
{
}
- virtual StyleContentType type() const { return CONTENT_TEXT; }
- virtual bool isText() const { return true; }
virtual PassOwnPtr<ContentData> cloneInternal() const { return create(text()); }
String m_text;
@@ -134,6 +131,7 @@
const CounterContent* counter() const { return m_counter.get(); }
void setCounter(PassOwnPtr<CounterContent> counter) { m_counter = counter; }
+ virtual bool isCounter() const OVERRIDE { return true; }
virtual RenderObject* createRenderer(Document*, RenderStyle*) const OVERRIDE;
private:
@@ -142,8 +140,6 @@
{
}
- virtual StyleContentType type() const { return CONTENT_COUNTER; }
- virtual bool isCounter() const { return true; }
virtual PassOwnPtr<ContentData> cloneInternal() const
{
OwnPtr<CounterContent> counterData = adoptPtr(new CounterContent(*counter()));
@@ -166,6 +162,7 @@
QuoteType quote() const { return m_quote; }
void setQuote(QuoteType quote) { m_quote = quote; }
+ virtual bool isQuote() const OVERRIDE { return true; }
virtual RenderObject* createRenderer(Document*, RenderStyle*) const OVERRIDE;
virtual bool equals(const ContentData& data) const OVERRIDE
@@ -181,8 +178,6 @@
{
}
- virtual StyleContentType type() const { return CONTENT_QUOTE; }
- virtual bool isQuote() const { return true; }
virtual PassOwnPtr<ContentData> cloneInternal() const { return create(quote()); }
QuoteType m_quote;
Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (131683 => 131684)
--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2012-10-18 00:59:02 UTC (rev 131683)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2012-10-18 00:59:39 UTC (rev 131684)
@@ -303,10 +303,6 @@
NoneListStyle
};
-enum StyleContentType {
- CONTENT_NONE, CONTENT_OBJECT, CONTENT_TEXT, CONTENT_COUNTER, CONTENT_QUOTE
-};
-
enum QuoteType {
OPEN_QUOTE, CLOSE_QUOTE, NO_OPEN_QUOTE, NO_CLOSE_QUOTE
};
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
