Chrome-side of fixes for content-script messaging.

webkit/glue/webframeloaderclient_impl.h

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_GLUE_WEBFRAMELOADERCLIENT_IMPL_H__
 #define WEBKIT_GLUE_WEBFRAMELOADERCLIENT_IMPL_H__
 
 #include "base/compiler_specific.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
@@ skipping 31 matching lines @@
   // WebCore::FrameLoaderClient ----------------------------------------------
 
   virtual void frameLoaderDestroyed();
 
   // Notifies the WebView delegate that the JS window object has been cleared,
   // giving it a chance to bind native objects to the window before script
   // parsing begins.
   virtual void windowObjectCleared();
   virtual void documentElementAvailable();
 
-  virtual void didCreateScriptContext();
-  virtual void didDestroyScriptContext();
+  // TODO(mpcomplete): remove these when we pick up webkit r45871
+  virtual void didCreateScriptContext() { didCreateScriptContextForFrame(); }
+  virtual void didDestroyScriptContext() { didDestroyScriptContextForFrame(); }
+
+  // A frame's V8 context was created or destroyed.
+  virtual void didCreateScriptContextForFrame();
+  virtual void didDestroyScriptContextForFrame();
+
+  // A context untied to a frame was created (through evaluateInNewContext).
+  // This context is not tied to the lifetime of its frame, and is destroyed
+  // in garbage collection.
+  virtual void didCreateIsolatedScriptContext();
 
   virtual bool hasWebView() const; // mainly for assertions
   virtual bool hasFrameView() const; // ditto
 
   virtual void makeRepresentation(WebCore::DocumentLoader*);
   virtual void forceLayout();
   virtual void forceLayoutForNonHTML();
 
   virtual void setCopiesOnScroll();
 
@@ skipping 192 matching lines @@
 
   // Indicates if we need to send over the initial notification to the plugin
   // which specifies that the plugin should be ready to accept data.
   bool sent_initial_response_to_plugin_;
 
   // The disposition to use for the next call to dispatchCreatePage.
   WindowOpenDisposition next_window_open_disposition_;
 };
 
 #endif  // #ifndef WEBKIT_GLUE_WEBFRAMELOADERCLIENT_IMPL_H__