Changeset 150628 in webkit

Timestamp:

May 23, 2013 11:23:20 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Need to forward the opener frame url to client when creating a new window
​https://bugs.webkit.org/show_bug.cgi?id=116566

Patch by Andy Chen <​andchen@blackberry.com> on 2013-05-23
Reviewed by Rob Buis.

PR 337935
Internally reviewed by Arvid Nilsson.
When creating a new window, forward the opener frame url to client.

• Api/WebPageClient.h:
• WebCoreSupport/ChromeClientBlackBerry.cpp:

(WebCore::ChromeClientBlackBerry::createWindow):

• WebCoreSupport/FrameLoaderClientBlackBerry.cpp:

(WebCore::FrameLoaderClientBlackBerry::dispatchCreatePage):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebPageClient.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• WebCoreSupport/ChromeClientBlackBerry.cpp (modified) (1 diff)
• WebCoreSupport/FrameLoaderClientBlackBerry.cpp (modified) (1 diff)

trunk/Source/WebKit/blackberry/Api/WebPageClient.h

@@ -172 +172 @@
     virtual bool chooseFilenames(bool allowMultiple, const SharedArray<BlackBerry::Platform::String>& acceptTypes, const SharedArray<BlackBerry::Platform::String>& initialFiles, const BlackBerry::Platform::String& capture, SharedArray<BlackBerry::Platform::String>& chosenFiles) = 0;
 
-    virtual WebPage* createWindow(int x, int y, int width, int height, unsigned flags, const BlackBerry::Platform::String& url, const BlackBerry::Platform::String& windowName, bool userGesture) = 0;
+    virtual WebPage* createWindow(int x, int y, int width, int height, unsigned flags, const BlackBerry::Platform::String& url, const BlackBerry::Platform::String& windowName, const BlackBerry::Platform::String& openerFrameUrl, bool userGesture) = 0;
 
     virtual void scheduleCloseWindow() = 0;

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-05-23  Andy Chen  <andchen@blackberry.com>
+
+        [BlackBerry] Need to forward the opener frame url to client when creating a new window
+        https://bugs.webkit.org/show_bug.cgi?id=116566
+
+        Reviewed by Rob Buis.
+
+        PR 337935
+        Internally reviewed by Arvid Nilsson.
+        When creating a new window, forward the opener frame url to client.
+
+        * Api/WebPageClient.h:
+        * WebCoreSupport/ChromeClientBlackBerry.cpp:
+        (WebCore::ChromeClientBlackBerry::createWindow):
+        * WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
+        (WebCore::FrameLoaderClientBlackBerry::dispatchCreatePage):
+
 2013-05-23  Jakob Petsovits  <jpetsovits@blackberry.com>
 

trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp

@@ -257 +257 @@
         flags |= WebPageClient::FlagWindowIsDialog;
 
-    WebPage* webPage = m_webPagePrivate->m_client->createWindow(x, y, width, height, flags, url.string(), request.frameName(), ScriptController::processingUserGesture());
+    WebPage* webPage = m_webPagePrivate->m_client->createWindow(x, y, width, height, flags, url.string(), request.frameName(), frame->document()->url().string(), ScriptController::processingUserGesture());
     if (!webPage)
         return 0;

trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp

@@ -943 +943 @@
 Frame* FrameLoaderClientBlackBerry::dispatchCreatePage(const NavigationAction& navigation)
 {
-    WebPage* webPage = m_webPagePrivate->m_client->createWindow(0, 0, -1, -1, WebPageClient::FlagWindowDefault, navigation.url().string(), BlackBerry::Platform::String::emptyString(), ScriptController::processingUserGesture());
+    WebPage* webPage = m_webPagePrivate->m_client->createWindow(0, 0, -1, -1, WebPageClient::FlagWindowDefault, navigation.url().string(), BlackBerry::Platform::String::emptyString(), m_frame->document()->url().string(), ScriptController::processingUserGesture());
     if (!webPage)
         return 0;