- Revision
- 150628
- Author
- commit-qu...@webkit.org
- Date
- 2013-05-23 23:23:20 -0700 (Thu, 23 May 2013)
Log 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 <andc...@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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/WebPageClient.h (150627 => 150628)
--- trunk/Source/WebKit/blackberry/Api/WebPageClient.h 2013-05-24 06:20:19 UTC (rev 150627)
+++ trunk/Source/WebKit/blackberry/Api/WebPageClient.h 2013-05-24 06:23:20 UTC (rev 150628)
@@ -171,7 +171,7 @@
virtual void openPopupList(bool multiple, int size, const ScopeArray<BlackBerry::Platform::String>& labels, const bool* enableds, const int* itemType, const bool* selecteds) = 0;
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;
Modified: trunk/Source/WebKit/blackberry/ChangeLog (150627 => 150628)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-05-24 06:20:19 UTC (rev 150627)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-05-24 06:23:20 UTC (rev 150628)
@@ -1,3 +1,20 @@
+2013-05-23 Andy Chen <andc...@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 <jpetsov...@blackberry.com>
[BlackBerry] Compositor API change: Don't pass the unused "viewport" parameter.
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp (150627 => 150628)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp 2013-05-24 06:20:19 UTC (rev 150627)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp 2013-05-24 06:23:20 UTC (rev 150628)
@@ -256,7 +256,7 @@
if (features.dialog)
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;
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp (150627 => 150628)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp 2013-05-24 06:20:19 UTC (rev 150627)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp 2013-05-24 06:23:20 UTC (rev 150628)
@@ -942,7 +942,7 @@
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;
