Changeset 116591 in webkit

Timestamp:

May 9, 2012 6:13:35 PM (12 years ago)

Author:

charles.wei@torchmobile.com.cn

Message:

[BlackBerry] Refactor data scheme support
​https://bugs.webkit.org/show_bug.cgi?id=85938

Reviewed by Rob Buis.

We will create a DataStream in our platform repository,
so that can be wrapped up by NetworkJob for webkit rendering,
and by DownloadStream for downloading.

Refactor, no new tests.

• platform/network/blackberry/NetworkJob.cpp:

(WebCore::NetworkJob::NetworkJob):
(WebCore::NetworkJob::initialize):
(WebCore::NetworkJob::cancelJob):
(WebCore::NetworkJob::sendResponseIfNeeded):

• platform/network/blackberry/NetworkJob.h:

(NetworkJob):

• platform/network/blackberry/NetworkManager.cpp:

(WebCore::NetworkManager::startJob):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/blackberry/NetworkJob.cpp (modified) (10 diffs)
• platform/network/blackberry/NetworkJob.h (modified) (5 diffs)
• platform/network/blackberry/NetworkManager.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-09  Charles Wei  <charles.wei@torchmobile.com.cn>
+
+        [BlackBerry]  Refactor data scheme support
+        https://bugs.webkit.org/show_bug.cgi?id=85938
+
+        Reviewed by Rob Buis.
+
+        We will create a DataStream in our platform repository,
+        so that can be wrapped up by NetworkJob for webkit rendering,
+        and by DownloadStream for downloading.
+
+        Refactor, no new tests.
+
+        * platform/network/blackberry/NetworkJob.cpp:
+        (WebCore::NetworkJob::NetworkJob):
+        (WebCore::NetworkJob::initialize):
+        (WebCore::NetworkJob::cancelJob):
+        (WebCore::NetworkJob::sendResponseIfNeeded):
+        * platform/network/blackberry/NetworkJob.h:
+        (NetworkJob):
+        * platform/network/blackberry/NetworkManager.cpp:
+        (WebCore::NetworkManager::startJob):
+
 2012-05-09  Dana Jansens  <danakj@chromium.org>
 

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

@@ -21 +21 @@
 
 #include "AboutData.h"
-#include "Base64.h"
 #include "Chrome.h"
 #include "ChromeClient.h"
@@ -42 +41 @@
 #include <BlackBerryPlatformWebKitCredits.h>
 #include <BuildInformation.h>
+#include <LocalizeResource.h>
 #include <network/MultipartStream.h>
-#include <network/NetworkRequest.h>
 #include <network/NetworkStreamFactory.h>
-#include <wtf/ASCIICType.h>
 
 namespace WebCore {
@@ -64 +62 @@
 {
     return statusCode == 401;
-}
-
-static void escapeDecode(const char* src, int length, Vector<char>& out)
-{
-    out.resize(length);
-    const char* const srcEnd = src + length;
-    char* dst = out.data();
-    for (; src < srcEnd; ) {
-        char inputChar = *src++;
-        if (inputChar == '%' && src + 2 <= srcEnd) {
-            int digit1 = 0;
-            char character = *src++;
-            if (isASCIIHexDigit(character))
-                digit1 = toASCIIHexValue(character);
-
-            int digit2 = 0;
-            character = *src++;
-            if (isASCIIHexDigit(character))
-                digit2 = toASCIIHexValue(character);
-
-            *dst++ = (digit1 << 4) | digit2;
-        } else
-            *dst++ = inputChar;
-    }
-    out.resize(dst - out.data());
 }
 
 NetworkJob::NetworkJob()
     : m_playerId(0)
-    , m_loadDataTimer(this, &NetworkJob::fireLoadDataTimer)
     , m_loadAboutTimer(this, &NetworkJob::fireLoadAboutTimer)
     , m_deleteJobTimer(this, &NetworkJob::fireDeleteJobTimer)
     , m_streamFactory(0)
     , m_isFile(false)
-    , m_isData(false)
     , m_isAbout(false)
     , m_isFTP(false)
@@ -135 +106 @@
     m_response.setURL(url);
     m_isFile = url.protocolIs("file") || url.protocolIs("local");
-    m_isData = url.protocolIs("data");
     m_isAbout = url.protocolIs("about");
     m_isFTP = url.protocolIs("ftp");
@@ -161 +131 @@
     }
 
-    // No need to create the streams for data and about.
-    if (m_isData || m_isAbout)
+    // No need to create the streams for about.
+    if (m_isAbout)
         return true;
 
@@ -189 +159 @@
     // Cancel jobs loading local data by killing the timer, and jobs
     // getting data from the network by calling the inherited URLStream::cancel.
-    if (m_loadDataTimer.isActive()) {
-        m_loadDataTimer.stop();
-        notifyClose(BlackBerry::Platform::FilterStream::StatusCancelled);
-        return 0;
-    }
 
     if (m_loadAboutTimer.isActive()) {
@@ -613 +578 @@
         return;
 
-    String urlFilename = m_response.url().lastPathComponent();
+    String urlFilename;
+    if (!m_response.url().protocolIsData() && !m_response.url().protocolIs("about"))
+        urlFilename = m_response.url().lastPathComponent();
 
     // Get the MIME type that was set by the content sniffer
@@ -636 +603 @@
 
     // Set suggested filename for downloads from the Content-Disposition header; if this fails,
-    // fill it in from the url and sniffed mime type;Skip this for data and about URLs,
+    // fill it in from the url and sniffed mime type;Skip this for about URLs,
     // because they have no Content-Disposition header and the format is wrong to be a filename.
-    if (!m_isData && !m_isAbout) {
+    if (!m_isAbout) {
         String suggestedFilename = filenameFromHTTPContentDisposition(m_contentDisposition);
         if (suggestedFilename.isEmpty()) {
@@ -645 +612 @@
             if (urlFilename.isEmpty()) {
                 if (mimeExtension.isEmpty()) // No extension found for the mimeType.
-                    suggestedFilename = String("Untitled");
+                    suggestedFilename = String(BlackBerry::Platform::LocalizeResource::getString(BlackBerry::Platform::FILENAME_UNTITLED));
                 else
-                    suggestedFilename = String("Untitled") + "." + mimeExtension;
+                    suggestedFilename = String(BlackBerry::Platform::LocalizeResource::getString(BlackBerry::Platform::FILENAME_UNTITLED)) + "." + mimeExtension;
             } else {
                 if (urlFilename.reverseFind('.') == notFound && !mimeExtension.isEmpty())
@@ -674 +641 @@
         m_multipartResponse = nullptr;
     }
-}
-
-void NetworkJob::parseData()
-{
-    Vector<char> result;
-
-    String contentType("text/plain;charset=US-ASCII");
-
-    String data(m_response.url().string().substring(5));
-    Vector<String> hparts;
-    bool isBase64 = false;
-
-    size_t index = data.find(',');
-    if (index != notFound && index > 0) {
-        contentType = data.left(index).lower();
-        data = data.substring(index + 1);
-
-        contentType.split(';', hparts);
-        Vector<String>::iterator i;
-        for (i = hparts.begin(); i != hparts.end(); ++i) {
-            if (i->stripWhiteSpace().lower() == "base64") {
-                isBase64 = true;
-                String value = *i;
-                do {
-                    if (*i == value) {
-                        int position = i - hparts.begin();
-                        hparts.remove(position);
-                        i = hparts.begin() + position;
-                    } else
-                        ++i;
-                } while (i != hparts.end());
-                break;
-            }
-        }
-        contentType = String();
-        for (i = hparts.begin(); i != hparts.end(); ++i) {
-            if (i > hparts.begin())
-                contentType += ",";
-
-            contentType += *i;
-        }
-    } else if (!index)
-        data = data.substring(1); // Broken header.
-
-    {
-        CString latin = data.latin1();
-        escapeDecode(latin.data(), latin.length(), result);
-    }
-
-    if (isBase64) {
-        String s(result.data(), result.size());
-        CString latin = s.removeCharacters(isSpaceOrNewline).latin1();
-        result.clear();
-        result.append(latin.data(), latin.length());
-        Vector<char> bytesOut;
-        if (base64Decode(result, bytesOut))
-            result.swap(bytesOut);
-        else
-            result.clear();
-    }
-
-    notifyStatusReceived(result.isEmpty() ? 404 : 200, 0);
-    notifyStringHeaderReceived("Content-Type", contentType);
-    notifyStringHeaderReceived("Content-Length", String::number(result.size()));
-    notifyDataReceivedPlain(result.data(), result.size());
-    notifyClose(BlackBerry::Platform::FilterStream::StatusSuccess);
 }
 

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

@@ -61 +61 @@
 #endif
     bool isCancelled() const { return m_cancelled; }
-    void loadDataURL() { m_loadDataTimer.startOneShot(0); }
     void loadAboutURL();
     int cancelJob();
@@ -114 +113 @@
     void sendMultipartResponseIfNeeded();
 
-    void fireLoadDataTimer(Timer<NetworkJob>*)
-    {
-        parseData();
-    }
-
     void fireLoadAboutTimer(Timer<NetworkJob>*)
     {
@@ -125 +119 @@
 
     void fireDeleteJobTimer(Timer<NetworkJob>*);
-
-    void parseData();
 
     void handleAbout();
@@ -152 +144 @@
     RefPtr<ResourceHandle> m_handle;
     ResourceResponse m_response;
-    Timer<NetworkJob> m_loadDataTimer;
     Timer<NetworkJob> m_loadAboutTimer;
     OwnPtr<ResourceResponse> m_multipartResponse;
@@ -161 +152 @@
     BlackBerry::Platform::NetworkStreamFactory* m_streamFactory;
     bool m_isFile;
-    bool m_isData;
     bool m_isAbout;
     bool m_isFTP;

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

@@ -137 +137 @@
     m_jobs.append(networkJob);
 
-    if (url.protocolIs("data")) {
-        networkJob->loadDataURL();
-        return true;
-    }
-
     if (url.protocolIs("about")) {
         // If the protocol matches "about", loadAboutURL should recognize and handle it.