[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

japhet at chromium.org japhet at chromium.org
Wed Feb 10 22:16:34 UTC 2010


The following commit has been merged in the webkit-1.1 branch:
commit d3667281d7d17b581fb3fc499d6d91fa06c277d5
Author: japhet at chromium.org <japhet at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 5 16:28:39 2010 +0000

    2010-02-05  Nate Chapin  <japhet at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            [V8] Clean up code for getting a v8::FunctionTemplate.
    
            https://bugs.webkit.org/show_bug.cgi?id=34606
    
            * bindings/scripts/CodeGeneratorV8.pm: Making GetTemplate() public
            * bindings/v8/V8Binding.cpp:
            (WebCore::configureTemplate):
            * bindings/v8/V8DOMWrapper.cpp: Remove getTemplate(), use V8ClassIndex::getTemplate() instead.
            (WebCore::V8DOMWrapper::getConstructor):
            (WebCore::V8DOMWrapper::instantiateV8Object):
            * bindings/v8/V8DOMWrapper.h:
            (WebCore::V8DOMWrapper::lookupDOMWrapper):
            * bindings/v8/V8Index.cpp: Remove duplicate caching of FunctionTemplates.
            (WebCore::V8ClassIndex::getTemplate):
            * bindings/v8/V8Index.h:
            * bindings/v8/WorkerContextExecutionProxy.cpp:
            (WebCore::WorkerContextExecutionProxy::toV8):
            * bindings/v8/custom/V8HTMLAudioElementConstructor.cpp:
            (WebCore::v8HTMLAudioElementConstructorCallback):
            (WebCore::V8HTMLAudioElementConstructor::GetTemplate):
            * bindings/v8/custom/V8HTMLAudioElementConstructor.h:
            * bindings/v8/custom/V8HTMLImageElementConstructor.cpp:
            (WebCore::v8HTMLImageElementConstructorCallback):
            (WebCore::V8HTMLImageElementConstructor::GetTemplate):
            * bindings/v8/custom/V8HTMLImageElementConstructor.h:
            * bindings/v8/custom/V8HTMLOptionElementConstructor.cpp:
            (WebCore::v8HTMLOptionElementConstructorCallback):
            (WebCore::V8HTMLOptionElementConstructor::GetTemplate):
            * bindings/v8/custom/V8HTMLOptionElementConstructor.h:
            * bindings/v8/custom/V8InjectedScriptHostCustom.cpp:
            (WebCore::createInjectedScriptHostV8Wrapper):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54425 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6d2c17f..37961b0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,39 @@
+2010-02-05  Nate Chapin  <japhet at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        [V8] Clean up code for getting a v8::FunctionTemplate.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=34606
+
+        * bindings/scripts/CodeGeneratorV8.pm: Making GetTemplate() public
+        * bindings/v8/V8Binding.cpp:
+        (WebCore::configureTemplate):
+        * bindings/v8/V8DOMWrapper.cpp: Remove getTemplate(), use V8ClassIndex::getTemplate() instead.
+        (WebCore::V8DOMWrapper::getConstructor):
+        (WebCore::V8DOMWrapper::instantiateV8Object):
+        * bindings/v8/V8DOMWrapper.h:
+        (WebCore::V8DOMWrapper::lookupDOMWrapper):
+        * bindings/v8/V8Index.cpp: Remove duplicate caching of FunctionTemplates.
+        (WebCore::V8ClassIndex::getTemplate):
+        * bindings/v8/V8Index.h:
+        * bindings/v8/WorkerContextExecutionProxy.cpp:
+        (WebCore::WorkerContextExecutionProxy::toV8):
+        * bindings/v8/custom/V8HTMLAudioElementConstructor.cpp:
+        (WebCore::v8HTMLAudioElementConstructorCallback):
+        (WebCore::V8HTMLAudioElementConstructor::GetTemplate):
+        * bindings/v8/custom/V8HTMLAudioElementConstructor.h:
+        * bindings/v8/custom/V8HTMLImageElementConstructor.cpp:
+        (WebCore::v8HTMLImageElementConstructorCallback):
+        (WebCore::V8HTMLImageElementConstructor::GetTemplate):
+        * bindings/v8/custom/V8HTMLImageElementConstructor.h:
+        * bindings/v8/custom/V8HTMLOptionElementConstructor.cpp:
+        (WebCore::v8HTMLOptionElementConstructorCallback):
+        (WebCore::V8HTMLOptionElementConstructor::GetTemplate):
+        * bindings/v8/custom/V8HTMLOptionElementConstructor.h:
+        * bindings/v8/custom/V8InjectedScriptHostCustom.cpp:
+        (WebCore::createInjectedScriptHostV8Wrapper):
+
 2010-02-05  Siddharth Mathur  <siddharth.mathur at nokia.com>
 
         Reviewed by Ariya Hidayat.
diff --git a/WebCore/bindings/scripts/CodeGeneratorV8.pm b/WebCore/bindings/scripts/CodeGeneratorV8.pm
index 3862638..1beda7b 100644
--- a/WebCore/bindings/scripts/CodeGeneratorV8.pm
+++ b/WebCore/bindings/scripts/CodeGeneratorV8.pm
@@ -337,10 +337,7 @@ END
 
     push(@headerContent, <<END);
 
- private:
   static v8::Persistent<v8::FunctionTemplate> GetTemplate();
-
-  friend class V8ClassIndex;
 };
 
   v8::Handle<v8::Value> toV8(${nativeType}*${forceNewObjectParameter});
diff --git a/WebCore/bindings/v8/V8Binding.cpp b/WebCore/bindings/v8/V8Binding.cpp
index 4379230..d7c5d97 100644
--- a/WebCore/bindings/v8/V8Binding.cpp
+++ b/WebCore/bindings/v8/V8Binding.cpp
@@ -450,7 +450,7 @@ v8::Local<v8::Signature> configureTemplate(v8::Persistent<v8::FunctionTemplate>d
     v8::Local<v8::ObjectTemplate> instance = desc->InstanceTemplate();
     instance->SetInternalFieldCount(fieldCount);
     if (parentClassIndex)
-        desc->Inherit(V8DOMWrapper::getTemplate(parentClassIndex));
+        desc->Inherit(V8ClassIndex::getTemplate(parentClassIndex));
     if (attributeCount)
         batchConfigureAttributes(instance, desc->PrototypeTemplate(),
                                  attributes, attributeCount);
diff --git a/WebCore/bindings/v8/V8DOMWrapper.cpp b/WebCore/bindings/v8/V8DOMWrapper.cpp
index a715160..2801c04 100644
--- a/WebCore/bindings/v8/V8DOMWrapper.cpp
+++ b/WebCore/bindings/v8/V8DOMWrapper.cpp
@@ -164,20 +164,6 @@ void V8DOMWrapper::setJSWrapperForDOMNode(Node* node, v8::Persistent<v8::Object>
     getDOMNodeMap().set(node, wrapper);
 }
 
-v8::Persistent<v8::FunctionTemplate> V8DOMWrapper::getTemplate(V8ClassIndex::V8WrapperType type)
-{
-    v8::Persistent<v8::FunctionTemplate>* cacheCell = V8ClassIndex::GetCache(type);
-    if (!cacheCell->IsEmpty())
-        return *cacheCell;
-
-    // Not in the cache.
-    FunctionTemplateFactory factory = V8ClassIndex::GetFactory(type);
-    v8::Persistent<v8::FunctionTemplate> descriptor = factory();
-
-    *cacheCell = descriptor;
-    return descriptor;
-}
-
 v8::Local<v8::Function> V8DOMWrapper::getConstructor(V8ClassIndex::V8WrapperType type, v8::Handle<v8::Value> objectPrototype)
 {
     // A DOM constructor is a function instance created from a DOM constructor
@@ -189,7 +175,7 @@ v8::Local<v8::Function> V8DOMWrapper::getConstructor(V8ClassIndex::V8WrapperType
     // The reason for 2) is that, in Safari, a DOM constructor is a normal JS
     // object, but not a function. Hotmail relies on the fact that, in Safari,
     // HTMLElement.__proto__ == Object.prototype.
-    v8::Handle<v8::FunctionTemplate> functionTemplate = getTemplate(type);
+    v8::Handle<v8::FunctionTemplate> functionTemplate = V8ClassIndex::getTemplate(type);
     // Getting the function might fail if we're running out of
     // stack or memory.
     v8::TryCatch tryCatch;
@@ -295,7 +281,7 @@ v8::Local<v8::Object> V8DOMWrapper::instantiateV8Object(V8Proxy* proxy, V8ClassI
         // FIXME: Fix this to work properly with isolated worlds (see above).
         instance = proxy->windowShell()->createWrapperFromCache(type);
     else {
-        v8::Local<v8::Function> function = getTemplate(type)->GetFunction();
+        v8::Local<v8::Function> function = V8ClassIndex::getTemplate(type)->GetFunction();
         instance = SafeAllocation::newInstance(function);
     }
     if (!instance.IsEmpty()) {
diff --git a/WebCore/bindings/v8/V8DOMWrapper.h b/WebCore/bindings/v8/V8DOMWrapper.h
index 51abff7..748a45a 100644
--- a/WebCore/bindings/v8/V8DOMWrapper.h
+++ b/WebCore/bindings/v8/V8DOMWrapper.h
@@ -119,7 +119,7 @@ namespace WebCore {
 
         static v8::Handle<v8::Object> lookupDOMWrapper(V8ClassIndex::V8WrapperType type, v8::Handle<v8::Object> object)
         {
-            return object.IsEmpty() ? object : object->FindInstanceInPrototypeChain(getTemplate(type));
+            return object.IsEmpty() ? object : object->FindInstanceInPrototypeChain(V8ClassIndex::getTemplate(type));
         }
 
         static V8ClassIndex::V8WrapperType domWrapperType(v8::Handle<v8::Object>);
@@ -169,7 +169,6 @@ namespace WebCore {
         // Wrap JS node filter in C++.
         static PassRefPtr<NodeFilter> wrapNativeNodeFilter(v8::Handle<v8::Value>);
 
-        static v8::Persistent<v8::FunctionTemplate> getTemplate(V8ClassIndex::V8WrapperType);
         static v8::Local<v8::Function> getConstructorForContext(V8ClassIndex::V8WrapperType, v8::Handle<v8::Context>);
         static v8::Local<v8::Function> getConstructor(V8ClassIndex::V8WrapperType, v8::Handle<v8::Value> objectPrototype);
         static v8::Local<v8::Function> getConstructor(V8ClassIndex::V8WrapperType, DOMWindow*);
diff --git a/WebCore/bindings/v8/V8Index.cpp b/WebCore/bindings/v8/V8Index.cpp
index 5ee4a0c..f3b790f 100644
--- a/WebCore/bindings/v8/V8Index.cpp
+++ b/WebCore/bindings/v8/V8Index.cpp
@@ -464,34 +464,16 @@
 
 namespace WebCore {
 
-FunctionTemplateFactory V8ClassIndex::GetFactory(V8WrapperType type)
+v8::Persistent<v8::FunctionTemplate> V8ClassIndex::getTemplate(V8WrapperType type)
 {
     switch (type) {
 #define MAKE_CASE(type, name)\
-    case V8ClassIndex::type: return V8##name::GetTemplate;
+    case V8ClassIndex::type: return V8##name::GetTemplate();
     WRAPPER_TYPES(MAKE_CASE)
 #undef MAKE_CASE
-    default: return NULL;
-    }
-}
-
-
-#define MAKE_CACHE(type, name)\
-    static v8::Persistent<v8::FunctionTemplate> name##_cache_;
-    ALL_WRAPPER_TYPES(MAKE_CACHE)
-#undef MAKE_CACHE
-
-
-v8::Persistent<v8::FunctionTemplate>* V8ClassIndex::GetCache(V8WrapperType type)
-{
-    switch (type) {
-#define MAKE_CASE(type, name)\
-    case V8ClassIndex::type: return &name##_cache_;
-    ALL_WRAPPER_TYPES(MAKE_CASE)
-#undef MAKE_CASE
     default:
-        ASSERT(false);
-        return NULL;
+        ASSERT_NOT_REACHED();
+        return v8::Persistent<v8::FunctionTemplate>::New(v8::FunctionTemplate::New());
   }
 }
 
diff --git a/WebCore/bindings/v8/V8Index.h b/WebCore/bindings/v8/V8Index.h
index 7936794..72d06b9 100644
--- a/WebCore/bindings/v8/V8Index.h
+++ b/WebCore/bindings/v8/V8Index.h
@@ -39,8 +39,6 @@ static const int v8DOMWrapperTypeIndex = 0;
 static const int v8DOMWrapperObjectIndex = 1;
 static const int v8DefaultWrapperInternalFieldCount = 2;
 
-typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)();
-
 #if ENABLE(DATAGRID)
 #define DATAGRID_HTMLELEMENT_TYPES(V)                                   \
     V(HTMLDATAGRIDCELLELEMENT, HTMLDataGridCellElement)                 \
@@ -664,12 +662,7 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)();
             return static_cast<V8WrapperType>(v);
         }
 
-        // FIXME: Convert to getFactory after all the bindings are in one place.
-        static FunctionTemplateFactory GetFactory(V8WrapperType type);
-
-        // Returns a field to be used as cache for the template for the given type
-        // FIXME: Convert to getCache after all the bindings are in one place.
-        static v8::Persistent<v8::FunctionTemplate>* GetCache(V8WrapperType type);
+        static v8::Persistent<v8::FunctionTemplate> getTemplate(V8WrapperType type);
     };
 
 }
diff --git a/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp b/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp
index ac677a2..ad30eed 100644
--- a/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp
+++ b/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp
@@ -356,7 +356,7 @@ v8::Local<v8::Object> WorkerContextExecutionProxy::toV8(V8ClassIndex::V8WrapperT
     if (proxy)
         function = V8DOMWrapper::getConstructor(descriptorType, proxy->workerContext());
     else
-        function = V8DOMWrapper::getTemplate(descriptorType)->GetFunction();
+        function = V8ClassIndex::getTemplate(descriptorType)->GetFunction();
 
     v8::Local<v8::Object> instance = SafeAllocation::newInstance(function);
     if (!instance.IsEmpty())
diff --git a/WebCore/bindings/v8/custom/V8HTMLAudioElementConstructor.cpp b/WebCore/bindings/v8/custom/V8HTMLAudioElementConstructor.cpp
index da382fb..06c6c1d 100644
--- a/WebCore/bindings/v8/custom/V8HTMLAudioElementConstructor.cpp
+++ b/WebCore/bindings/v8/custom/V8HTMLAudioElementConstructor.cpp
@@ -70,7 +70,7 @@ static v8::Handle<v8::Value> v8HTMLAudioElementConstructorCallback(const v8::Arg
         audio->scheduleLoad();
     }
 
-    V8DOMWrapper::setDOMWrapper(args.Holder(), V8ClassIndex::ToInt(V8ClassIndex::NODE), audio.get());
+    V8DOMWrapper::setDOMWrapper(args.Holder(), V8ClassIndex::ToInt(V8ClassIndex::AUDIO), audio.get());
     audio->ref();
     V8DOMWrapper::setJSWrapperForDOMNode(audio.get(), v8::Persistent<v8::Object>::New(args.Holder()));
     return args.Holder();
@@ -88,7 +88,7 @@ v8::Persistent<v8::FunctionTemplate> V8HTMLAudioElementConstructor::GetTemplate(
     v8::Local<v8::ObjectTemplate> instance = result->InstanceTemplate();
     instance->SetInternalFieldCount(V8HTMLAudioElement::internalFieldCount);
     result->SetClassName(v8::String::New("HTMLAudioElement"));
-    result->Inherit(V8DOMWrapper::getTemplate(V8ClassIndex::HTMLAUDIOELEMENT));
+    result->Inherit(V8HTMLAudioElement::GetTemplate());
 
     cachedTemplate = v8::Persistent<v8::FunctionTemplate>::New(result);
     return cachedTemplate;
diff --git a/WebCore/bindings/v8/custom/V8HTMLAudioElementConstructor.h b/WebCore/bindings/v8/custom/V8HTMLAudioElementConstructor.h
index ac4b46d..711f539 100755
--- a/WebCore/bindings/v8/custom/V8HTMLAudioElementConstructor.h
+++ b/WebCore/bindings/v8/custom/V8HTMLAudioElementConstructor.h
@@ -36,10 +36,8 @@
 namespace WebCore {
 
 class V8HTMLAudioElementConstructor {
-private:
+public:
     static v8::Persistent<v8::FunctionTemplate> GetTemplate();
-
-    friend class V8ClassIndex;
 };
 
 }
diff --git a/WebCore/bindings/v8/custom/V8HTMLImageElementConstructor.cpp b/WebCore/bindings/v8/custom/V8HTMLImageElementConstructor.cpp
index 948f937..1873188 100644
--- a/WebCore/bindings/v8/custom/V8HTMLImageElementConstructor.cpp
+++ b/WebCore/bindings/v8/custom/V8HTMLImageElementConstructor.cpp
@@ -70,7 +70,7 @@ static v8::Handle<v8::Value> v8HTMLImageElementConstructorCallback(const v8::Arg
             image->setHeight(toInt32(args[1]));
     }
 
-    V8DOMWrapper::setDOMWrapper(args.Holder(), V8ClassIndex::ToInt(V8ClassIndex::NODE), image.get());
+    V8DOMWrapper::setDOMWrapper(args.Holder(), V8ClassIndex::ToInt(V8ClassIndex::IMAGE), image.get());
     image->ref();
     V8DOMWrapper::setJSWrapperForDOMNode(image.get(), v8::Persistent<v8::Object>::New(args.Holder()));
     return args.Holder();
@@ -88,7 +88,7 @@ v8::Persistent<v8::FunctionTemplate> V8HTMLImageElementConstructor::GetTemplate(
     v8::Local<v8::ObjectTemplate> instance = result->InstanceTemplate();
     instance->SetInternalFieldCount(V8HTMLImageElement::internalFieldCount);
     result->SetClassName(v8::String::New("HTMLImageElement"));
-    result->Inherit(V8DOMWrapper::getTemplate(V8ClassIndex::HTMLIMAGEELEMENT));
+    result->Inherit(V8HTMLImageElement::GetTemplate());
 
     cachedTemplate = v8::Persistent<v8::FunctionTemplate>::New(result);
     return cachedTemplate;
diff --git a/WebCore/bindings/v8/custom/V8HTMLImageElementConstructor.h b/WebCore/bindings/v8/custom/V8HTMLImageElementConstructor.h
index cdce0e0..19ee944 100755
--- a/WebCore/bindings/v8/custom/V8HTMLImageElementConstructor.h
+++ b/WebCore/bindings/v8/custom/V8HTMLImageElementConstructor.h
@@ -35,12 +35,10 @@
 
 namespace WebCore {
 
-    class V8HTMLImageElementConstructor {
-    private:
-        static v8::Persistent<v8::FunctionTemplate> GetTemplate();
-
-        friend class V8ClassIndex;
-    };
+class V8HTMLImageElementConstructor {
+public:
+    static v8::Persistent<v8::FunctionTemplate> GetTemplate();
+};
 
 }
 
diff --git a/WebCore/bindings/v8/custom/V8HTMLOptionElementConstructor.cpp b/WebCore/bindings/v8/custom/V8HTMLOptionElementConstructor.cpp
index c7cf082..3113eb5 100644
--- a/WebCore/bindings/v8/custom/V8HTMLOptionElementConstructor.cpp
+++ b/WebCore/bindings/v8/custom/V8HTMLOptionElementConstructor.cpp
@@ -86,7 +86,7 @@ static v8::Handle<v8::Value> v8HTMLOptionElementConstructorCallback(const v8::Ar
         }
     }
 
-    V8DOMWrapper::setDOMWrapper(args.Holder(), V8ClassIndex::ToInt(V8ClassIndex::NODE), option.get());
+    V8DOMWrapper::setDOMWrapper(args.Holder(), V8ClassIndex::ToInt(V8ClassIndex::OPTION), option.get());
     option->ref();
     V8DOMWrapper::setJSWrapperForDOMNode(option.get(), v8::Persistent<v8::Object>::New(args.Holder()));
     return args.Holder();
@@ -104,7 +104,7 @@ v8::Persistent<v8::FunctionTemplate> V8HTMLOptionElementConstructor::GetTemplate
     v8::Local<v8::ObjectTemplate> instance = result->InstanceTemplate();
     instance->SetInternalFieldCount(V8HTMLOptionElement::internalFieldCount);
     result->SetClassName(v8::String::New("HTMLOptionElement"));
-    result->Inherit(V8DOMWrapper::getTemplate(V8ClassIndex::HTMLOPTIONELEMENT));
+    result->Inherit(V8HTMLOptionElement::GetTemplate());
 
     cachedTemplate = v8::Persistent<v8::FunctionTemplate>::New(result);
     return cachedTemplate;
diff --git a/WebCore/bindings/v8/custom/V8HTMLOptionElementConstructor.h b/WebCore/bindings/v8/custom/V8HTMLOptionElementConstructor.h
index 70076a5..905a745 100755
--- a/WebCore/bindings/v8/custom/V8HTMLOptionElementConstructor.h
+++ b/WebCore/bindings/v8/custom/V8HTMLOptionElementConstructor.h
@@ -35,12 +35,10 @@
 
 namespace WebCore {
 
-    class V8HTMLOptionElementConstructor {
-    private:
-        static v8::Persistent<v8::FunctionTemplate> GetTemplate();
-
-        friend class V8ClassIndex;
-    };
+class V8HTMLOptionElementConstructor {
+public:
+    static v8::Persistent<v8::FunctionTemplate> GetTemplate();
+};
 
 }
 
diff --git a/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp b/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp
index 942b017..054f9ba 100644
--- a/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp
@@ -60,7 +60,7 @@ static void WeakReferenceCallback(v8::Persistent<v8::Value> object, void* parame
 static v8::Local<v8::Object> createInjectedScriptHostV8Wrapper(InjectedScriptHost* host)
 {
     V8ClassIndex::V8WrapperType descriptorType = V8ClassIndex::INJECTEDSCRIPTHOST;
-    v8::Local<v8::Function> function = V8DOMWrapper::getTemplate(descriptorType)->GetFunction();
+    v8::Local<v8::Function> function = V8InjectedScriptHost::GetTemplate()->GetFunction();
     if (function.IsEmpty()) {
         // Return if allocation failed.
         return v8::Local<v8::Object>();
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 607c4fb..72dd915 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-05  Nate Chapin  <japhet at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Update code for getting a v8::FunctionTemplate.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34606
+
+        * src/WebDevToolsAgentImpl.cpp:
+        (WebKit::WebDevToolsAgentImpl::createInspectorBackendV8Wrapper):
+
 2010-02-05  Mikhail Naganov  <mnaganov at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebKit/chromium/src/WebDevToolsAgentImpl.cpp b/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
index 9d386f3..4b60f7f 100644
--- a/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
+++ b/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
@@ -52,6 +52,7 @@
 #include "ScriptState.h"
 #include "ScriptValue.h"
 #include "V8Binding.h"
+#include "V8InspectorBackend.h"
 #include "V8Proxy.h"
 #include "V8Utilities.h"
 #include "WebDataSource.h"
@@ -87,6 +88,7 @@ using WebCore::ScriptValue;
 using WebCore::String;
 using WebCore::V8ClassIndex;
 using WebCore::V8DOMWrapper;
+using WebCore::V8InspectorBackend;
 using WebCore::V8Proxy;
 
 namespace WebKit {
@@ -351,7 +353,7 @@ void WebDevToolsAgentImpl::initDevToolsAgentHost()
 v8::Local<v8::Object> WebDevToolsAgentImpl::createInspectorBackendV8Wrapper()
 {
     V8ClassIndex::V8WrapperType descriptorType = V8ClassIndex::INSPECTORBACKEND;
-    v8::Handle<v8::Function> function = V8DOMWrapper::getTemplate(descriptorType)->GetFunction();
+    v8::Handle<v8::Function> function = V8InspectorBackend::GetTemplate()->GetFunction();
     if (function.IsEmpty()) {
         // Return if allocation failed.
         return v8::Local<v8::Object>();

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list