Title: [104427] trunk/Source/WebCore
- Revision
- 104427
- Author
- leo.y...@torchmobile.com.cn
- Date
- 2012-01-08 18:50:32 -0800 (Sun, 08 Jan 2012)
Log Message
[BlackBerry] Use the concrete FrameNetworkingContextBlackBerry to access Frame
https://bugs.webkit.org/show_bug.cgi?id=75611
Reviewed by Antonio Gomes.
In platform/network/blackberry/ResourceHandleBlackBerry.cpp, we were using
NetworkingContext::wrappedFrame() to access the frame associated with the
networking context. NetworkingContext::wrappedFrame() was added as a virtual
function by the BlackBerry porting internally. It's unnecessary because
FrameNetworkingContextBlackBerry inherits from FrameNetworkingContext which
has a protected frame() member which is exported as public in
FrameNetworkingContextBlackBerry. We don't want to upstream wrappedFrame()
as a specific change of the BlackBerry porting in
platform/network/NetworkingContext.h, so use the concrete networking context
FrameNetworkingContextBlackBerry to access the associated frame.
No functionalities changed, no new tests.
* platform/network/blackberry/ResourceHandleBlackBerry.cpp:
(WebCore::ResourceHandle::start):
(WebCore::ResourceHandle::loadResourceSynchronously):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (104426 => 104427)
--- trunk/Source/WebCore/ChangeLog 2012-01-09 02:41:12 UTC (rev 104426)
+++ trunk/Source/WebCore/ChangeLog 2012-01-09 02:50:32 UTC (rev 104427)
@@ -1,3 +1,27 @@
+2012-01-08 Leo Yang <leo.y...@torchmobile.com.cn>
+
+ [BlackBerry] Use the concrete FrameNetworkingContextBlackBerry to access Frame
+ https://bugs.webkit.org/show_bug.cgi?id=75611
+
+ Reviewed by Antonio Gomes.
+
+ In platform/network/blackberry/ResourceHandleBlackBerry.cpp, we were using
+ NetworkingContext::wrappedFrame() to access the frame associated with the
+ networking context. NetworkingContext::wrappedFrame() was added as a virtual
+ function by the BlackBerry porting internally. It's unnecessary because
+ FrameNetworkingContextBlackBerry inherits from FrameNetworkingContext which
+ has a protected frame() member which is exported as public in
+ FrameNetworkingContextBlackBerry. We don't want to upstream wrappedFrame()
+ as a specific change of the BlackBerry porting in
+ platform/network/NetworkingContext.h, so use the concrete networking context
+ FrameNetworkingContextBlackBerry to access the associated frame.
+
+ No functionalities changed, no new tests.
+
+ * platform/network/blackberry/ResourceHandleBlackBerry.cpp:
+ (WebCore::ResourceHandle::start):
+ (WebCore::ResourceHandle::loadResourceSynchronously):
+
2012-01-08 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r104421.
Modified: trunk/Source/WebCore/platform/network/blackberry/ResourceHandleBlackBerry.cpp (104426 => 104427)
--- trunk/Source/WebCore/platform/network/blackberry/ResourceHandleBlackBerry.cpp 2012-01-09 02:41:12 UTC (rev 104426)
+++ trunk/Source/WebCore/platform/network/blackberry/ResourceHandleBlackBerry.cpp 2012-01-09 02:50:32 UTC (rev 104427)
@@ -22,6 +22,7 @@
#include "EventLoop.h"
#include "Frame.h"
#include "FrameLoaderClientBlackBerry.h"
+#include "FrameNetworkingContextBlackBerry.h"
#include "NetworkManager.h"
#include "NotImplemented.h"
#include "Page.h"
@@ -112,7 +113,7 @@
return false;
// FIXME: clean up use of Frame now that we have NetworkingContext (see RIM Bug #1515)
- Frame* frame = context->wrappedFrame();
+ Frame* frame = static_cast<FrameNetworkingContextBlackBerry*>(context)->frame();
if (!frame || !frame->loader() || !frame->loader()->client() || !client())
return false;
int playerId = static_cast<FrameLoaderClientBlackBerry*>(frame->loader()->client())->playerId();
@@ -144,7 +145,7 @@
}
// FIXME: clean up use of Frame now that we have NetworkingContext (see RIM Bug #1515)
- Frame* frame = context->wrappedFrame();
+ Frame* frame = static_cast<FrameNetworkingContextBlackBerry*>(context)->frame();
if (!frame || !frame->loader() || !frame->loader()->client() || !frame->page()) {
ASSERT(false && "loadResourceSynchronously called without a frame or frame client");
return;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
