Title: [120626] trunk/Source/WebCore
Revision
120626
Author
[email protected]
Date
2012-06-18 14:34:46 -0700 (Mon, 18 Jun 2012)

Log Message

[BlackBerry] NetworkJob::startNewJobWithRequest() should check the frame pointer
https://bugs.webkit.org/show_bug.cgi?id=89369

Patch by Yong Li <[email protected]> on 2012-06-18
Reviewed by Antonio Gomes.

NetworkJob::startNewJobWithRequest() should stop proceeding if the frame is null,
which means it is a PingLoader job and should just finish now.

* platform/network/blackberry/NetworkJob.cpp:
(WebCore::NetworkJob::startNewJobWithRequest):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (120625 => 120626)


--- trunk/Source/WebCore/ChangeLog	2012-06-18 21:08:07 UTC (rev 120625)
+++ trunk/Source/WebCore/ChangeLog	2012-06-18 21:34:46 UTC (rev 120626)
@@ -1,3 +1,16 @@
+2012-06-18  Yong Li  <[email protected]>
+
+        [BlackBerry] NetworkJob::startNewJobWithRequest() should check the frame pointer
+        https://bugs.webkit.org/show_bug.cgi?id=89369
+
+        Reviewed by Antonio Gomes.
+
+        NetworkJob::startNewJobWithRequest() should stop proceeding if the frame is null,
+        which means it is a PingLoader job and should just finish now.
+
+        * platform/network/blackberry/NetworkJob.cpp:
+        (WebCore::NetworkJob::startNewJobWithRequest):
+
 2012-06-18  Dan Bernstein  <[email protected]>
 
         Ideographic comma and full-stops are mishandled in linebreak

Modified: trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp (120625 => 120626)


--- trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp	2012-06-18 21:08:07 UTC (rev 120625)
+++ trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp	2012-06-18 21:34:46 UTC (rev 120626)
@@ -541,6 +541,11 @@
 
 bool NetworkJob::startNewJobWithRequest(ResourceRequest& newRequest, bool increasRedirectCount)
 {
+    // m_frame can be null if this is a PingLoader job (See NetworkJob::initialize).
+    // In this case we don't start new request.
+    if (!m_frame)
+        return false;
+
     if (isClientAvailable()) {
         RecursionGuard guard(m_callingClient);
         m_handle->client()->willSendRequest(m_handle.get(), newRequest, m_response);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to