Changeset 21420 in webkit

Timestamp:

May 11, 2007 3:06:45 PM (17 years ago)

Author:

oliver

Message:

GDK Build fix

• ChangeLog:
• dom/Document.cpp: (WebCore::Document::importNode):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (3 diffs)
• dom/Document.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ -1 @@
-<<<<<<< .mine
+2007-05-11  Oliver Hunt  <oliver@apple.com>
+
+        GDK Build fix
+
+        * ChangeLog:
+        * dom/Document.cpp:
+        (WebCore::Document::importNode):
+
 2007-05-11  Maciej Stachowiak  <mjs@apple.com>
 
@@ -14 +21 @@
         destroyed.
 
-=======
 2007-05-11  Oliver Hunt  <oliver@apple.com>
 
@@ -40 +46 @@
           compatibility mode
 
->>>>>>> .r21418
 2007-05-11  Holger Hans Peter Freyther  <zecke@selfish.org>
 

trunk/WebCore/dom/Document.cpp

@@ -555 +555 @@
     ec = 0;
     
-    if (!importedNode || (importedNode->isSVGElement() && page() && page()->settings()->usesDashboardBackwardCompatibilityMode())) {
+    if (!importedNode
+#if ENABLE(SVG)
+        || (importedNode->isSVGElement() && page() && page()->settings()->usesDashboardBackwardCompatibilityMode())
+#endif
+        ) {
         ec = NOT_SUPPORTED_ERR;
         return 0;