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

WebKit/chromium/public/WebFrameClient.h

 /*
  * Copyright (C) 2010 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 283 matching lines @@
     // frame context.
     virtual void didCreateScriptContext(WebFrame*) { }
 
     // Notifies that this frame's script context has been destroyed.
     virtual void didDestroyScriptContext(WebFrame*) { }
 
     // Notifies that a garbage-collected context was created - content
     // scripts.
     virtual void didCreateIsolatedScriptContext(WebFrame*) { }
 
+    // Controls whether the given script extension should run in a new script
+    // context in this frame. If extensionGroup is 0, the script context is the
+    // frame's main context. Otherwise, it is a context created by
+    // WebFrame::executeScriptInIsolatedWorld with that same extensionGroup
+    // value.
+    virtual bool allowScriptExtension(WebFrame*, const WebString& extensionName, int extensionGroup) { return true; }
+
 
     // Geometry notifications ----------------------------------------------
 
     // The frame's document finished the initial layout of a page.
     virtual void didFirstLayout(WebFrame*) { }
 
     // The frame's document finished the initial non-empty layout of a page.
     virtual void didFirstVisuallyNonEmptyLayout(WebFrame*) { }
 
     // The size of the content area changed.
@@ skipping 33 matching lines @@
         WebFrame*, WebFileSystem::Type, long long size,
         WebFileSystemCallbacks*) { }
 
 protected:
     ~WebFrameClient() { }
 };
 
 } // namespace WebKit
 
 #endif