Changeset 89027 in webkit


Ignore:
Timestamp:
Jun 16, 2011 8:27:59 AM (13 years ago)
Author:
yurys@chromium.org
Message:

2011-06-16 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r89025.
http://trac.webkit.org/changeset/89025
https://bugs.webkit.org/show_bug.cgi?id=62799

"Some layout tests fail" (Requested by yurys on #webkit).

  • http/tests/inspector/network/network-xhr-async-expected.txt: Removed.
  • http/tests/inspector/network/network-xhr-async.html: Removed.
  • http/tests/inspector/network/network-xhr-sync-expected.txt: Removed.
  • http/tests/inspector/network/network-xhr-sync.html: Removed.

2011-06-16 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r89025.
http://trac.webkit.org/changeset/89025
https://bugs.webkit.org/show_bug.cgi?id=62799

"Some layout tests fail" (Requested by yurys on #webkit).

  • CMakeLists.txt:
  • GNUmakefile.list.am:
  • WebCore.gypi:
  • WebCore.pro:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • fileapi/FileReaderLoader.cpp: (WebCore::FileReaderLoader::didReceiveResponse):
  • fileapi/FileReaderLoader.h:
  • inspector/Inspector.json:
  • inspector/InspectorInstrumentation.cpp: (WebCore::InspectorInstrumentation::didCommitLoadImpl):
  • inspector/InspectorInstrumentation.h:
  • inspector/InspectorResourceAgent.cpp: (WebCore::InspectorResourceAgent::willSendRequest): (WebCore::InspectorResourceAgent::didReceiveResponse): (WebCore::InspectorResourceAgent::setInitialXHRContent): (WebCore::InspectorResourceAgent::InspectorResourceAgent):
  • inspector/InspectorResourceAgent.h:
  • inspector/NetworkResourcesData.cpp: Removed.
  • inspector/NetworkResourcesData.h: Removed.
  • inspector/front-end/NetworkManager.js: (WebInspector.NetworkManager.prototype.requestContent): (WebInspector.NetworkDispatcher.prototype._appendRedirect):
  • inspector/front-end/NetworkPanel.js: (WebInspector.NetworkPanel.prototype._appendResource): (WebInspector.NetworkPanel.prototype._frameNavigated):
  • loader/DocumentThreadableLoader.cpp: (WebCore::DocumentThreadableLoader::didReceiveResponse): (WebCore::DocumentThreadableLoader::receivedCancellation): (WebCore::DocumentThreadableLoader::loadRequest):
  • loader/DocumentThreadableLoader.h:
  • loader/ThreadableLoaderClient.h: (WebCore::ThreadableLoaderClient::didReceiveResponse): (WebCore::ThreadableLoaderClient::didReceiveAuthenticationCancellation):
  • loader/ThreadableLoaderClientWrapper.h: (WebCore::ThreadableLoaderClientWrapper::didReceiveResponse): (WebCore::ThreadableLoaderClientWrapper::didReceiveAuthenticationCancellation):
  • loader/WorkerThreadableLoader.cpp: (WebCore::workerContextDidReceiveResponse): (WebCore::WorkerThreadableLoader::MainThreadBridge::didReceiveResponse): (WebCore::workerContextDidReceiveAuthenticationCancellation): (WebCore::WorkerThreadableLoader::MainThreadBridge::didReceiveAuthenticationCancellation):
  • loader/WorkerThreadableLoader.h:
  • notifications/Notification.cpp: (WebCore::Notification::didReceiveResponse): (WebCore::Notification::didReceiveAuthenticationCancellation):
  • notifications/Notification.h:
  • page/EventSource.cpp: (WebCore::EventSource::didReceiveResponse):
  • page/EventSource.h:
  • workers/WorkerScriptLoader.cpp: (WebCore::WorkerScriptLoader::didReceiveResponse): (WebCore::WorkerScriptLoader::didReceiveAuthenticationCancellation):
  • workers/WorkerScriptLoader.h:
  • xml/XMLHttpRequest.cpp: (WebCore::XMLHttpRequest::createRequest): (WebCore::XMLHttpRequest::didReceiveResponse): (WebCore::XMLHttpRequest::didReceiveAuthenticationCancellation):
  • xml/XMLHttpRequest.h:

2011-06-16 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r89025.
http://trac.webkit.org/changeset/89025
https://bugs.webkit.org/show_bug.cgi?id=62799

"Some layout tests fail" (Requested by yurys on #webkit).

  • src/AssociatedURLLoader.cpp: (WebKit::AssociatedURLLoader::ClientAdapter::didReceiveResponse):
Location:
trunk
Files:
6 deleted
33 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r89025 r89027  
     12011-06-16  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r89025.
     4        http://trac.webkit.org/changeset/89025
     5        https://bugs.webkit.org/show_bug.cgi?id=62799
     6
     7        "Some layout tests fail" (Requested by yurys on #webkit).
     8
     9        * http/tests/inspector/network/network-xhr-async-expected.txt: Removed.
     10        * http/tests/inspector/network/network-xhr-async.html: Removed.
     11        * http/tests/inspector/network/network-xhr-sync-expected.txt: Removed.
     12        * http/tests/inspector/network/network-xhr-sync.html: Removed.
     13
    1142011-06-16  Vsevolod Vlasov  <vsevik@chromium.org>
    215
  • trunk/Source/WebCore/CMakeLists.txt

    r89025 r89027  
    886886    inspector/InspectorValues.cpp
    887887    inspector/InspectorWorkerAgent.cpp
    888     inspector/NetworkResourcesData.cpp
    889888    inspector/PageDebuggerAgent.cpp
    890889    inspector/ScriptArguments.cpp
  • trunk/Source/WebCore/ChangeLog

    r89026 r89027  
     12011-06-16  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r89025.
     4        http://trac.webkit.org/changeset/89025
     5        https://bugs.webkit.org/show_bug.cgi?id=62799
     6
     7        "Some layout tests fail" (Requested by yurys on #webkit).
     8
     9        * CMakeLists.txt:
     10        * GNUmakefile.list.am:
     11        * WebCore.gypi:
     12        * WebCore.pro:
     13        * WebCore.vcproj/WebCore.vcproj:
     14        * WebCore.xcodeproj/project.pbxproj:
     15        * fileapi/FileReaderLoader.cpp:
     16        (WebCore::FileReaderLoader::didReceiveResponse):
     17        * fileapi/FileReaderLoader.h:
     18        * inspector/Inspector.json:
     19        * inspector/InspectorInstrumentation.cpp:
     20        (WebCore::InspectorInstrumentation::didCommitLoadImpl):
     21        * inspector/InspectorInstrumentation.h:
     22        * inspector/InspectorResourceAgent.cpp:
     23        (WebCore::InspectorResourceAgent::willSendRequest):
     24        (WebCore::InspectorResourceAgent::didReceiveResponse):
     25        (WebCore::InspectorResourceAgent::setInitialXHRContent):
     26        (WebCore::InspectorResourceAgent::InspectorResourceAgent):
     27        * inspector/InspectorResourceAgent.h:
     28        * inspector/NetworkResourcesData.cpp: Removed.
     29        * inspector/NetworkResourcesData.h: Removed.
     30        * inspector/front-end/NetworkManager.js:
     31        (WebInspector.NetworkManager.prototype.requestContent):
     32        (WebInspector.NetworkDispatcher.prototype._appendRedirect):
     33        * inspector/front-end/NetworkPanel.js:
     34        (WebInspector.NetworkPanel.prototype._appendResource):
     35        (WebInspector.NetworkPanel.prototype._frameNavigated):
     36        * loader/DocumentThreadableLoader.cpp:
     37        (WebCore::DocumentThreadableLoader::didReceiveResponse):
     38        (WebCore::DocumentThreadableLoader::receivedCancellation):
     39        (WebCore::DocumentThreadableLoader::loadRequest):
     40        * loader/DocumentThreadableLoader.h:
     41        * loader/ThreadableLoaderClient.h:
     42        (WebCore::ThreadableLoaderClient::didReceiveResponse):
     43        (WebCore::ThreadableLoaderClient::didReceiveAuthenticationCancellation):
     44        * loader/ThreadableLoaderClientWrapper.h:
     45        (WebCore::ThreadableLoaderClientWrapper::didReceiveResponse):
     46        (WebCore::ThreadableLoaderClientWrapper::didReceiveAuthenticationCancellation):
     47        * loader/WorkerThreadableLoader.cpp:
     48        (WebCore::workerContextDidReceiveResponse):
     49        (WebCore::WorkerThreadableLoader::MainThreadBridge::didReceiveResponse):
     50        (WebCore::workerContextDidReceiveAuthenticationCancellation):
     51        (WebCore::WorkerThreadableLoader::MainThreadBridge::didReceiveAuthenticationCancellation):
     52        * loader/WorkerThreadableLoader.h:
     53        * notifications/Notification.cpp:
     54        (WebCore::Notification::didReceiveResponse):
     55        (WebCore::Notification::didReceiveAuthenticationCancellation):
     56        * notifications/Notification.h:
     57        * page/EventSource.cpp:
     58        (WebCore::EventSource::didReceiveResponse):
     59        * page/EventSource.h:
     60        * workers/WorkerScriptLoader.cpp:
     61        (WebCore::WorkerScriptLoader::didReceiveResponse):
     62        (WebCore::WorkerScriptLoader::didReceiveAuthenticationCancellation):
     63        * workers/WorkerScriptLoader.h:
     64        * xml/XMLHttpRequest.cpp:
     65        (WebCore::XMLHttpRequest::createRequest):
     66        (WebCore::XMLHttpRequest::didReceiveResponse):
     67        (WebCore::XMLHttpRequest::didReceiveAuthenticationCancellation):
     68        * xml/XMLHttpRequest.h:
     69
    1702011-06-16  Vitaly Repeshko  <vitalyr@chromium.org>
    271
  • trunk/Source/WebCore/GNUmakefile.list.am

    r89025 r89027  
    20102010        Source/WebCore/inspector/InspectorWorkerResource.h \
    20112011        Source/WebCore/inspector/InstrumentingAgents.h \
    2012         Source/WebCore/inspector/NetworkResourcesData.cpp \
    2013         Source/WebCore/inspector/NetworkResourcesData.h \
    20142012        Source/WebCore/inspector/PageDebuggerAgent.cpp \
    20152013        Source/WebCore/inspector/PageDebuggerAgent.h \
  • trunk/Source/WebCore/WebCore.gypi

    r89025 r89027  
    33163316            'inspector/InspectorWorkerAgent.h',
    33173317            'inspector/InstrumentingAgents.h',
    3318             'inspector/NetworkResourcesData.cpp',
    3319             'inspector/NetworkResourcesData.h',
    33203318            'inspector/PageDebuggerAgent.cpp',
    33213319            'inspector/PageDebuggerAgent.h',
  • trunk/Source/WebCore/WebCore.pro

    r89025 r89027  
    840840    inspector/InspectorValues.cpp \
    841841    inspector/InspectorWorkerAgent.cpp \
    842     inspector/NetworkResourcesData.cpp \
    843842    inspector/PageDebuggerAgent.cpp \
    844843    inspector/ScriptArguments.cpp \
     
    17901789    inspector/InspectorWorkerAgent.h \
    17911790    inspector/InstrumentingAgents.h \
    1792     inspector/NetworkResourcesData.h \
    17931791    inspector/PageDebuggerAgent.h \
    17941792    inspector/ScriptGCEventListener.h \
  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r89025 r89027  
    6771567715                        </File>
    6771667716                        <File
    67717                                 RelativePath="..\inspector\NetworkResourcesData.cpp"
    67718                                 >
    67719                         </File>
    67720                         <File
    67721                                 RelativePath="..\inspector\NetworkResourcesData.h"
    67722                                 >
    67723                         </File>
    67724                         <File
    6772567717                                RelativePath="..\inspector\PageDebuggerAgent.cpp"
    6772667718                                >
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r89025 r89027  
    14501450                59B5977511086579007159E8 /* BridgeJSC.h in Headers */ = {isa = PBXBuildFile; fileRef = 59B5977411086579007159E8 /* BridgeJSC.h */; settings = {ATTRIBUTES = (Private, ); }; };
    14511451                59BC393F11054A1300FD85DB /* JavaStringJSC.h in Headers */ = {isa = PBXBuildFile; fileRef = 59BC393E11054A1300FD85DB /* JavaStringJSC.h */; };
    1452                 59C27F05138D28C10079B7E2 /* NetworkResourcesData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59C27F04138D28C10079B7E2 /* NetworkResourcesData.cpp */; };
    1453                 59C27F07138D28CF0079B7E2 /* NetworkResourcesData.h in Headers */ = {isa = PBXBuildFile; fileRef = 59C27F06138D28CF0079B7E2 /* NetworkResourcesData.h */; };
    14541452                59D1C10411EB5DCF00B638C8 /* DeviceOrientation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59D1C10311EB5DCF00B638C8 /* DeviceOrientation.cpp */; };
    14551453                59E560A71105336600AA1258 /* JavaClassJSC.h in Headers */ = {isa = PBXBuildFile; fileRef = 59E560A61105336600AA1258 /* JavaClassJSC.h */; };
     
    79357933                59B5977411086579007159E8 /* BridgeJSC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BridgeJSC.h; path = bridge/jsc/BridgeJSC.h; sourceTree = "<group>"; };
    79367934                59BC393E11054A1300FD85DB /* JavaStringJSC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JavaStringJSC.h; path = jsc/JavaStringJSC.h; sourceTree = "<group>"; };
    7937                 59C27F04138D28C10079B7E2 /* NetworkResourcesData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkResourcesData.cpp; sourceTree = "<group>"; };
    7938                 59C27F06138D28CF0079B7E2 /* NetworkResourcesData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkResourcesData.h; sourceTree = "<group>"; };
    79397935                59D1C10311EB5DCF00B638C8 /* DeviceOrientation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeviceOrientation.cpp; sourceTree = "<group>"; };
    79407936                59E560A61105336600AA1258 /* JavaClassJSC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JavaClassJSC.h; path = jsc/JavaClassJSC.h; sourceTree = "<group>"; };
     
    1330613302                                1C81BA050E97348300266E07 /* JavaScriptCallFrame.idl */,
    1330713303                                BCC64F5F0DCFB84E0081EF3B /* localizedStrings.js */,
    13308                                 59C27F04138D28C10079B7E2 /* NetworkResourcesData.cpp */,
    13309                                 59C27F06138D28CF0079B7E2 /* NetworkResourcesData.h */,
    1331013304                                F34742DA134362F000531BC2 /* PageDebuggerAgent.cpp */,
    1331113305                                F34742DB134362F000531BC2 /* PageDebuggerAgent.h */,
     
    2195521949                                656D37430ADBA5DE00A4554D /* NetscapePlugInStreamLoader.h in Headers */,
    2195621950                                628D214C12131ED10055DCFC /* NetworkingContext.h in Headers */,
    21957                                 59C27F07138D28CF0079B7E2 /* NetworkResourcesData.h in Headers */,
    2195821951                                1A7FA6190DDA3B3A0028F8A5 /* NetworkStateNotifier.h in Headers */,
    2195921952                                BCEF43DD0E674012001C1287 /* NinePieceImage.h in Headers */,
     
    2490924902                                E12719CA0EEEC21300F61213 /* NavigatorBase.cpp in Sources */,
    2491024903                                5D874F130D161D3200796C3B /* NetscapePlugInStreamLoader.cpp in Sources */,
    24911                                 59C27F05138D28C10079B7E2 /* NetworkResourcesData.cpp in Sources */,
    2491224904                                1A7FA61B0DDA3BBE0028F8A5 /* NetworkStateNotifier.cpp in Sources */,
    2491324905                                1A7FA6490DDA3CBA0028F8A5 /* NetworkStateNotifierMac.cpp in Sources */,
  • trunk/Source/WebCore/fileapi/FileReaderLoader.cpp

    r89025 r89027  
    124124}
    125125
    126 void FileReaderLoader::didReceiveResponse(unsigned long, const ResourceResponse& response)
     126void FileReaderLoader::didReceiveResponse(const ResourceResponse& response)
    127127{
    128128    if (response.httpStatusCode() != 200) {
  • trunk/Source/WebCore/fileapi/FileReaderLoader.h

    r89025 r89027  
    6767
    6868    // ThreadableLoaderClient
    69     virtual void didReceiveResponse(unsigned long, const ResourceResponse&);
     69    virtual void didReceiveResponse(const ResourceResponse&);
    7070    virtual void didReceiveData(const char*, int);
    7171    virtual void didFinishLoading(unsigned long, double);
  • trunk/Source/WebCore/inspector/Inspector.json

    r89025 r89027  
    486486                    { "name": "enabled", "type": "boolean" }
    487487                ]
    488             },
    489             {
    490                 "name": "getResourceContent",
    491                 "description": "Returns content of the given resource.",
    492                 "parameters": [
    493                     { "name": "identifier", "type": "integer", "description": "Identifier of the resource to get content for." },
    494                     { "name": "base64Encode", "type": "boolean", "optional": true, "description": "Requests that resource content is served as base64." }
    495                 ],
    496                 "returns": [
    497                     { "name": "content", "type": "string", "description": "Resource content." }
    498                 ]
    499488            }
    500489        ],
     
    572561            {
    573562                "name": "initialContentSet",
    574                 "description": "Fired for worker scripts when their content becomes available.",
     563                "description": "Fired for XMLHttpRequests when their content becomes available.",
    575564                "parameters": [
    576565                    { "name": "identifier", "type": "integer", "description": "Request identifier." },
  • trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

    r89025 r89027  
    517517}
    518518
    519 void InspectorInstrumentation::didReceiveXHRResponseImpl(InstrumentingAgents* instrumentingAgents, unsigned long identifier)
    520 {
    521     if (InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorResourceAgent())
    522         resourceAgent->didReceiveXHRResponse(identifier);
    523 }
    524 
    525 void InspectorInstrumentation::willLoadXHRSynchronouslyImpl(InstrumentingAgents* instrumentingAgents)
    526 {
    527     if (InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorResourceAgent())
    528         resourceAgent->willLoadXHRSynchronously();
    529 }
    530 
    531 void InspectorInstrumentation::didLoadXHRSynchronouslyImpl(InstrumentingAgents* instrumentingAgents)
    532 {
    533     if (InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorResourceAgent())
    534         resourceAgent->didLoadXHRSynchronously();
    535 }
    536 
    537519void InspectorInstrumentation::scriptImportedImpl(InstrumentingAgents* instrumentingAgents, unsigned long identifier, const String& sourceString)
    538520{
     
    596578        if (InspectorConsoleAgent* consoleAgent = instrumentingAgents->inspectorConsoleAgent())
    597579            consoleAgent->reset();
    598 
    599         if (InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorResourceAgent())
    600             resourceAgent->mainFrameNavigated(loader);
    601 
    602580#if ENABLE(JAVASCRIPT_DEBUGGER)
    603581        if (InspectorDebuggerAgent* debuggerAgent = instrumentingAgents->inspectorDebuggerAgent()) {
  • trunk/Source/WebCore/inspector/InspectorInstrumentation.h

    r89025 r89027  
    129129    static void didFailLoading(Frame*, unsigned long identifier, const ResourceError&);
    130130    static void resourceRetrievedByXMLHttpRequest(ScriptExecutionContext*, unsigned long identifier, const String& sourceString, const String& url, const String& sendURL, unsigned sendLineNumber);
    131     static void didReceiveXHRResponse(ScriptExecutionContext*, unsigned long identifier);
    132     static void willLoadXHRSynchronously(ScriptExecutionContext*);
    133     static void didLoadXHRSynchronously(ScriptExecutionContext*);
    134131    static void scriptImported(ScriptExecutionContext*, unsigned long identifier, const String& sourceString);
    135132    static void domContentLoadedEventFired(Frame*, const KURL&);
     
    257254    static void didFailLoadingImpl(InstrumentingAgents*, unsigned long identifier, const ResourceError&);
    258255    static void resourceRetrievedByXMLHttpRequestImpl(InstrumentingAgents*, unsigned long identifier, const String& sourceString, const String& url, const String& sendURL, unsigned sendLineNumber);
    259     static void didReceiveXHRResponseImpl(InstrumentingAgents*, unsigned long identifier);
    260     static void willLoadXHRSynchronouslyImpl(InstrumentingAgents*);
    261     static void didLoadXHRSynchronouslyImpl(InstrumentingAgents*);
    262256    static void scriptImportedImpl(InstrumentingAgents*, unsigned long identifier, const String& sourceString);
    263257    static void domContentLoadedEventFiredImpl(InstrumentingAgents*, Frame*, const KURL&);
     
    784778    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForContext(context))
    785779        resourceRetrievedByXMLHttpRequestImpl(instrumentingAgents, identifier, sourceString, url, sendURL, sendLineNumber);
    786 #endif
    787 }
    788 
    789 inline void InspectorInstrumentation::didReceiveXHRResponse(ScriptExecutionContext* context, unsigned long identifier)
    790 {
    791 #if ENABLE(INSPECTOR)
    792     if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForContext(context))
    793         didReceiveXHRResponseImpl(instrumentingAgents, identifier);
    794 #endif
    795 }
    796 
    797 inline void InspectorInstrumentation::willLoadXHRSynchronously(ScriptExecutionContext* context)
    798 {
    799 #if ENABLE(INSPECTOR)
    800     if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForContext(context))
    801         willLoadXHRSynchronouslyImpl(instrumentingAgents);
    802 #endif
    803 }
    804 
    805 inline void InspectorInstrumentation::didLoadXHRSynchronously(ScriptExecutionContext* context)
    806 {
    807 #if ENABLE(INSPECTOR)
    808     if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForContext(context))
    809         didLoadXHRSynchronouslyImpl(instrumentingAgents);
    810780#endif
    811781}
  • trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp

    r89025 r89027  
    4949#include "InstrumentingAgents.h"
    5050#include "KURL.h"
    51 #include "NetworkResourcesData.h"
    5251#include "ProgressTracker.h"
    5352#include "ResourceError.h"
     
    196195void InspectorResourceAgent::willSendRequest(unsigned long identifier, DocumentLoader* loader, ResourceRequest& request, const ResourceResponse& redirectResponse)
    197196{
    198     m_resourcesData->resourceCreated(identifier, m_pageAgent->loaderId(loader));
    199 
    200197    RefPtr<InspectorObject> headers = m_state->getObject(ResourceAgentState::extraRequestHeaders);
    201198
     
    245242        else if (equalIgnoringFragmentIdentifier(response.url(), loader->url()) && type == InspectorPageAgent::OtherResource)
    246243            type = InspectorPageAgent::DocumentResource;
    247         else if (m_loadingXHRSynchronously || m_resourcesData->isXHR(identifier))
    248             type = InspectorPageAgent::XHRResource;
    249 
    250         m_resourcesData->responseReceived(identifier, m_pageAgent->frameId(loader->frame()), response.url());
    251     }
    252 
     244    }
    253245    m_frontend->responseReceived(static_cast<int>(identifier), currentTime(), InspectorPageAgent::resourceTypeString(type), resourceResponse);
    254246    // If we revalidated the resource and got Not modified, send content length following didReceiveResponse
     
    288280void InspectorResourceAgent::setInitialXHRContent(unsigned long identifier, const String& sourceString)
    289281{
    290     m_resourcesData->addResourceContent(identifier, sourceString);
    291 }
    292 
    293 void InspectorResourceAgent::didReceiveXHRResponse(unsigned long identifier)
    294 {
    295     m_resourcesData->didReceiveXHRResponse(identifier);
    296 }
    297 
    298 void InspectorResourceAgent::willLoadXHRSynchronously()
    299 {
    300     m_loadingXHRSynchronously = true;
    301 }
    302 
    303 void InspectorResourceAgent::didLoadXHRSynchronously()
    304 {
    305     m_loadingXHRSynchronously = false;
     282    m_frontend->initialContentSet(static_cast<int>(identifier), sourceString, InspectorPageAgent::resourceTypeString(InspectorPageAgent::XHRResource));
    306283}
    307284
     
    426403}
    427404
    428 void InspectorResourceAgent::getResourceContent(ErrorString* errorString, unsigned long identifier, const bool* const optionalBase64Encode, String* content)
    429 {
    430     NetworkResourcesData::ResourceData* resourceData = m_resourcesData->data(identifier);
    431     if (!resourceData) {
    432         *errorString = "No resource with given identifier found";
    433         return;
    434     }
    435 
    436     if (resourceData->hasContent())
    437         *content = resourceData->content();
    438     else if (!resourceData->frameId().isNull() && !resourceData->url().isNull())
    439         m_pageAgent->getResourceContent(errorString, resourceData->frameId(), resourceData->url(), optionalBase64Encode, content);
    440     else
    441         *errorString = "No data found for resource with given identifier";
    442 }
    443 
    444 void InspectorResourceAgent::mainFrameNavigated(DocumentLoader* loader)
    445 {
    446     m_resourcesData->clear(m_pageAgent->loaderId(loader));
    447 }
    448 
    449405InspectorResourceAgent::InspectorResourceAgent(InstrumentingAgents* instrumentingAgents, InspectorPageAgent* pageAgent, InspectorState* state)
    450406    : m_instrumentingAgents(instrumentingAgents)
    451407    , m_pageAgent(pageAgent)
    452408    , m_state(state)
    453     , m_resourcesData(adoptPtr(new NetworkResourcesData()))
    454     , m_loadingXHRSynchronously(false)
    455409{
    456410    if (isBackgroundEventsCollectionEnabled()) {
  • trunk/Source/WebCore/inspector/InspectorResourceAgent.h

    r89025 r89027  
    3535#include "PlatformString.h"
    3636
     37#include <wtf/OwnPtr.h>
    3738#include <wtf/PassRefPtr.h>
    3839#include <wtf/Vector.h>
     
    4950class Document;
    5051class DocumentLoader;
    51 class EventsCollector;
    5252class Frame;
    5353class InspectorArray;
     
    5959class InstrumentingAgents;
    6060class KURL;
    61 class NetworkResourcesData;
     61class EventsCollector;
    6262class Page;
    6363class ResourceError;
     
    9595    void didFailLoading(unsigned long identifier, const ResourceError&);
    9696    void didLoadResourceFromMemoryCache(DocumentLoader*, const CachedResource*);
    97     void mainFrameNavigated(DocumentLoader*);
    9897    void setInitialScriptContent(unsigned long identifier, const String& sourceString);
    9998    void setInitialXHRContent(unsigned long identifier, const String& sourceString);
    100     void didReceiveXHRResponse(unsigned long identifier);
    101     void willLoadXHRSynchronously();
    102     void didLoadXHRSynchronously();
    103 
    10499    void applyUserAgentOverride(String* userAgent);
    105100
     
    119114    void setUserAgentOverride(ErrorString*, const String& userAgent);
    120115    void setExtraHeaders(ErrorString*, PassRefPtr<InspectorObject>);
    121     void getResourceContent(ErrorString*, unsigned long identifier, const bool* const base64Encode, String* content);
    122     void clearCache(ErrorString*, const String* const optionalPreservedLoaderId);
     116
    123117
    124118private:
     
    137131    OwnPtr<InspectorFrontend::Network> m_mockFrontend;
    138132    String m_userAgentOverride;
    139     OwnPtr<NetworkResourcesData> m_resourcesData;
    140     bool m_loadingXHRSynchronously;
    141133};
    142134
  • trunk/Source/WebCore/inspector/front-end/NetworkManager.js

    r89025 r89027  
    4949            callback(!error ? content : null);
    5050        }
    51         // FIXME: https://bugs.webkit.org/show_bug.cgi?id=61363 We should separate NetworkResource (NetworkPanel resource)
    52         // from ResourceRevision (ResourcesPanel/ScriptsPanel resource) and request content accordingly.
    53         if (resource.identifier)
    54             NetworkAgent.getResourceContent(resource.identifier, base64Encode, callbackWrapper);
    55         else
    56             PageAgent.getResourceContent(resource.frameId, resource.url, base64Encode, callbackWrapper);
     51        PageAgent.getResourceContent(resource.frameId, resource.url, base64Encode, callbackWrapper);
    5752    },
    5853
     
    269264        var originalResource = this._inflightResourcesById[identifier];
    270265        var previousRedirects = originalResource.redirects || [];
    271         delete originalResource.identifier;
     266        originalResource.identifier = "redirected:" + identifier + "." + previousRedirects.length;
    272267        delete originalResource.redirects;
    273268        this._finishResource(originalResource, time);
  • trunk/Source/WebCore/inspector/front-end/NetworkPanel.js

    r89025 r89027  
    742742    {
    743743        this._resources.push(resource);
    744         if (resource.identifier)
    745             this._resourcesById[resource.identifier] = resource;
     744        this._resourcesById[resource.identifier] = resource;
    746745        this._resourcesByURL[resource.url] = resource;
    747746
     
    780779        var loaderId = event.data.loaderId;
    781780        // Main frame committed load.
    782         if (this._preserveLogToggle.toggled) {
    783             for (var i = 0; i < this._resources.length; ++i) {
    784                 var resource = this._resources[i];
    785                 if (resource.loaderId !== loaderId)
    786                     resource.identifier = null;
    787             }
     781        if (this._preserveLogToggle.toggled)
    788782            return;
    789         }
    790783
    791784        // Preserve provisional load resources.
  • trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp

    r89025 r89027  
    172172void DocumentThreadableLoader::didReceiveResponse(SubresourceLoader* loader, const ResourceResponse& response)
    173173{
    174     ASSERT(loader == m_loader);
    175     didReceiveResponse(loader->identifier(), response);
    176 }
    177 
    178 void DocumentThreadableLoader::didReceiveResponse(unsigned long identifier, const ResourceResponse& response)
    179 {
    180     ASSERT(m_client);
     174    ASSERT(m_client);
     175    ASSERT_UNUSED(loader, loader == m_loader);
    181176
    182177    String accessControlErrorDescription;
     
    204199        }
    205200
    206         m_client->didReceiveResponse(identifier, response);
     201        m_client->didReceiveResponse(response);
    207202    }
    208203}
     
    291286    ASSERT(m_client);
    292287    ASSERT_UNUSED(loader, loader == m_loader);
    293     m_client->didReceiveAuthenticationCancellation(loader->identifier(), challenge.failureResponse());
     288    m_client->didReceiveAuthenticationCancellation(challenge.failureResponse());
    294289}
    295290
     
    357352    }
    358353
    359     didReceiveResponse(identifier, response);
     354    didReceiveResponse(0, response);
    360355
    361356    const char* bytes = static_cast<const char*>(data.data());
  • trunk/Source/WebCore/loader/DocumentThreadableLoader.h

    r89025 r89027  
    8787        virtual void receivedCancellation(SubresourceLoader*, const AuthenticationChallenge&);
    8888
    89         void didReceiveResponse(unsigned long identifier, const ResourceResponse&);
    9089        void didFinishLoading(unsigned long identifier, double finishTime);
    9190        void makeSimpleCrossOriginAccessRequest(const ResourceRequest& request);
  • trunk/Source/WebCore/loader/ThreadableLoaderClient.h

    r89025 r89027  
    4343        virtual void didSendData(unsigned long long /*bytesSent*/, unsigned long long /*totalBytesToBeSent*/) { }
    4444
    45         virtual void didReceiveResponse(unsigned long /*identifier*/, const ResourceResponse&) { }
     45        virtual void didReceiveResponse(const ResourceResponse&) { }
    4646        virtual void didReceiveData(const char*, int /*dataLength*/) { }
    4747        virtual void didReceiveCachedMetadata(const char*, int /*dataLength*/) { }
     
    5050        virtual void didFailRedirectCheck() { }
    5151
    52         virtual void didReceiveAuthenticationCancellation(unsigned long /*identifier*/, const ResourceResponse&) { }
     52        virtual void didReceiveAuthenticationCancellation(const ResourceResponse&) { }
    5353
    5454        virtual bool isDocumentThreadableLoaderClient() { return false; }
  • trunk/Source/WebCore/loader/ThreadableLoaderClientWrapper.h

    r89025 r89027  
    6363    }
    6464
    65     void didReceiveResponse(unsigned long identifier, const ResourceResponse& response)
     65    void didReceiveResponse(const ResourceResponse& response)
    6666    {
    6767        if (m_client)
    68             m_client->didReceiveResponse(identifier, response);
     68            m_client->didReceiveResponse(response);
    6969    }
    7070
     
    102102    }
    103103
    104     void didReceiveAuthenticationCancellation(unsigned long identifier, const ResourceResponse& response)
     104    void didReceiveAuthenticationCancellation(const ResourceResponse& response)
    105105    {
    106106        if (m_client)
    107             m_client->didReceiveResponse(identifier, response);
     107            m_client->didReceiveResponse(response);
    108108    }
    109109
  • trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp

    r89025 r89027  
    178178}
    179179
    180 static void workerContextDidReceiveResponse(ScriptExecutionContext* context, RefPtr<ThreadableLoaderClientWrapper> workerClientWrapper, unsigned long identifier, PassOwnPtr<CrossThreadResourceResponseData> responseData)
     180static void workerContextDidReceiveResponse(ScriptExecutionContext* context, RefPtr<ThreadableLoaderClientWrapper> workerClientWrapper, PassOwnPtr<CrossThreadResourceResponseData> responseData)
    181181{
    182182    ASSERT_UNUSED(context, context->isWorkerContext());
    183183    OwnPtr<ResourceResponse> response(ResourceResponse::adopt(responseData));
    184     workerClientWrapper->didReceiveResponse(identifier, *response);
    185 }
    186 
    187 void WorkerThreadableLoader::MainThreadBridge::didReceiveResponse(unsigned long identifier, const ResourceResponse& response)
    188 {
    189     m_loaderProxy.postTaskForModeToWorkerContext(createCallbackTask(&workerContextDidReceiveResponse, m_workerClientWrapper, identifier, response), m_taskMode);
     184    workerClientWrapper->didReceiveResponse(*response);
     185}
     186
     187void WorkerThreadableLoader::MainThreadBridge::didReceiveResponse(const ResourceResponse& response)
     188{
     189    m_loaderProxy.postTaskForModeToWorkerContext(createCallbackTask(&workerContextDidReceiveResponse, m_workerClientWrapper, response), m_taskMode);
    190190}
    191191
     
    249249}
    250250
    251 static void workerContextDidReceiveAuthenticationCancellation(ScriptExecutionContext* context, RefPtr<ThreadableLoaderClientWrapper> workerClientWrapper, unsigned long identifier, PassOwnPtr<CrossThreadResourceResponseData> responseData)
     251static void workerContextDidReceiveAuthenticationCancellation(ScriptExecutionContext* context, RefPtr<ThreadableLoaderClientWrapper> workerClientWrapper, PassOwnPtr<CrossThreadResourceResponseData> responseData)
    252252{
    253253    ASSERT_UNUSED(context, context->isWorkerContext());
    254254    OwnPtr<ResourceResponse> response(ResourceResponse::adopt(responseData));
    255     workerClientWrapper->didReceiveAuthenticationCancellation(identifier, *response);
    256 }
    257 
    258 void WorkerThreadableLoader::MainThreadBridge::didReceiveAuthenticationCancellation(unsigned long identifier, const ResourceResponse& response)
    259 {
    260     m_loaderProxy.postTaskForModeToWorkerContext(createCallbackTask(&workerContextDidReceiveAuthenticationCancellation, m_workerClientWrapper, identifier, response), m_taskMode);
     255    workerClientWrapper->didReceiveAuthenticationCancellation(*response);
     256}
     257
     258void WorkerThreadableLoader::MainThreadBridge::didReceiveAuthenticationCancellation(const ResourceResponse& response)
     259{
     260    m_loaderProxy.postTaskForModeToWorkerContext(createCallbackTask(&workerContextDidReceiveAuthenticationCancellation, m_workerClientWrapper, response), m_taskMode);
    261261}
    262262
  • trunk/Source/WebCore/loader/WorkerThreadableLoader.h

    r89025 r89027  
    114114            static void mainThreadCancel(ScriptExecutionContext*, MainThreadBridge*);
    115115            virtual void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent);
    116             virtual void didReceiveResponse(unsigned long identifier, const ResourceResponse&);
     116            virtual void didReceiveResponse(const ResourceResponse&);
    117117            virtual void didReceiveData(const char*, int dataLength);
    118118            virtual void didReceiveCachedMetadata(const char*, int dataLength);
     
    120120            virtual void didFail(const ResourceError&);
    121121            virtual void didFailRedirectCheck();
    122             virtual void didReceiveAuthenticationCancellation(unsigned long identifier, const ResourceResponse&);
     122            virtual void didReceiveAuthenticationCancellation(const ResourceResponse&);
    123123
    124124            // Only to be used on the main thread.
  • trunk/Source/WebCore/notifications/Notification.cpp

    r89025 r89027  
    182182}
    183183
    184 void Notification::didReceiveResponse(unsigned long, const ResourceResponse& response)
     184void Notification::didReceiveResponse(const ResourceResponse& response)
    185185{
    186186    int status = response.httpStatusCode();
     
    212212}
    213213
    214 void Notification::didReceiveAuthenticationCancellation(unsigned long, const ResourceResponse&)
     214void Notification::didReceiveAuthenticationCancellation(const ResourceResponse&)
    215215{
    216216    finishLoading();
  • trunk/Source/WebCore/notifications/Notification.h

    r89025 r89027  
    103103        void detachPresenter() { }
    104104
    105         virtual void didReceiveResponse(unsigned long, const ResourceResponse&);
     105        virtual void didReceiveResponse(const ResourceResponse&);
    106106        virtual void didReceiveData(const char* data, int dataLength);
    107107        virtual void didFinishLoading(unsigned long identifier, double finishTime);
    108108        virtual void didFail(const ResourceError&);
    109109        virtual void didFailRedirectCheck();
    110         virtual void didReceiveAuthenticationCancellation(unsigned long, const ResourceResponse&);
     110        virtual void didReceiveAuthenticationCancellation(const ResourceResponse&);
    111111
    112112    private:
  • trunk/Source/WebCore/page/EventSource.cpp

    r89025 r89027  
    182182}
    183183
    184 void EventSource::didReceiveResponse(unsigned long, const ResourceResponse& response)
     184void EventSource::didReceiveResponse(const ResourceResponse& response)
    185185{
    186186    int statusCode = response.httpStatusCode();
  • trunk/Source/WebCore/page/EventSource.h

    r89025 r89027  
    9191        virtual EventTargetData* ensureEventTargetData();
    9292
    93         virtual void didReceiveResponse(unsigned long, const ResourceResponse&);
     93        virtual void didReceiveResponse(const ResourceResponse&);
    9494        virtual void didReceiveData(const char*, int);
    9595        virtual void didFinishLoading(unsigned long, double);
  • trunk/Source/WebCore/workers/WorkerScriptLoader.cpp

    r89025 r89027  
    112112}
    113113   
    114 void WorkerScriptLoader::didReceiveResponse(unsigned long /*identifier*/, const ResourceResponse& response)
     114void WorkerScriptLoader::didReceiveResponse(const ResourceResponse& response)
    115115{
    116116    if (response.httpStatusCode() / 100 != 2 && response.httpStatusCode()) {
     
    169169}
    170170
    171 void WorkerScriptLoader::didReceiveAuthenticationCancellation(unsigned long /*identifier*/, const ResourceResponse&)
     171void WorkerScriptLoader::didReceiveAuthenticationCancellation(const ResourceResponse&)
    172172{
    173173    notifyError();
  • trunk/Source/WebCore/workers/WorkerScriptLoader.h

    r89025 r89027  
    6767        unsigned long identifier() const { return m_identifier; }
    6868
    69         virtual void didReceiveResponse(unsigned long /*identifier*/, const ResourceResponse&);
     69        virtual void didReceiveResponse(const ResourceResponse&);
    7070        virtual void didReceiveData(const char* data, int dataLength);
    7171        virtual void didFinishLoading(unsigned long identifier, double);
    7272        virtual void didFail(const ResourceError&);
    7373        virtual void didFailRedirectCheck();
    74         virtual void didReceiveAuthenticationCancellation(unsigned long /*identifier*/, const ResourceResponse&);
     74        virtual void didReceiveAuthenticationCancellation(const ResourceResponse&);
    7575
    7676    private:
  • trunk/Source/WebCore/xml/XMLHttpRequest.cpp

    r89025 r89027  
    673673            setPendingActivity(this);
    674674        }
    675     } else {
    676         InspectorInstrumentation::willLoadXHRSynchronously(scriptExecutionContext());
     675    } else
    677676        ThreadableLoader::loadResourceSynchronously(scriptExecutionContext(), request, *this, options);
    678         InspectorInstrumentation::didLoadXHRSynchronously(scriptExecutionContext());
    679     }
    680677
    681678    if (!m_exceptionCode && m_error)
     
    10361033}
    10371034
    1038 void XMLHttpRequest::didReceiveResponse(unsigned long identifier, const ResourceResponse& response)
    1039 {
    1040     InspectorInstrumentation::didReceiveXHRResponse(scriptExecutionContext(), identifier);
    1041 
     1035void XMLHttpRequest::didReceiveResponse(const ResourceResponse& response)
     1036{
    10421037    m_response = response;
    10431038    m_responseEncoding = extractCharsetFromMediaType(m_mimeTypeOverride);
     
    10461041}
    10471042
    1048 void XMLHttpRequest::didReceiveAuthenticationCancellation(unsigned long, const ResourceResponse& failureResponse)
     1043void XMLHttpRequest::didReceiveAuthenticationCancellation(const ResourceResponse& failureResponse)
    10491044{
    10501045    m_response = failureResponse;
  • trunk/Source/WebCore/xml/XMLHttpRequest.h

    r89025 r89027  
    151151
    152152    virtual void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent);
    153     virtual void didReceiveResponse(unsigned long identifier, const ResourceResponse&);
     153    virtual void didReceiveResponse(const ResourceResponse&);
    154154    virtual void didReceiveData(const char* data, int dataLength);
    155155    virtual void didFinishLoading(unsigned long identifier, double finishTime);
    156156    virtual void didFail(const ResourceError&);
    157157    virtual void didFailRedirectCheck();
    158     virtual void didReceiveAuthenticationCancellation(unsigned long identifier, const ResourceResponse&);
     158    virtual void didReceiveAuthenticationCancellation(const ResourceResponse&);
    159159
    160160    String responseMIMEType() const;
  • trunk/Source/WebKit/chromium/ChangeLog

    r89026 r89027  
     12011-06-16  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r89025.
     4        http://trac.webkit.org/changeset/89025
     5        https://bugs.webkit.org/show_bug.cgi?id=62799
     6
     7        "Some layout tests fail" (Requested by yurys on #webkit).
     8
     9        * src/AssociatedURLLoader.cpp:
     10        (WebKit::AssociatedURLLoader::ClientAdapter::didReceiveResponse):
     11
    1122011-06-16  Vitaly Repeshko  <vitalyr@chromium.org>
    213
  • trunk/Source/WebKit/chromium/src/AssociatedURLLoader.cpp

    r89025 r89027  
    6161    virtual void willSendRequest(ResourceRequest& /*newRequest*/, const ResourceResponse& /*redirectResponse*/);
    6262
    63     virtual void didReceiveResponse(unsigned long, const ResourceResponse&);
     63    virtual void didReceiveResponse(const ResourceResponse&);
    6464    virtual void didReceiveData(const char*, int /*dataLength*/);
    6565    virtual void didReceiveCachedMetadata(const char*, int /*dataLength*/);
     
    114114}
    115115
    116 void AssociatedURLLoader::ClientAdapter::didReceiveResponse(unsigned long, const ResourceResponse& response)
     116void AssociatedURLLoader::ClientAdapter::didReceiveResponse(const ResourceResponse& response)
    117117{
    118118    WrappedResourceResponse wrappedResponse(response);
Note: See TracChangeset for help on using the changeset viewer.