From bec39347bb3bb5bf1187ccaf471d26247f28b585 Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Thu, 30 Sep 2010 15:42:16 +0100
Subject: Merge WebKit at r68651 : Initial merge by git.

Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
---
 WebCore/loader/FrameLoaderClient.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'WebCore/loader/FrameLoaderClient.h')

diff --git a/WebCore/loader/FrameLoaderClient.h b/WebCore/loader/FrameLoaderClient.h
index 427b81e..803eb11 100644
--- a/WebCore/loader/FrameLoaderClient.h
+++ b/WebCore/loader/FrameLoaderClient.h
@@ -64,6 +64,7 @@ namespace WebCore {
     class IntSize;
     class KURL;
     class NavigationAction;
+    class Page;
     class ProtectionSpace;
     class PluginView;
     class PolicyChecker;
@@ -229,7 +230,7 @@ namespace WebCore {
 
         virtual PassRefPtr<Frame> createFrame(const KURL& url, const String& name, HTMLFrameOwnerElement* ownerElement,
                                    const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) = 0;
-        virtual void didTransferChildFrameToNewDocument() = 0;
+        virtual void didTransferChildFrameToNewDocument(Page* oldPage) = 0;
         virtual PassRefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManually) = 0;
         virtual void redirectDataToPlugin(Widget* pluginWidget) = 0;
 
@@ -253,6 +254,7 @@ namespace WebCore {
         virtual void didCreateScriptContextForFrame() = 0;
         virtual void didDestroyScriptContextForFrame() = 0;
         virtual void didCreateIsolatedScriptContext() = 0;
+        virtual bool allowScriptExtension(const String& extensionName, int extensionGroup) = 0;
 #endif
 
         virtual void registerForIconNotification(bool listen = true) = 0;
-- 
cgit v1.1