Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(496)

Side by Side Diff: Source/core/inspector/InspectorResourceAgent.cpp

Issue 307943002: Oilpan: Prepare moving InspectorController and InspectorAgents to oilpan. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 if (!remoteIPAddress.isEmpty()) { 279 if (!remoteIPAddress.isEmpty()) {
280 responseObject->setRemoteIPAddress(remoteIPAddress); 280 responseObject->setRemoteIPAddress(remoteIPAddress);
281 responseObject->setRemotePort(response.remotePort()); 281 responseObject->setRemotePort(response.remotePort());
282 } 282 }
283 283
284 return responseObject; 284 return responseObject;
285 } 285 }
286 286
287 InspectorResourceAgent::~InspectorResourceAgent() 287 InspectorResourceAgent::~InspectorResourceAgent()
288 { 288 {
289 #if !ENABLE(OILPAN)
289 if (m_state->getBoolean(ResourceAgentState::resourceAgentEnabled)) { 290 if (m_state->getBoolean(ResourceAgentState::resourceAgentEnabled)) {
haraken 2014/06/17 14:06:17 Removing the line 290 - 294 is fine in oilpan buil
290 ErrorString error; 291 ErrorString error;
291 disable(&error); 292 disable(&error);
292 } 293 }
293 ASSERT(!m_instrumentingAgents->inspectorResourceAgent()); 294 ASSERT(!m_instrumentingAgents->inspectorResourceAgent());
295 #endif
296 }
297
298 void InspectorResourceAgent::trace(Visitor* visitor)
299 {
300 visitor->trace(m_pageAgent);
301 InspectorBaseAgent::trace(visitor);
294 } 302 }
295 303
296 void InspectorResourceAgent::willSendRequest(unsigned long identifier, DocumentL oader* loader, ResourceRequest& request, const ResourceResponse& redirectRespons e, const FetchInitiatorInfo& initiatorInfo) 304 void InspectorResourceAgent::willSendRequest(unsigned long identifier, DocumentL oader* loader, ResourceRequest& request, const ResourceResponse& redirectRespons e, const FetchInitiatorInfo& initiatorInfo)
297 { 305 {
298 // Ignore the request initiated internally. 306 // Ignore the request initiated internally.
299 if (initiatorInfo.name == FetchInitiatorTypeNames::internal) 307 if (initiatorInfo.name == FetchInitiatorTypeNames::internal)
300 return; 308 return;
301 String requestId = IdentifiersFactory::requestId(identifier); 309 String requestId = IdentifiersFactory::requestId(identifier);
302 m_resourcesData->resourceCreated(requestId, m_pageAgent->loaderId(loader)); 310 m_resourcesData->resourceCreated(requestId, m_pageAgent->loaderId(loader));
303 311
(...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after
817 InspectorResourceAgent::InspectorResourceAgent(InspectorPageAgent* pageAgent) 825 InspectorResourceAgent::InspectorResourceAgent(InspectorPageAgent* pageAgent)
818 : InspectorBaseAgent<InspectorResourceAgent>("Network") 826 : InspectorBaseAgent<InspectorResourceAgent>("Network")
819 , m_pageAgent(pageAgent) 827 , m_pageAgent(pageAgent)
820 , m_frontend(0) 828 , m_frontend(0)
821 , m_resourcesData(adoptPtr(new NetworkResourcesData())) 829 , m_resourcesData(adoptPtr(new NetworkResourcesData()))
822 , m_isRecalculatingStyle(false) 830 , m_isRecalculatingStyle(false)
823 { 831 {
824 } 832 }
825 833
826 } // namespace WebCore 834 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698