Changeset 116418 in webkit

Timestamp:

May 8, 2012 7:02:35 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Blackberry] remove m_isRequestedByPlugin in ResourceRequest
​https://bugs.webkit.org/show_bug.cgi?id=84559

Patch by Chris Guan <​chris.guan@torchmobile.com.cn> on 2012-05-08
Reviewed by Antonio Gomes.

Source/WebCore:

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):

Source/WebKit/blackberry:

• WebCoreSupport/FrameLoaderClientBlackBerry.cpp:

(WebCore::FrameLoaderClientBlackBerry::dispatchDecidePolicyForNewWindowAction):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/network/blackberry/ResourceRequest.h (modified) (7 diffs)
• WebCore/platform/network/blackberry/ResourceRequestBlackBerry.cpp (modified) (2 diffs)
• WebKit/blackberry/ChangeLog (modified) (1 diff)
• WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-08  Chris Guan  <chris.guan@torchmobile.com.cn>
+
+        [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  <apavlov@chromium.org>
 

trunk/Source/WebCore/platform/network/blackberry/ResourceRequest.h

@@ -56 +56 @@
         , m_isXMLHTTPRequest(false)
         , m_mustHandleInternally(false)
-        , m_isRequestedByPlugin(false)
         , m_forceDownload(false)
         , m_targetType(TargetIsUnspecified)
@@ -66 +65 @@
         , m_isXMLHTTPRequest(false)
         , m_mustHandleInternally(false)
-        , m_isRequestedByPlugin(false)
         , m_forceDownload(false)
         , m_targetType(TargetIsUnspecified)
@@ -76 +74 @@
         , m_isXMLHTTPRequest(false)
         , m_mustHandleInternally(false)
-        , m_isRequestedByPlugin(false)
         , m_forceDownload(false)
         , m_targetType(TargetIsUnspecified)
@@ -87 +84 @@
         , m_isXMLHTTPRequest(false)
         , m_mustHandleInternally(false)
-        , m_isRequestedByPlugin(false)
         , m_forceDownload(false)
         , m_targetType(TargetIsUnspecified)
@@ -107 +103 @@
     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.
@@ -139 +132 @@
     bool m_isXMLHTTPRequest;
     bool m_mustHandleInternally;
-    bool m_isRequestedByPlugin;
     bool m_forceDownload;
     TargetType m_targetType;
@@ -157 +149 @@
     bool m_isXMLHTTPRequest;
     bool m_mustHandleInternally;
-    bool m_isRequestedByPlugin;
     bool m_forceDownload;
     ResourceRequest::TargetType m_targetType;

trunk/Source/WebCore/platform/network/blackberry/ResourceRequestBlackBerry.cpp

@@ -239 +239 @@
     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;
@@ -253 +252 @@
     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;

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-05-08  Chris Guan  <chris.guan@torchmobile.com.cn>
+
+        [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  <jonathan.dong@torchmobile.com.cn>
 

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

@@ -277 +277 @@
 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.