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

WebCore/bindings/v8/V8Proxy.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  * 
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 110 matching lines @@
 
     // Information about an extension that is registered for use with V8. If
     // scheme is non-empty, it contains the URL scheme the extension should be
     // used with. If group is non-zero, the extension will only be loaded into
     // script contexts that belong to that group. Otherwise, the extension is
     // used with all schemes and contexts.
     struct V8ExtensionInfo {
         String scheme;
         int group;
         v8::Extension* extension;
+        bool useCallback; // FIXME: remove
     };
     typedef WTF::Vector<V8ExtensionInfo> V8Extensions;
 
     class V8Proxy {
     public:
         // The types of javascript errors that can be thrown.
         enum ErrorType {
             RangeError,
             ReferenceError,
             SyntaxError,
@@ skipping 181 matching lines @@
         // Registers a v8 extension to be available on webpages. The two forms
         // offer various restrictions on what types of contexts the extension is
         // loaded into. If a scheme is provided, only pages whose URL has the given
         // scheme will match. If extensionGroup is provided, the extension will
         // only be loaded into scripts run via evaluateInNewWorld with the
         // matching group.  Will only affect v8 contexts initialized after this
         // call. Takes ownership of the v8::Extension object passed.
         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*);
 
         static const V8Extensions& extensions() { return m_extensions; }
 
         // Report an unsafe attempt to access the given frame on the console.
         static void reportUnsafeAccessTo(Frame* target, DelayReporting delay);
 
     private:
         void didLeaveScriptContext();
@@ skipping 129 matching lines @@
     template <class T> inline v8::Handle<v8::Object> toV8(PassRefPtr<T> object, v8::Local<v8::Object> holder)
     {
         object->ref();
         V8DOMWrapper::setJSWrapperForDOMObject(object.get(), v8::Persistent<v8::Object>::New(holder));
         return holder;
     }
 
 }
 
 #endif // V8Proxy_h