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

Side by Side Diff: Source/web/WebDevToolsAgentImpl.cpp

Issue 1003243002: [DevTools] Cleanup after reversing emulation flow. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebased Created 5 years, 9 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
« no previous file with comments | « Source/web/WebDevToolsAgentImpl.h ('k') | Source/web/WebViewImpl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010-2011 Google Inc. All rights reserved. 2 * Copyright (C) 2010-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 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 m_injectedScriptManager->injectedScriptHost()->init(m_instrumentingAgents.ge t(), scriptDebugServer); 294 m_injectedScriptManager->injectedScriptHost()->init(m_instrumentingAgents.ge t(), scriptDebugServer);
295 295
296 m_agents.append(InspectorDatabaseAgent::create(page)); 296 m_agents.append(InspectorDatabaseAgent::create(page));
297 m_agents.append(DeviceOrientationInspectorAgent::create(page)); 297 m_agents.append(DeviceOrientationInspectorAgent::create(page));
298 m_agents.append(InspectorFileSystemAgent::create(page)); 298 m_agents.append(InspectorFileSystemAgent::create(page));
299 m_agents.append(InspectorIndexedDBAgent::create(page)); 299 m_agents.append(InspectorIndexedDBAgent::create(page));
300 m_agents.append(InspectorAccessibilityAgent::create(page)); 300 m_agents.append(InspectorAccessibilityAgent::create(page));
301 m_agents.append(InspectorDOMStorageAgent::create(page)); 301 m_agents.append(InspectorDOMStorageAgent::create(page));
302 302
303 m_webViewImpl->settingsImpl()->setWebDevToolsAgentImpl(this); 303 m_webViewImpl->settingsImpl()->setWebDevToolsAgentImpl(this);
304 m_webViewImpl->devToolsEmulator()->setDevToolsAgent(this);
305 } 304 }
306 305
307 WebDevToolsAgentImpl::~WebDevToolsAgentImpl() 306 WebDevToolsAgentImpl::~WebDevToolsAgentImpl()
308 { 307 {
309 ASSERT(m_hasBeenDisposed); 308 ASSERT(m_hasBeenDisposed);
310 } 309 }
311 310
312 void WebDevToolsAgentImpl::dispose() 311 void WebDevToolsAgentImpl::dispose()
313 { 312 {
314 // Explicitly dispose of the agent before destructing to ensure 313 // Explicitly dispose of the agent before destructing to ensure
315 // same behavior (and correctness) with and without Oilpan. 314 // same behavior (and correctness) with and without Oilpan.
316 ClientMessageLoopAdapter::inspectedViewClosed(m_webViewImpl); 315 ClientMessageLoopAdapter::inspectedViewClosed(m_webViewImpl);
317 m_webViewImpl->settingsImpl()->setWebDevToolsAgentImpl(nullptr); 316 m_webViewImpl->settingsImpl()->setWebDevToolsAgentImpl(nullptr);
318 m_webViewImpl->devToolsEmulator()->setDevToolsAgent(nullptr);
319 if (m_attached) 317 if (m_attached)
320 Platform::current()->currentThread()->removeTaskObserver(this); 318 Platform::current()->currentThread()->removeTaskObserver(this);
321 #if ENABLE(ASSERT) 319 #if ENABLE(ASSERT)
322 ASSERT(!m_hasBeenDisposed); 320 ASSERT(!m_hasBeenDisposed);
323 m_hasBeenDisposed = true; 321 m_hasBeenDisposed = true;
324 #endif 322 #endif
325 } 323 }
326 324
327 DEFINE_TRACE(WebDevToolsAgentImpl) 325 DEFINE_TRACE(WebDevToolsAgentImpl)
328 { 326 {
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
551 void WebDevToolsAgentImpl::didRemovePageOverlay(const GraphicsLayer* layer) 549 void WebDevToolsAgentImpl::didRemovePageOverlay(const GraphicsLayer* layer)
552 { 550 {
553 m_layerTreeAgent->didRemovePageOverlay(layer); 551 m_layerTreeAgent->didRemovePageOverlay(layer);
554 } 552 }
555 553
556 void WebDevToolsAgentImpl::setScriptEnabled(bool enabled) 554 void WebDevToolsAgentImpl::setScriptEnabled(bool enabled)
557 { 555 {
558 m_pageAgent->setScriptEnabled(enabled); 556 m_pageAgent->setScriptEnabled(enabled);
559 } 557 }
560 558
561 void WebDevToolsAgentImpl::setDeviceMetricsOverride(int width, int height, float deviceScaleFactor, bool mobile, bool fitWindow, float scale, float offsetX, flo at offsetY)
562 {
563 m_webViewImpl->devToolsEmulator()->setDeviceMetricsOverride(width, height, d eviceScaleFactor, mobile, fitWindow, scale, offsetX, offsetY);
564 }
565
566 void WebDevToolsAgentImpl::clearDeviceMetricsOverride()
567 {
568 m_webViewImpl->devToolsEmulator()->clearDeviceMetricsOverride();
569 }
570
571 void WebDevToolsAgentImpl::setTouchEventEmulationEnabled(bool enabled) 559 void WebDevToolsAgentImpl::setTouchEventEmulationEnabled(bool enabled)
572 { 560 {
573 m_webViewImpl->devToolsEmulator()->setTouchEventEmulationEnabled(enabled); 561 m_webViewImpl->devToolsEmulator()->setTouchEventEmulationEnabled(enabled);
574 } 562 }
575 563
576 void WebDevToolsAgentImpl::enableTracing(const String& categoryFilter) 564 void WebDevToolsAgentImpl::enableTracing(const String& categoryFilter)
577 { 565 {
578 m_client->enableTracing(categoryFilter); 566 m_client->enableTracing(categoryFilter);
579 } 567 }
580 568
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
797 if (!InspectorBackendDispatcher::getCommandName(message, &commandName)) 785 if (!InspectorBackendDispatcher::getCommandName(message, &commandName))
798 return false; 786 return false;
799 return commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_pauseCmd) 787 return commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_pauseCmd)
800 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointCmd) 788 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointCmd)
801 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointByUrlCmd) 789 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointByUrlCmd)
802 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_removeBreakpointCmd) 790 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_removeBreakpointCmd)
803 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointsActiveCmd); 791 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointsActiveCmd);
804 } 792 }
805 793
806 } // namespace blink 794 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/WebDevToolsAgentImpl.h ('k') | Source/web/WebViewImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698