Modified: trunk/Source/WebCore/ChangeLog (116417 => 116418)
--- trunk/Source/WebCore/ChangeLog 2012-05-08 14:00:31 UTC (rev 116417)
+++ trunk/Source/WebCore/ChangeLog 2012-05-08 14:02:35 UTC (rev 116418)
@@ -1,3 +1,26 @@
+2012-05-08 Chris Guan <[email protected]>
+
+ [Blackberry] remove m_isRequestedByPlugin in ResourceRequest
+ https://bugs.webkit.org/show_bug.cgi?id=84559
+
+ Reviewed by Antonio Gomes.
+
+ ResourceRequest is a network level abstraction, and it should
+ not know anything about web concepts such as plug-ins, and Blackberry
+ does not need m_isRequestedByPlugin any longer, So clean up all related
+ code.
+
+ Tested on a website of http://edition.cnn.com, a new window should be
+ opened only when user has a singe tap gesture on a plugin element.
+
+ * platform/network/blackberry/ResourceRequest.h:
+ (WebCore::ResourceRequest::ResourceRequest):
+ (ResourceRequest):
+ (CrossThreadResourceRequestData):
+ * platform/network/blackberry/ResourceRequestBlackBerry.cpp:
+ (WebCore::ResourceRequest::doPlatformCopyData):
+ (WebCore::ResourceRequest::doPlatformAdopt):
+
2012-05-03 Alexander Pavlov <[email protected]>
Extra line-breaks added when copying from source.
Modified: trunk/Source/WebCore/platform/network/blackberry/ResourceRequest.h (116417 => 116418)
--- trunk/Source/WebCore/platform/network/blackberry/ResourceRequest.h 2012-05-08 14:00:31 UTC (rev 116417)
+++ trunk/Source/WebCore/platform/network/blackberry/ResourceRequest.h 2012-05-08 14:02:35 UTC (rev 116418)
@@ -55,7 +55,6 @@
: ResourceRequestBase(KURL(ParsedURLString, url), UseProtocolCachePolicy)
, m_isXMLHTTPRequest(false)
, m_mustHandleInternally(false)
- , m_isRequestedByPlugin(false)
, m_forceDownload(false)
, m_targetType(TargetIsUnspecified)
{
@@ -65,7 +64,6 @@
: ResourceRequestBase(url, UseProtocolCachePolicy)
, m_isXMLHTTPRequest(false)
, m_mustHandleInternally(false)
- , m_isRequestedByPlugin(false)
, m_forceDownload(false)
, m_targetType(TargetIsUnspecified)
{
@@ -75,7 +73,6 @@
: ResourceRequestBase(url, policy)
, m_isXMLHTTPRequest(false)
, m_mustHandleInternally(false)
- , m_isRequestedByPlugin(false)
, m_forceDownload(false)
, m_targetType(TargetIsUnspecified)
{
@@ -86,7 +83,6 @@
: ResourceRequestBase(KURL(), UseProtocolCachePolicy)
, m_isXMLHTTPRequest(false)
, m_mustHandleInternally(false)
- , m_isRequestedByPlugin(false)
, m_forceDownload(false)
, m_targetType(TargetIsUnspecified)
{
@@ -107,9 +103,6 @@
void setIsXMLHTTPRequest(bool isXMLHTTPRequest) { m_isXMLHTTPRequest = isXMLHTTPRequest; }
bool isXMLHTTPRequest() const { return m_isXMLHTTPRequest; }
- void setIsRequestedByPlugin(bool isRequestedByPlugin) { m_isRequestedByPlugin = isRequestedByPlugin; }
- bool isRequestedByPlugin() const { return m_isRequestedByPlugin; }
-
// Marks requests which must be handled by webkit even if LinksHandledExternally is set.
void setMustHandleInternally(bool mustHandleInternally) { m_mustHandleInternally = mustHandleInternally; }
bool mustHandleInternally() const { return m_mustHandleInternally; }
@@ -138,7 +131,6 @@
String m_suggestedSaveName;
bool m_isXMLHTTPRequest;
bool m_mustHandleInternally;
- bool m_isRequestedByPlugin;
bool m_forceDownload;
TargetType m_targetType;
@@ -156,7 +148,6 @@
String m_suggestedSaveName;
bool m_isXMLHTTPRequest;
bool m_mustHandleInternally;
- bool m_isRequestedByPlugin;
bool m_forceDownload;
ResourceRequest::TargetType m_targetType;
};
Modified: trunk/Source/WebCore/platform/network/blackberry/ResourceRequestBlackBerry.cpp (116417 => 116418)
--- trunk/Source/WebCore/platform/network/blackberry/ResourceRequestBlackBerry.cpp 2012-05-08 14:00:31 UTC (rev 116417)
+++ trunk/Source/WebCore/platform/network/blackberry/ResourceRequestBlackBerry.cpp 2012-05-08 14:02:35 UTC (rev 116418)
@@ -238,7 +238,6 @@
data->m_suggestedSaveName = m_suggestedSaveName;
data->m_isXMLHTTPRequest = m_isXMLHTTPRequest;
data->m_mustHandleInternally = m_mustHandleInternally;
- data->m_isRequestedByPlugin = m_isRequestedByPlugin;
data->m_forceDownload = m_forceDownload;
data->m_targetType = m_targetType;
return data;
@@ -252,7 +251,6 @@
m_suggestedSaveName = data->m_suggestedSaveName;
m_isXMLHTTPRequest = data->m_isXMLHTTPRequest;
m_mustHandleInternally = data->m_mustHandleInternally;
- m_isRequestedByPlugin = data->m_isRequestedByPlugin;
m_forceDownload = data->m_forceDownload;
m_targetType = data->m_targetType;
}
Modified: trunk/Source/WebKit/blackberry/ChangeLog (116417 => 116418)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-05-08 14:00:31 UTC (rev 116417)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-05-08 14:02:35 UTC (rev 116418)
@@ -1,3 +1,13 @@
+2012-05-08 Chris Guan <[email protected]>
+
+ [Blackberry] remove m_isRequestedByPlugin in ResourceRequest
+ https://bugs.webkit.org/show_bug.cgi?id=84559
+
+ Reviewed by Antonio Gomes.
+
+ * WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
+ (WebCore::FrameLoaderClientBlackBerry::dispatchDecidePolicyForNewWindowAction):
+
2012-05-08 Jonathan Dong <[email protected]>
[BlackBerry] AutofillManager implementation upstream
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp (116417 => 116418)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp 2012-05-08 14:00:31 UTC (rev 116417)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp 2012-05-08 14:02:35 UTC (rev 116418)
@@ -276,8 +276,10 @@
void FrameLoaderClientBlackBerry::dispatchDecidePolicyForNewWindowAction(FramePolicyFunction function, const NavigationAction&, const ResourceRequest& request, PassRefPtr<FormState>, const String& frameName)
{
- if (request.isRequestedByPlugin() && ScriptController::processingUserGesture() && !m_webPagePrivate->m_pluginMayOpenNewTab)
+ if (ScriptController::processingUserGesture() && !m_webPagePrivate->m_pluginMayOpenNewTab) {
(m_frame->loader()->policyChecker()->*function)(PolicyIgnore);
+ return;
+ }
// A new window can never be a fragment scroll.
PolicyAction decision = decidePolicyForExternalLoad(request, false);
