Chrome-side of fixes for content-script messaging.

webkit/glue/webframeloaderclient_impl.h

Index: webkit/glue/webframeloaderclient_impl.h
diff --git a/webkit/glue/webframeloaderclient_impl.h b/webkit/glue/webframeloaderclient_impl.h
index 98118dd31e24b5721e6e906726117bd0852a5cf9..8532f55c2569281fc6450ca474b3c8a797b9bb57 100644
--- a/webkit/glue/webframeloaderclient_impl.h
+++ b/webkit/glue/webframeloaderclient_impl.h
@@ -49,8 +49,18 @@ class WebFrameLoaderClient : public WebCore::FrameLoaderClient {
   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