Merge 68061 - 2010-09-22 Matt Perry <mpcomplete@chromium.org>...

WebCore/bindings/v8/V8Proxy.h

Index: WebCore/bindings/v8/V8Proxy.h
===================================================================
--- WebCore/bindings/v8/V8Proxy.h	(revision 68288)
+++ WebCore/bindings/v8/V8Proxy.h	(working copy)
@@ -128,6 +128,7 @@
         String scheme;
         int group;
         v8::Extension* extension;
+        bool useCallback; // FIXME: remove
     };
     typedef WTF::Vector<V8ExtensionInfo> V8Extensions;
 
@@ -329,6 +330,11 @@
         static void registerExtension(v8::Extension*, const String& schemeRestriction);
         static void registerExtension(v8::Extension*, int extensionGroup);
 
+        // Same as above, but new version.
+        // FIXME: remove the other 2 versions in phase 3 of multipart checkin:
+        // https://bugs.webkit.org/show_bug.cgi?id=45721
+        static void registerExtension(v8::Extension*);
+
         static void registerExtensionWithV8(v8::Extension*);
         static bool registeredExtensionWithV8(v8::Extension*);