Regression(r132303) Broke debug build when SHADOW_DOM is enabled but STYLE_SCOPED...
authorryuan.choi@samsung.com <ryuan.choi@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 24 Oct 2012 06:16:01 +0000 (06:16 +0000)
committerryuan.choi@samsung.com <ryuan.choi@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 24 Oct 2012 06:16:01 +0000 (06:16 +0000)
https://bugs.webkit.org/show_bug.cgi?id=100203

Unreviewed Build fix.

Fix compilation error in StyleResolver.h when SHADOW_DOM flag is
set and STYLE_SCOPED is not.

No new tests, no behavior change.

Patch by Christophe Dumez <christophe.dumez@intel.com> on 2012-10-23

* css/StyleResolver.h:
(WebCore::StyleResolver::ensureScopeResolver):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@132312 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/css/StyleResolver.h

index f2c20b4..bcacd5b 100644 (file)
@@ -1,3 +1,18 @@
+2012-10-23  Christophe Dumez  <christophe.dumez@intel.com>
+
+        Regression(r132303) Broke debug build when SHADOW_DOM is enabled but STYLE_SCOPED is disabled
+        https://bugs.webkit.org/show_bug.cgi?id=100203
+
+        Unreviewed Build fix.
+
+        Fix compilation error in StyleResolver.h when SHADOW_DOM flag is
+        set and STYLE_SCOPED is not.
+
+        No new tests, no behavior change.
+
+        * css/StyleResolver.h:
+        (WebCore::StyleResolver::ensureScopeResolver):
+
 2012-10-23  Andreas Kling  <kling@webkit.org>
 
         Remove specialized hash traits for GlyphPages.
index 18f61f0..1c86e02 100644 (file)
@@ -175,7 +175,15 @@ private:
 #if ENABLE(STYLE_SCOPED) || ENABLE(SHADOW_DOM)
     StyleScopeResolver* ensureScopeResolver()
     {
+#if ENABLE(STYLE_SCOPED)
+#if ENABLE(SHADOW_DOM)
         ASSERT(RuntimeEnabledFeatures::shadowDOMEnabled() || RuntimeEnabledFeatures::styleScopedEnabled());
+#else
+        ASSERT(RuntimeEnabledFeatures::styleScopedEnabled());
+#endif
+#else
+        ASSERT(RuntimeEnabledFeatures::shadowDOMEnabled());
+#endif
         if (!m_scopeResolver)
             m_scopeResolver = adoptPtr(new StyleScopeResolver());
         return m_scopeResolver.get();