Windows build fix

        * loader/FrameLoader.cpp:
        (WebCore::toPlugInElement): Don't rely on #if being processed before
        ASSERT.

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 32636fd43899c2888f3e8882b930c3cc72ef4cfd..849fb62e3a3c310f32d54d98d21fa1bc1b27fd96 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2009-02-17  Adam Roben  <aroben@apple.com>
+
+        Windows build fix
+
+        * loader/FrameLoader.cpp:
+        (WebCore::toPlugInElement): Don't rely on #if being processed before
+        ASSERT.
+
 2009-02-17  David Levin  <levin@chromium.org>
 
         Reviewed by Alexey Proskuryakov.

diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 9ee4f127e13a152d6b2013519618c8aab5d2ef89..0e8261eaac1279726d09e2866dd29dce9053c40f 100644 (file)
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -1697,11 +1697,14 @@ static HTMLPlugInElement* toPlugInElement(Node* node)
     if (!node)
         return 0;
 
-    ASSERT(node->hasTagName(objectTag) || node->hasTagName(embedTag) 
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
+    ASSERT(node->hasTagName(objectTag) || node->hasTagName(embedTag) 
         || node->hasTagName(videoTag) || node->hasTagName(audioTag)
-#endif
         || node->hasTagName(appletTag));
+#else
+    ASSERT(node->hasTagName(objectTag) || node->hasTagName(embedTag) 
+        || node->hasTagName(appletTag));
+#endif
 
     return static_cast<HTMLPlugInElement*>(node);
 }