Changeset 88523 in webkit

Timestamp:

Jun 9, 2011 11:16:18 PM (13 years ago)

Author:

koz@chromium.org

Message:

2011-06-09 James Kozianski <​koz@chromium.org>

Unreviewed, rolling out r88466.
​http://trac.webkit.org/changeset/88466
​https://bugs.webkit.org/show_bug.cgi?id=60059

Broke PPAPITest.URLLoader test on the chromium bots

• WebKit.gyp:
• WebKit.gypi:
• src/AssociatedURLLoader.cpp: (WebKit::AssociatedURLLoader::ClientAdapter::clearClient): (WebKit::AssociatedURLLoader::ClientAdapter::ClientAdapter): (WebKit::AssociatedURLLoader::ClientAdapter::didFinishLoading): (WebKit::AssociatedURLLoader::ClientAdapter::didFail): (WebKit::AssociatedURLLoader::loadAsynchronously):
• tests/AssociatedURLLoaderTest.cpp: Removed.

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• WebKit.gyp (modified) (1 diff)
• WebKit.gypi (modified) (1 diff)
• src/AssociatedURLLoader.cpp (modified) (7 diffs)
• tests/AssociatedURLLoaderTest.cpp (deleted)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-06-09  James Kozianski  <koz@chromium.org>
+
+        Unreviewed, rolling out r88466.
+        http://trac.webkit.org/changeset/88466
+        https://bugs.webkit.org/show_bug.cgi?id=60059
+
+        Broke PPAPITest.URLLoader test on the chromium bots
+
+        * WebKit.gyp:
+        * WebKit.gypi:
+        * src/AssociatedURLLoader.cpp:
+        (WebKit::AssociatedURLLoader::ClientAdapter::clearClient):
+        (WebKit::AssociatedURLLoader::ClientAdapter::ClientAdapter):
+        (WebKit::AssociatedURLLoader::ClientAdapter::didFinishLoading):
+        (WebKit::AssociatedURLLoader::ClientAdapter::didFail):
+        (WebKit::AssociatedURLLoader::loadAsynchronously):
+        * tests/AssociatedURLLoaderTest.cpp: Removed.
+
 2011-06-09  James Robinson  <jamesr@chromium.org>
 

trunk/Source/WebKit/chromium/WebKit.gyp

@@ -645 +645 @@
                                 # These tests depend on webkit_support and
                                 # functions defined only in !WEBKIT_IMPLEMENTATION.
-                                'tests/AssociatedURLLoaderTest.cpp',
                                 'tests/WebFrameTest.cpp',
                                 'tests/WebPageNewSerializerTest.cpp',

trunk/Source/WebKit/chromium/WebKit.gypi

@@ -54 +54 @@
         'webkit_unittest_files': [
             'tests/ArenaTestHelpers.h',
-            'tests/AssociatedURLLoaderTest.cpp',
             'tests/InnerGestureRecognizerTest.cpp',
             'tests/CCThreadTaskTest.cpp',

trunk/Source/WebKit/chromium/src/AssociatedURLLoader.cpp

@@ -35 +35 @@
 #include "DocumentThreadableLoaderClient.h"
 #include "SubresourceLoader.h"
-#include "Timer.h"
 #include "WebApplicationCacheHost.h"
 #include "WebDataSource.h"
@@ -56 +55 @@
 // It forwards its ThreadableLoaderClient notifications to a WebURLLoaderClient.
 class AssociatedURLLoader::ClientAdapter : public DocumentThreadableLoaderClient {
-    WTF_MAKE_NONCOPYABLE(ClientAdapter);
 public:
     static PassOwnPtr<ClientAdapter> create(AssociatedURLLoader*, WebURLLoaderClient*, bool /*downloadToFile*/);
@@ -71 +69 @@
     virtual bool isDocumentThreadableLoaderClient() { return true; }
 
-    // Enables forwarding of error notifications to the WebURLLoaderClient. These must be
-    // deferred until after the call to AssociatedURLLoader::loadAsynchronously() completes.
-    void enableErrorNotifications();
-
-    // Stops loading and releases the DocumentThreadableLoader as early as possible.
-    void clearClient() { m_client = 0; } 
+    // This method stops loading and releases the DocumentThreadableLoader as early as possible.
+    void clearClient() { m_client = 0; }
 
 private:
     ClientAdapter(AssociatedURLLoader*, WebURLLoaderClient*, bool /*downloadToFile*/);
 
-    void notifyError(Timer<ClientAdapter>*);
-
     AssociatedURLLoader* m_loader;
     WebURLLoaderClient* m_client;
-    WebURLError m_error;
-
-    Timer<ClientAdapter> m_errorTimer;
     unsigned long m_downloadLength;
     bool m_downloadToFile;
-    bool m_enableErrorNotifications;
-    bool m_didFail;
 };
 
@@ -102 +89 @@
     : m_loader(loader)
     , m_client(client)
-    , m_errorTimer(this, &ClientAdapter::notifyError)
     , m_downloadLength(0)
     , m_downloadToFile(downloadToFile)
-    , m_enableErrorNotifications(false)
-    , m_didFail(false)
 {
     ASSERT(m_loader);
@@ -161 +145 @@
         int downloadLength = m_downloadLength <= INT_MAX ? m_downloadLength : INT_MAX;
         m_client->didDownloadData(m_loader, downloadLength);
-        // While the client could have canceled, continue, since the load finished.
+        // While the client could have cancelled, continue, since the load finished. 
     }
 
@@ -172 +156 @@
         return;
 
-    m_didFail = true;
-    m_error = WebURLError(error);
-    if (m_enableErrorNotifications)
-        notifyError(&m_errorTimer);
-}
-
-void AssociatedURLLoader::ClientAdapter::enableErrorNotifications()
-{
-    m_enableErrorNotifications = true;
-    // If an error has already been received, start a timer to report it to the client
-    // after AssociatedURLLoader::loadAsynchronously has returned to the caller.
-    if (m_didFail)
-        m_errorTimer.startOneShot(0);
-}
-
-void AssociatedURLLoader::ClientAdapter::notifyError(Timer<ClientAdapter>* timer)
-{
-    ASSERT_UNUSED(timer, timer == &m_errorTimer);
-
-    m_client->didFail(m_loader, m_error);
+    WebURLError webError(error);
+    m_client->didFail(m_loader, webError);
 }
 
@@ -250 +216 @@
     Document* webcoreDocument = m_frameImpl->frame()->document();
     m_clientAdapter = ClientAdapter::create(this, m_client, request.downloadToFile());
+
     m_loader = DocumentThreadableLoader::create(webcoreDocument, m_clientAdapter.get(), webcoreRequest, options);
-    m_clientAdapter->enableErrorNotifications();
 }