summaryrefslogtreecommitdiff
path: root/Source/WebCore/rendering/RenderObject.h
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-07-23 09:28:44 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-07-23 09:28:44 +0200
commit815f1ed417bd26fbe2abbdf20ac5d3423b30796c (patch)
tree923c9a9e2834ccab60f5caecfb8f0ac410c1dd9e /Source/WebCore/rendering/RenderObject.h
parentb4ad5d9d2b96baacd0180ead50de5195ca78af2d (diff)
downloadqtwebkit-815f1ed417bd26fbe2abbdf20ac5d3423b30796c.tar.gz
Imported WebKit commit e65cbc5b6ac32627c797e7fc7f46eb7794410c92 (http://svn.webkit.org/repository/webkit/trunk@123308)
New snapshot with better configure tests
Diffstat (limited to 'Source/WebCore/rendering/RenderObject.h')
-rw-r--r--Source/WebCore/rendering/RenderObject.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/rendering/RenderObject.h b/Source/WebCore/rendering/RenderObject.h
index 60c56909c..7b894feab 100644
--- a/Source/WebCore/rendering/RenderObject.h
+++ b/Source/WebCore/rendering/RenderObject.h
@@ -303,7 +303,7 @@ public:
virtual bool isCounter() const { return false; }
virtual bool isQuote() const { return false; }
-#if ENABLE(DETAILS)
+#if ENABLE(DETAILS_ELEMENT)
virtual bool isDetailsMarker() const { return false; }
#endif
virtual bool isEmbeddedObject() const { return false; }
@@ -318,10 +318,10 @@ public:
virtual bool isListMarker() const { return false; }
virtual bool isMedia() const { return false; }
virtual bool isMenuList() const { return false; }
-#if ENABLE(METER_TAG)
+#if ENABLE(METER_ELEMENT)
virtual bool isMeter() const { return false; }
#endif
-#if ENABLE(PROGRESS_TAG)
+#if ENABLE(PROGRESS_ELEMENT)
virtual bool isProgress() const { return false; }
#endif
virtual bool isRenderBlock() const { return false; }