GDK Build fix
authoroliver <oliver@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 11 May 2007 22:06:45 +0000 (22:06 +0000)
committeroliver <oliver@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 11 May 2007 22:06:45 +0000 (22:06 +0000)
        * ChangeLog:
        * dom/Document.cpp:
        (WebCore::Document::importNode):

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

WebCore/ChangeLog
WebCore/dom/Document.cpp

index 4c00e4ad66cc2871ee0a5b9cfbd0e08e78c48427..90fae68048452bde47206c6066c3b8d5b13ad794 100644 (file)
@@ -1,4 +1,11 @@
-<<<<<<< .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>
 
         Reviewed by Geoff.
@@ -13,7 +20,6 @@
         if so, we don't want to do work that may lazily create it while the Frame is being
         destroyed.
 
-=======
 2007-05-11  Oliver Hunt  <oliver@apple.com>
 
         Reviewed by Brady.
@@ -39,7 +45,6 @@
           Don't create SVG elements for documents that are in dashboard
           compatibility mode
 
->>>>>>> .r21418
 2007-05-11  Holger Hans Peter Freyther  <zecke@selfish.org>
 
         Reviewed by Maciej.
index 87933d1fa31d7aa9ea717dce0ee665ebb844ef1f..013fe5d902d28249a08527c86739fd038519f6e5 100644 (file)
@@ -554,7 +554,11 @@ PassRefPtr<Node> Document::importNode(Node* importedNode, bool deep, ExceptionCo
 {
     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;
     }