[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[steveblock at google.com]

The following commit has been merged in the webkit-1.1 branch:
commit cb4b5827c62d5e9f61a4e21d94d090d601032117
Author: steveblock at google.com <steveblock at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 21 18:07:01 2010 +0000

    [Android] bindings/v8/V8DOMWrapper.h[cpp] are missing guards for XPATH and XSLT features
    https://bugs.webkit.org/show_bug.cgi?id=33944
    
    Patch by Andrei Popescu <andreip at google.com> on 2010-01-21
    Reviewed by David Levin.
    
    Inside V8DOMWrapper.h[cpp], the code for XPATH and XSLT features is not guarded
    by the appropriate #if ENABLE(feature) macros. Add the missing guards.
    V8DOMWrapper.cpp includes ChromiumBridge.h for no reason. Remove the include.
    
    No new tests needed, functionality not changed.
    
    * bindings/v8/V8DOMWrapper.cpp:
    (WebCore::V8DOMWrapper::getTemplate):
    * bindings/v8/V8DOMWrapper.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53630 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 07b2def..c9ef676 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-01-21  Andrei Popescu  <andreip at google.com>
+
+        Reviewed by David Levin.
+
+        [Android] bindings/v8/V8DOMWrapper.h[cpp] are missing guards for XPATH and XSLT features
+        https://bugs.webkit.org/show_bug.cgi?id=33944
+
+        Inside V8DOMWrapper.h[cpp], the code for XPATH and XSLT features is not guarded
+        by the appropriate #if ENABLE(feature) macros. Add the missing guards.
+        V8DOMWrapper.cpp includes ChromiumBridge.h for no reason. Remove the include.
+
+        No new tests needed, functionality not changed.
+
+        * bindings/v8/V8DOMWrapper.cpp:
+        (WebCore::V8DOMWrapper::getTemplate):
+        * bindings/v8/V8DOMWrapper.h:
+
 2010-01-21  Eric Carlson  <eric.carlson at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/bindings/v8/V8DOMWrapper.cpp b/WebCore/bindings/v8/V8DOMWrapper.cpp
index c38ab4b..96d060d 100644
--- a/WebCore/bindings/v8/V8DOMWrapper.cpp
+++ b/WebCore/bindings/v8/V8DOMWrapper.cpp
@@ -32,12 +32,12 @@
 #include "V8DOMWrapper.h"
 
 #include "CSSMutableStyleDeclaration.h"
-#include "ChromiumBridge.h"
 #include "DOMObjectsInclude.h"
 #include "DocumentLoader.h"
 #include "FrameLoaderClient.h"
 #include "Notification.h"
 #include "SVGElementInstance.h"
+#include "SVGPathSeg.h"
 #include "ScriptController.h"
 #include "V8AbstractEventListener.h"
 #include "V8Binding.h"
@@ -62,10 +62,6 @@
 #include "WebGLUniformLocation.h"
 #include "WorkerContextExecutionProxy.h"
 
-#if ENABLE(SVG)
-#include "SVGPathSeg.h"
-#endif
-
 #include <algorithm>
 #include <utility>
 #include <v8.h>
@@ -326,12 +322,16 @@ v8::Persistent<v8::FunctionTemplate> V8DOMWrapper::getTemplate(V8ClassIndex::V8W
         descriptor->SetCallHandler(USE_CALLBACK(XMLHttpRequestConstructor));
         break;
     }
+#if ENABLE(XPATH)
     case V8ClassIndex::XPATHEVALUATOR:
         descriptor->SetCallHandler(USE_CALLBACK(XPathEvaluatorConstructor));
         break;
+#endif
+#if ENABLE(XSLT)
     case V8ClassIndex::XSLTPROCESSOR:
         descriptor->SetCallHandler(USE_CALLBACK(XSLTProcessorConstructor));
         break;
+#endif
     default:
         break;
     }
diff --git a/WebCore/bindings/v8/V8DOMWrapper.h b/WebCore/bindings/v8/V8DOMWrapper.h
index ee79509..bdf6547 100644
--- a/WebCore/bindings/v8/V8DOMWrapper.h
+++ b/WebCore/bindings/v8/V8DOMWrapper.h
@@ -194,7 +194,7 @@ namespace WebCore {
 
         static PassRefPtr<EventListener> getEventListener(V8Proxy* proxy, v8::Local<v8::Value> value, bool isAttribute, ListenerLookupType lookup);
 
-
+#if ENABLE(XPATH)
         // XPath-related utilities
         static RefPtr<XPathNSResolver> getXPathNSResolver(v8::Handle<v8::Value> value, V8Proxy* proxy = 0)
         {
@@ -205,7 +205,7 @@ namespace WebCore {
                 resolver = V8CustomXPathNSResolver::create(proxy, value->ToObject());
             return resolver;
         }
-
+#endif
         // DOMImplementation is a singleton and it is handled in a special
         // way. A wrapper is generated per document and stored in an
         // internal field of the document.

-- 
WebKit Debian packaging