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

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

Issue 1723663005: Revert of [DevTools] Move screen orientation override to RenderWidgetScreenMetricsEmulator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 #include "core/inspector/PageDebuggerAgent.h" 63 #include "core/inspector/PageDebuggerAgent.h"
64 #include "core/inspector/PageRuntimeAgent.h" 64 #include "core/inspector/PageRuntimeAgent.h"
65 #include "core/layout/LayoutView.h" 65 #include "core/layout/LayoutView.h"
66 #include "core/page/FocusController.h" 66 #include "core/page/FocusController.h"
67 #include "core/page/Page.h" 67 #include "core/page/Page.h"
68 #include "modules/accessibility/InspectorAccessibilityAgent.h" 68 #include "modules/accessibility/InspectorAccessibilityAgent.h"
69 #include "modules/cachestorage/InspectorCacheStorageAgent.h" 69 #include "modules/cachestorage/InspectorCacheStorageAgent.h"
70 #include "modules/device_orientation/DeviceOrientationInspectorAgent.h" 70 #include "modules/device_orientation/DeviceOrientationInspectorAgent.h"
71 #include "modules/filesystem/InspectorFileSystemAgent.h" 71 #include "modules/filesystem/InspectorFileSystemAgent.h"
72 #include "modules/indexeddb/InspectorIndexedDBAgent.h" 72 #include "modules/indexeddb/InspectorIndexedDBAgent.h"
73 #include "modules/screen_orientation/ScreenOrientationInspectorAgent.h"
73 #include "modules/storage/InspectorDOMStorageAgent.h" 74 #include "modules/storage/InspectorDOMStorageAgent.h"
74 #include "modules/webdatabase/InspectorDatabaseAgent.h" 75 #include "modules/webdatabase/InspectorDatabaseAgent.h"
75 #include "platform/JSONValues.h" 76 #include "platform/JSONValues.h"
76 #include "platform/RuntimeEnabledFeatures.h" 77 #include "platform/RuntimeEnabledFeatures.h"
77 #include "platform/TraceEvent.h" 78 #include "platform/TraceEvent.h"
78 #include "platform/graphics/GraphicsContext.h" 79 #include "platform/graphics/GraphicsContext.h"
79 #include "platform/graphics/paint/PaintController.h" 80 #include "platform/graphics/paint/PaintController.h"
80 #include "platform/inspector_protocol/Dispatcher.h" 81 #include "platform/inspector_protocol/Dispatcher.h"
81 #include "platform/inspector_protocol/Frontend.h" 82 #include "platform/inspector_protocol/Frontend.h"
82 #include "public/platform/Platform.h" 83 #include "public/platform/Platform.h"
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 m_pageConsoleAgent = pageConsoleAgentPtr.get(); 381 m_pageConsoleAgent = pageConsoleAgentPtr.get();
381 382
382 OwnPtrWillBeRawPtr<InspectorWorkerAgent> workerAgentPtr = InspectorWorkerAge nt::create(pageConsoleAgentPtr.get()); 383 OwnPtrWillBeRawPtr<InspectorWorkerAgent> workerAgentPtr = InspectorWorkerAge nt::create(pageConsoleAgentPtr.get());
383 384
384 OwnPtrWillBeRawPtr<InspectorTracingAgent> tracingAgentPtr = InspectorTracing Agent::create(this, workerAgentPtr.get(), m_inspectedFrames.get()); 385 OwnPtrWillBeRawPtr<InspectorTracingAgent> tracingAgentPtr = InspectorTracing Agent::create(this, workerAgentPtr.get(), m_inspectedFrames.get());
385 m_tracingAgent = tracingAgentPtr.get(); 386 m_tracingAgent = tracingAgentPtr.get();
386 m_agents.append(tracingAgentPtr.release()); 387 m_agents.append(tracingAgentPtr.release());
387 388
388 m_agents.append(workerAgentPtr.release()); 389 m_agents.append(workerAgentPtr.release());
389 m_agents.append(pageConsoleAgentPtr.release()); 390 m_agents.append(pageConsoleAgentPtr.release());
391
392 m_agents.append(ScreenOrientationInspectorAgent::create(*m_webLocalFrameImpl ->frame()));
390 } 393 }
391 394
392 WebDevToolsAgentImpl::~WebDevToolsAgentImpl() 395 WebDevToolsAgentImpl::~WebDevToolsAgentImpl()
393 { 396 {
394 ASSERT(m_hasBeenDisposed); 397 ASSERT(m_hasBeenDisposed);
395 } 398 }
396 399
397 void WebDevToolsAgentImpl::dispose() 400 void WebDevToolsAgentImpl::dispose()
398 { 401 {
399 // Explicitly dispose of the agent before destructing to ensure 402 // Explicitly dispose of the agent before destructing to ensure
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
755 if (!protocol::Dispatcher::getCommandName(message, &commandName)) 758 if (!protocol::Dispatcher::getCommandName(message, &commandName))
756 return false; 759 return false;
757 return commandName == protocol::Dispatcher::commandName(protocol::Dispatcher ::kDebugger_pauseCmd) 760 return commandName == protocol::Dispatcher::commandName(protocol::Dispatcher ::kDebugger_pauseCmd)
758 || commandName == protocol::Dispatcher::commandName(protocol::Dispatcher ::kDebugger_setBreakpointCmd) 761 || commandName == protocol::Dispatcher::commandName(protocol::Dispatcher ::kDebugger_setBreakpointCmd)
759 || commandName == protocol::Dispatcher::commandName(protocol::Dispatcher ::kDebugger_setBreakpointByUrlCmd) 762 || commandName == protocol::Dispatcher::commandName(protocol::Dispatcher ::kDebugger_setBreakpointByUrlCmd)
760 || commandName == protocol::Dispatcher::commandName(protocol::Dispatcher ::kDebugger_removeBreakpointCmd) 763 || commandName == protocol::Dispatcher::commandName(protocol::Dispatcher ::kDebugger_removeBreakpointCmd)
761 || commandName == protocol::Dispatcher::commandName(protocol::Dispatcher ::kDebugger_setBreakpointsActiveCmd); 764 || commandName == protocol::Dispatcher::commandName(protocol::Dispatcher ::kDebugger_setBreakpointsActiveCmd);
762 } 765 }
763 766
764 } // namespace blink 767 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/DevToolsEmulator.cpp ('k') | third_party/WebKit/public/web/WebDeviceEmulationParams.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698