Changeset 112633 in webkit


Ignore:
Timestamp:
Mar 29, 2012 6:36:05 PM (12 years ago)
Author:
abarth@webkit.org
Message:

Unreviewed, rolling out r112579.
​http://trac.webkit.org/changeset/112579
​https://bugs.webkit.org/show_bug.cgi?id=82657

Does not compile in Windows component build

Source/WebCore:

  • WebCore.gypi:

Source/WebKit/chromium:

  • WebKit.gyp:
  • src/ResourceHandle.cpp: Renamed from Source/WebCore/platform/network/chromium/ResourceHandle.cpp.

(WebCore):
(WebCore::ResourceHandleInternal::ResourceHandleInternal):
(WebCore::ResourceHandleInternal::start):
(WebCore::ResourceHandleInternal::cancel):
(WebCore::ResourceHandleInternal::setDefersLoading):
(WebCore::ResourceHandleInternal::allowStoredCredentials):
(WebCore::ResourceHandleInternal::willSendRequest):
(WebCore::ResourceHandleInternal::didSendData):
(WebCore::ResourceHandleInternal::didReceiveResponse):
(WebCore::ResourceHandleInternal::didDownloadData):
(WebCore::ResourceHandleInternal::didReceiveData):
(WebCore::ResourceHandleInternal::didReceiveCachedMetadata):
(WebCore::ResourceHandleInternal::didFinishLoading):
(WebCore::ResourceHandleInternal::didFail):
(WebCore::ResourceHandleInternal::FromResourceHandle):
(WebCore::ResourceHandle::ResourceHandle):
(WebCore::ResourceHandle::create):
(WebCore::ResourceHandle::firstRequest):
(WebCore::ResourceHandle::client):
(WebCore::ResourceHandle::setClient):
(WebCore::ResourceHandle::setDefersLoading):
(WebCore::ResourceHandle::start):
(WebCore::ResourceHandle::hasAuthenticationChallenge):
(WebCore::ResourceHandle::clearAuthentication):
(WebCore::ResourceHandle::cancel):
(WebCore::ResourceHandle::~ResourceHandle):
(WebCore::ResourceHandle::loadsBlocked):
(WebCore::ResourceHandle::loadResourceSynchronously):
(WebCore::ResourceHandle::willLoadFromCache):
(WebCore::ResourceHandle::cacheMetadata):

  • src/ResourceHandleInternal.h: Renamed from Source/WebCore/platform/network/chromium/ResourceHandleInternal.h.

(WebCore):
(ResourceHandleInternal):
(WebCore::ResourceHandleInternal::~ResourceHandleInternal):
(WebCore::ResourceHandleInternal::setOwner):
(WebCore::ResourceHandleInternal::request):
(WebCore::ResourceHandleInternal::client):
(WebCore::ResourceHandleInternal::setClient):
(WebCore::ResourceHandleInternal::loader):

  • src/WrappedResourceRequest.h: Renamed from Source/WebCore/platform/chromium/support/WrappedResourceRequest.h.

(WebKit):
(WrappedResourceRequest):
(WebKit::WrappedResourceRequest::~WrappedResourceRequest):
(WebKit::WrappedResourceRequest::WrappedResourceRequest):
(WebKit::WrappedResourceRequest::bind):
(Handle):
(WebKit::WrappedResourceRequest::Handle::dispose):

  • src/WrappedResourceResponse.h: Renamed from Source/WebCore/platform/chromium/support/WrappedResourceResponse.h.

(WebKit):
(WrappedResourceResponse):
(WebKit::WrappedResourceResponse::~WrappedResourceResponse):
(WebKit::WrappedResourceResponse::WrappedResourceResponse):
(WebKit::WrappedResourceResponse::bind):
(Handle):
(WebKit::WrappedResourceResponse::Handle::dispose):

Location:
trunk/Source
Files:
4 edited
4 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r112632 r112633  
     12012-03-29  Adam Barth  <abarth@webkit.org>
     2
     3        Unreviewed, rolling out r112579.
     4        http://trac.webkit.org/changeset/112579
     5        https://bugs.webkit.org/show_bug.cgi?id=82657
     6
     7        Does not compile in Windows component build
     8
     9        * WebCore.gypi:
     10
    1112012-03-29  Adam Barth  <abarth@webkit.org>
    212

  • trunk/Source/WebCore/WebCore.gypi

    r112628 r112633  
    32813281            'platform/chromium/support/WebURLResponse.cpp',
    32823282            'platform/chromium/support/WebURLResponsePrivate.h',
    3283             'platform/chromium/support/WrappedResourceRequest.h',
    3284             'platform/chromium/support/WrappedResourceResponse.h',
    32853283            'platform/cocoa/KeyEventCocoa.h',
    32863284            'platform/cocoa/KeyEventCocoa.mm',
    … …  
    42694267            'platform/network/chromium/DNSChromium.cpp',
    42704268            'platform/network/chromium/ResourceError.h',
    4271             'platform/network/chromium/ResourceHandle.cpp',
    4272             'platform/network/chromium/ResourceHandleInternal.h',
    42734269            'platform/network/chromium/ResourceRequest.cpp',
    42744270            'platform/network/chromium/ResourceRequest.h',

  • trunk/Source/WebKit/chromium/ChangeLog

    r112579 r112633  
     12012-03-29  Adam Barth  <abarth@webkit.org>
     2
     3        Unreviewed, rolling out r112579.
     4        http://trac.webkit.org/changeset/112579
     5        https://bugs.webkit.org/show_bug.cgi?id=82657
     6
     7        Does not compile in Windows component build
     8
     9        * WebKit.gyp:
     10        * src/ResourceHandle.cpp: Renamed from Source/WebCore/platform/network/chromium/ResourceHandle.cpp.
     11        (WebCore):
     12        (WebCore::ResourceHandleInternal::ResourceHandleInternal):
     13        (WebCore::ResourceHandleInternal::start):
     14        (WebCore::ResourceHandleInternal::cancel):
     15        (WebCore::ResourceHandleInternal::setDefersLoading):
     16        (WebCore::ResourceHandleInternal::allowStoredCredentials):
     17        (WebCore::ResourceHandleInternal::willSendRequest):
     18        (WebCore::ResourceHandleInternal::didSendData):
     19        (WebCore::ResourceHandleInternal::didReceiveResponse):
     20        (WebCore::ResourceHandleInternal::didDownloadData):
     21        (WebCore::ResourceHandleInternal::didReceiveData):
     22        (WebCore::ResourceHandleInternal::didReceiveCachedMetadata):
     23        (WebCore::ResourceHandleInternal::didFinishLoading):
     24        (WebCore::ResourceHandleInternal::didFail):
     25        (WebCore::ResourceHandleInternal::FromResourceHandle):
     26        (WebCore::ResourceHandle::ResourceHandle):
     27        (WebCore::ResourceHandle::create):
     28        (WebCore::ResourceHandle::firstRequest):
     29        (WebCore::ResourceHandle::client):
     30        (WebCore::ResourceHandle::setClient):
     31        (WebCore::ResourceHandle::setDefersLoading):
     32        (WebCore::ResourceHandle::start):
     33        (WebCore::ResourceHandle::hasAuthenticationChallenge):
     34        (WebCore::ResourceHandle::clearAuthentication):
     35        (WebCore::ResourceHandle::cancel):
     36        (WebCore::ResourceHandle::~ResourceHandle):
     37        (WebCore::ResourceHandle::loadsBlocked):
     38        (WebCore::ResourceHandle::loadResourceSynchronously):
     39        (WebCore::ResourceHandle::willLoadFromCache):
     40        (WebCore::ResourceHandle::cacheMetadata):
     41        * src/ResourceHandleInternal.h: Renamed from Source/WebCore/platform/network/chromium/ResourceHandleInternal.h.
     42        (WebCore):
     43        (ResourceHandleInternal):
     44        (WebCore::ResourceHandleInternal::~ResourceHandleInternal):
     45        (WebCore::ResourceHandleInternal::setOwner):
     46        (WebCore::ResourceHandleInternal::request):
     47        (WebCore::ResourceHandleInternal::client):
     48        (WebCore::ResourceHandleInternal::setClient):
     49        (WebCore::ResourceHandleInternal::loader):
     50        * src/WrappedResourceRequest.h: Renamed from Source/WebCore/platform/chromium/support/WrappedResourceRequest.h.
     51        (WebKit):
     52        (WrappedResourceRequest):
     53        (WebKit::WrappedResourceRequest::~WrappedResourceRequest):
     54        (WebKit::WrappedResourceRequest::WrappedResourceRequest):
     55        (WebKit::WrappedResourceRequest::bind):
     56        (Handle):
     57        (WebKit::WrappedResourceRequest::Handle::dispose):
     58        * src/WrappedResourceResponse.h: Renamed from Source/WebCore/platform/chromium/support/WrappedResourceResponse.h.
     59        (WebKit):
     60        (WrappedResourceResponse):
     61        (WebKit::WrappedResourceResponse::~WrappedResourceResponse):
     62        (WebKit::WrappedResourceResponse::WrappedResourceResponse):
     63        (WebKit::WrappedResourceResponse::bind):
     64        (Handle):
     65        (WebKit::WrappedResourceResponse::Handle::dispose):
     66
    1672012-03-29  Adam Barth  <abarth@webkit.org>
    268

  • trunk/Source/WebKit/chromium/WebKit.gyp

    r112579 r112633  
    471471                'src/PlatformMessagePortChannel.h',
    472472                'src/PlatformSupport.cpp',
     473                'src/ResourceHandle.cpp',
    473474                'src/ScrollbarGroup.cpp',
    474475                'src/ScrollbarGroup.h',
    … …  
    693694                'src/WorkerFileWriterCallbacksBridge.cpp',
    694695                'src/WorkerFileWriterCallbacksBridge.h',
     696                'src/WrappedResourceRequest.h',
     697                'src/WrappedResourceResponse.h',
    695698                'src/win/WebInputEventFactory.cpp',
    696699                'src/win/WebScreenInfoFactory.cpp',

  • trunk/Source/WebKit/chromium/src/ResourceHandle.cpp

    r112632 r112633  
    3737#include "ResourceRequest.h"
    3838#include "SharedBuffer.h"
     39
     40#include "WebKit.h"
     41#include "platform/WebKitPlatformSupport.h"
     42#include "platform/WebURLError.h"
     43#include "platform/WebURLLoader.h"
     44#include "platform/WebURLLoaderClient.h"
     45#include "platform/WebURLRequest.h"
     46#include "platform/WebURLResponse.h"
    3947#include "WrappedResourceRequest.h"
    4048#include "WrappedResourceResponse.h"
    41 #include <public/Platform.h>
    42 #include <public/WebURLError.h>
    43 #include <public/WebURLLoader.h>
    44 #include <public/WebURLLoaderClient.h>
    45 #include <public/WebURLRequest.h>
    46 #include <public/WebURLResponse.h>
    4749
    4850using namespace WebKit;
    … …  
    5658    , m_client(client)
    5759    , m_state(ConnectionStateNew)
    58 {
    59 }
     60{ }
    6061
    6162void ResourceHandleInternal::start()
    … …  
    6566    m_state = ConnectionStateStarted;
    6667
    67     m_loader = adoptPtr(Platform::current()->createURLLoader());
     68    m_loader = adoptPtr(webKitPlatformSupport()->createURLLoader());
    6869    ASSERT(m_loader);
    6970
    … …  
    245246bool ResourceHandle::loadsBlocked()
    246247{
    247     return false; // This seems to be related to sync XMLHttpRequest...
     248    return false;  // This seems to be related to sync XMLHttpRequest...
    248249}
    249250
    … …  
    256257                                               Vector<char>& data)
    257258{
    258     OwnPtr<WebURLLoader> loader = adoptPtr(Platform::current()->createURLLoader());
     259    OwnPtr<WebURLLoader> loader = adoptPtr(webKitPlatformSupport()->createURLLoader());
    259260    ASSERT(loader);
    260261
    … …  
    277278    // This method is used to determine if a POST request can be repeated from
    278279    // cache, but you cannot really know until you actually try to read from the
    279     // cache. Even if we checked now, something else could come along and wipe
     280    // cache.  Even if we checked now, something else could come along and wipe
    280281    // out the cache entry by the time we fetch it.
    281282    //
    282283    // So, we always say yes here, to prevent the FrameLoader from initiating a
    283     // reload. Then in FrameLoaderClientImpl::dispatchWillSendRequest, we
     284    // reload.  Then in FrameLoaderClientImpl::dispatchWillSendRequest, we
    284285    // fix-up the cache policy of the request to force a load from the cache.
    285286    //
    … …  
    291292void ResourceHandle::cacheMetadata(const ResourceResponse& response, const Vector<char>& data)
    292293{
    293     // FIXME: This should use Platform::current() directly.
    294294    PlatformSupport::cacheMetadata(response.url(), response.responseTime(), data);
    295295}

  • trunk/Source/WebKit/chromium/src/ResourceHandleInternal.h

    r112632 r112633  
    3333
    3434#include "ResourceRequest.h"
    35 #include <public/WebCommon.h>
    36 #include <public/WebURLLoader.h>
    37 #include <public/WebURLLoaderClient.h>
     35#include "platform/WebCommon.h"
     36#include "platform/WebURLLoader.h"
     37#include "platform/WebURLLoaderClient.h"
    3838
    3939namespace WebCore {

  • trunk/Source/WebKit/chromium/src/WrappedResourceRequest.h

    r112632 r112633  
    3232#define WrappedResourceRequest_h
    3333
     34#include "platform/WebURLRequest.h"
    3435#include "WebURLRequestPrivate.h"
    35 #include <public/WebURLRequest.h>
    3636
    3737namespace WebKit {

  • trunk/Source/WebKit/chromium/src/WrappedResourceResponse.h

    r112632 r112633  
    3232#define WrappedResourceResponse_h
    3333
     34#include "platform/WebURLResponse.h"
    3435#include "WebURLResponsePrivate.h"
    35 #include <public/WebURLResponse.h>
    3636
    3737namespace WebKit {
Note: See TracChangeset for help on using the changeset viewer.