Merge WebKit at r73109: Initial merge by git.

[android-x86/external-webkit.git] / WebCore / bindings / v8 / V8Proxy.h

diff --git a/WebCore/bindings/v8/V8Proxy.h b/WebCore/bindings/v8/V8Proxy.h
index bc5e526..34e80e1 100644 (file)
--- a/WebCore/bindings/v8/V8Proxy.h
+++ b/WebCore/bindings/v8/V8Proxy.h
@@ -58,7 +58,6 @@ namespace WebCore {
     class DOMWindow;
     class Frame;
     class Node;
-    class SVGElement;
     class ScriptExecutionContext;
     class V8EventListener;
     class V8IsolatedContext;
@@ -159,40 +158,6 @@ namespace WebCore {
         // and clears all timeouts on the DOM window.
         void disconnectFrame();
 
-#if ENABLE(SVG)
-        static void setSVGContext(void*, SVGElement*);
-        static SVGElement* svgContext(void*);
-
-        // These helper functions are required in case we are given a PassRefPtr
-        // to a (possibly) newly created object and must prevent its reference
-        // count from dropping to zero as would happen in code like
-        //
-        //   V8Proxy::setSVGContext(imp->getNewlyCreatedObject().get(), context);
-        //   foo(imp->getNewlyCreatedObject().get());
-        //
-        // In the above two lines each time getNewlyCreatedObject() is called it
-        // creates a new object because we don't ref() it. (So our attemts to
-        // associate a context with it fail.) Such code should be rewritten to
-        //
-        //   foo(V8Proxy::withSVGContext(imp->getNewlyCreatedObject(), context).get());
-        //
-        // where PassRefPtr::~PassRefPtr() is invoked only after foo() is
-        // called.
-        template <typename T>
-        static PassRefPtr<T> withSVGContext(PassRefPtr<T> object, SVGElement* context)
-        {
-            setSVGContext(object.get(), context);
-            return object;
-        }
-
-        template <typename T>
-        static T* withSVGContext(T* object, SVGElement* context)
-        {
-            setSVGContext(object, context);
-            return object;
-        }
-#endif
-
         void finishedWithEvent(Event*) { }
 
         // Evaluate JavaScript in a new isolated world. The script gets its own
@@ -283,7 +248,7 @@ namespace WebCore {
 
         static v8::Handle<v8::Value> checkNewLegal(const v8::Arguments&);
 
-        static v8::Handle<v8::Script> compileScript(v8::Handle<v8::String> code, const String& fileName, int baseLine, v8::ScriptData* = 0);
+        static v8::Handle<v8::Script> compileScript(v8::Handle<v8::String> code, const String& fileName, const TextPosition0& scriptStartPosition, v8::ScriptData* = 0);
 
 #ifdef ANDROID_INSTRUMENT
         static v8::Handle<v8::Script> compileScriptInternal(v8::Handle<v8::String> code, const String& fileName, int baseLine, v8::ScriptData* scriptData);