Changeset 112092 in webkit


Ignore:
Timestamp:
Mar 26, 2012 7:38:42 AM (12 years ago)
Author:
charles.wei@torchmobile.com.cn
Message:

[BlackBerry] Clean up networking code and remove WML support.
​https://bugs.webkit.org/show_bug.cgi?id=82170

Reviewed by Rob Buis.

This just removes the WML support of BlackBerry porting, which is already
removed from WebCore. No new tests needed.

  • platform/blackberry/MIMETypeRegistryBlackBerry.cpp:

(WebCore):

  • platform/network/blackberry/DeferredData.cpp:

(WebCore::DeferredData::DeferredData):
(WebCore::DeferredData::processDeferredData):

  • platform/network/blackberry/DeferredData.h:

(DeferredData):
(WebCore::DeferredData::hasDeferredData):

  • platform/network/blackberry/NetworkJob.cpp:
  • platform/network/blackberry/NetworkJob.h:

(NetworkJob):

  • platform/network/blackberry/ResourceResponse.h:

(WebCore::ResourceResponse::ResourceResponse):
(ResourceResponse):

  • platform/network/blackberry/ResourceResponseBlackBerry.cpp:

(WebCore::ResourceResponse::doPlatformCopyData):
(WebCore::ResourceResponse::doPlatformAdopt):

Location:
trunk/Source/WebCore
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r112091 r112092  
     12012-03-26  Charles Wei  <charles.wei@torchmobile.com.cn>
     2
     3        [BlackBerry] Clean up networking code and remove WML support.
     4        https://bugs.webkit.org/show_bug.cgi?id=82170
     5
     6        Reviewed by Rob Buis.
     7
     8        This just removes the WML support of BlackBerry porting, which is already
     9        removed from WebCore. No new tests needed.
     10
     11        * platform/blackberry/MIMETypeRegistryBlackBerry.cpp:
     12        (WebCore):
     13        * platform/network/blackberry/DeferredData.cpp:
     14        (WebCore::DeferredData::DeferredData):
     15        (WebCore::DeferredData::processDeferredData):
     16        * platform/network/blackberry/DeferredData.h:
     17        (DeferredData):
     18        (WebCore::DeferredData::hasDeferredData):
     19        * platform/network/blackberry/NetworkJob.cpp:
     20        * platform/network/blackberry/NetworkJob.h:
     21        (NetworkJob):
     22        * platform/network/blackberry/ResourceResponse.h:
     23        (WebCore::ResourceResponse::ResourceResponse):
     24        (ResourceResponse):
     25        * platform/network/blackberry/ResourceResponseBlackBerry.cpp:
     26        (WebCore::ResourceResponse::doPlatformCopyData):
     27        (WebCore::ResourceResponse::doPlatformAdopt):
     28
    1292012-03-26  Philip Rogers  <pdr@google.com>
    230

  • trunk/Source/WebCore/platform/blackberry/MIMETypeRegistryBlackBerry.cpp

    r109238 r112092  
    6767    { "xsl", "text/xsl" },
    6868    { "xhtml", "application/xhtml+xml" },
    69     { "wml", "text/vnd.wap.wml" },
    70     { "wmlc", "application/vnd.wap.wmlc" },
    7169    { "m4a", "audio/m4a" },
    7270    { "midi", "audio/midi" },

  • trunk/Source/WebCore/platform/network/blackberry/DeferredData.cpp

    r103487 r112092  
    2929    , m_deferredStatusReceived(false)
    3030    , m_status(0)
    31     , m_deferredWMLOverride(false)
    3231    , m_bytesSent(0)
    3332    , m_totalBytesToBeSent(0)
    … …  
    4342    m_status = status;
    4443    m_message = message;
    45 }
    46 
    47 void DeferredData::deferWMLOverride()
    48 {
    49     m_deferredWMLOverride = true;
    5044}
    5145
    … …  
    124118    }
    125119
    126     if (m_deferredWMLOverride) {
    127         m_job.handleNotifyWMLOverride();
    128         m_deferredWMLOverride = false;
    129         if (m_job.isDeferringLoading() || m_job.isCancelled())
    130             return;
    131     }
    132 
    133120    if (!processHeaders(m_headerKeys, m_headerValues, &NetworkJob::handleNotifyHeaderReceived)
    134121        || !processHeaders(m_multipartHeaderKeys, m_multipartheaderValues, &NetworkJob::handleNotifyMultipartHeaderReceived))

  • trunk/Source/WebCore/platform/network/blackberry/DeferredData.h

    r103487 r112092  
    5252    DeferredData(NetworkJob&);
    5353    void deferOpen(int status, const String& message);
    54     void deferWMLOverride();
    5554    void deferHeaderReceived(const String& key, const String& value);
    5655    void deferMultipartHeaderReceived(const String& key, const String& value);
    … …  
    6160    bool hasDeferredData() const
    6261    {
    63         return m_deferredStatusReceived || m_deferredWMLOverride || !m_headerKeys.isEmpty() || !m_multipartHeaderKeys.isEmpty() || !m_dataSegments.isEmpty() || m_deferredClose;
     62        return m_deferredStatusReceived || !m_headerKeys.isEmpty() || !m_multipartHeaderKeys.isEmpty() || !m_dataSegments.isEmpty() || m_deferredClose;
    6463    }
    6564
    … …  
    8483    int m_status;
    8584    String m_message;
    86     bool m_deferredWMLOverride;
    8785    Vector<String> m_headerKeys;
    8886    Vector<String> m_headerValues;

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

    r111810 r112092  
    239239
    240240    m_response.setHTTPStatusText(message);
    241 }
    242 
    243 void NetworkJob::notifyWMLOverride()
    244 {
    245     if (shouldDeferLoading())
    246         m_deferredData.deferWMLOverride();
    247     else
    248         handleNotifyWMLOverride();
    249241}
    250242

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

    r111809 r112092  
    6868    virtual void notifyStatusReceived(int status, const char* message);
    6969    void handleNotifyStatusReceived(int status, const String& message);
    70     virtual void notifyWMLOverride();
    71     void handleNotifyWMLOverride() { m_response.setIsWML(true); }
    7270    virtual void notifyHeadersReceived(BlackBerry::Platform::NetworkRequest::HeaderList& headers);
    7371    virtual void notifyMultipartHeaderReceived(const char* key, const char* value);

  • trunk/Source/WebCore/platform/network/blackberry/ResourceResponse.h

    r102303 r112092  
    2727public:
    2828    ResourceResponse()
    29         : m_isWML(false)
     29        : m_isMultipartPayload(false)
    3030    {
    3131    }
    … …  
    3434        : ResourceResponseBase(url, mimeType, expectedLength, textEncodingName, filename)
    3535        , m_isMultipartPayload(false)
    36         , m_isWML(false)
    3736    {
    3837    }
    39 
    40     void setIsWML(bool isWML) { m_isWML = isWML; }
    41     bool isWML() const { return m_isWML; }
    4238
    4339    PassOwnPtr<CrossThreadResourceResponseData> doPlatformCopyData(PassOwnPtr<CrossThreadResourceResponseData>) const;
    … …  
    4945private:
    5046    bool m_isMultipartPayload;
    51     bool m_isWML;
    5247};
    5348
    5449struct CrossThreadResourceResponseData : public CrossThreadResourceResponseDataBase {
    55     bool m_isWML;
    5650};
    5751

  • trunk/Source/WebCore/platform/network/blackberry/ResourceResponseBlackBerry.cpp

    r102303 r112092  
    2424PassOwnPtr<CrossThreadResourceResponseData> ResourceResponse::doPlatformCopyData(PassOwnPtr<CrossThreadResourceResponseData> data) const
    2525{
    26     data->m_isWML = m_isWML;
    2726    return data;
    2827}
    … …  
    3029void ResourceResponse::doPlatformAdopt(PassOwnPtr<CrossThreadResourceResponseData> data)
    3130{
    32     m_isWML = data->m_isWML;
    3331}
    3432
Note: See TracChangeset for help on using the changeset viewer.