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

WebKit/chromium/public/WebScriptController.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 33 matching lines @@
 class WebScriptController {
 public:
     // Registers a v8 extension to be available on webpages. The three 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 WebFrame::ExecuteInNewWorld with the
     // matching group.
     // Will only affect v8 contexts initialized after this call. Takes ownership
     // of the v8::Extension object passed.
+    // FIXME: remove the latter 2 versions in phase 3 of multipart checkin:
+    // https://bugs.webkit.org/show_bug.cgi?id=45721
     WEBKIT_API static void registerExtension(v8::Extension*);
     WEBKIT_API static void registerExtension(v8::Extension*,
                                              const WebString& schemeRestriction);
     WEBKIT_API static void registerExtension(v8::Extension*, int extensionGroup);
 
     // Enables special settings which are only applicable if V8 is executed
     // in the single thread which must be the main thread.
     // FIXME: make a try to dynamically detect when this condition is broken
     // and automatically switch off single thread mode.
     WEBKIT_API static void enableV8SingleThreadMode();
 
     // Process any pending JavaScript console messages.
     WEBKIT_API static void flushConsoleMessages();
 
 private:
     WebScriptController();
 };
 
 } // namespace WebKit
 
 #endif