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

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

Issue 1206833003: Devtools[LayoutEditor]: Pass data about property change from InspectorOverlayPage (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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) 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 #include "core/inspector/InspectorOverlay.h" 58 #include "core/inspector/InspectorOverlay.h"
59 #include "core/inspector/InspectorPageAgent.h" 59 #include "core/inspector/InspectorPageAgent.h"
60 #include "core/inspector/InspectorProfilerAgent.h" 60 #include "core/inspector/InspectorProfilerAgent.h"
61 #include "core/inspector/InspectorResourceAgent.h" 61 #include "core/inspector/InspectorResourceAgent.h"
62 #include "core/inspector/InspectorState.h" 62 #include "core/inspector/InspectorState.h"
63 #include "core/inspector/InspectorTaskRunner.h" 63 #include "core/inspector/InspectorTaskRunner.h"
64 #include "core/inspector/InspectorTimelineAgent.h" 64 #include "core/inspector/InspectorTimelineAgent.h"
65 #include "core/inspector/InspectorTracingAgent.h" 65 #include "core/inspector/InspectorTracingAgent.h"
66 #include "core/inspector/InspectorWorkerAgent.h" 66 #include "core/inspector/InspectorWorkerAgent.h"
67 #include "core/inspector/InstrumentingAgents.h" 67 #include "core/inspector/InstrumentingAgents.h"
68 #include "core/inspector/LayoutEditor.h"
68 #include "core/inspector/PageConsoleAgent.h" 69 #include "core/inspector/PageConsoleAgent.h"
69 #include "core/inspector/PageDebuggerAgent.h" 70 #include "core/inspector/PageDebuggerAgent.h"
70 #include "core/inspector/PageRuntimeAgent.h" 71 #include "core/inspector/PageRuntimeAgent.h"
71 #include "core/layout/LayoutView.h" 72 #include "core/layout/LayoutView.h"
72 #include "core/page/FocusController.h" 73 #include "core/page/FocusController.h"
73 #include "core/page/Page.h" 74 #include "core/page/Page.h"
74 #include "modules/accessibility/InspectorAccessibilityAgent.h" 75 #include "modules/accessibility/InspectorAccessibilityAgent.h"
75 #include "modules/cachestorage/InspectorCacheStorageAgent.h" 76 #include "modules/cachestorage/InspectorCacheStorageAgent.h"
76 #include "modules/device_orientation/DeviceOrientationInspectorAgent.h" 77 #include "modules/device_orientation/DeviceOrientationInspectorAgent.h"
77 #include "modules/filesystem/InspectorFileSystemAgent.h" 78 #include "modules/filesystem/InspectorFileSystemAgent.h"
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 void WebDevToolsAgentImpl::willBeDestroyed() 419 void WebDevToolsAgentImpl::willBeDestroyed()
419 { 420 {
420 #if ENABLE(ASSERT) 421 #if ENABLE(ASSERT)
421 Frame* frame = m_webLocalFrameImpl->frame(); 422 Frame* frame = m_webLocalFrameImpl->frame();
422 ASSERT(frame); 423 ASSERT(frame);
423 ASSERT(m_pageAgent->inspectedFrame()->view()); 424 ASSERT(m_pageAgent->inspectedFrame()->view());
424 #endif 425 #endif
425 426
426 detach(); 427 detach();
427 m_injectedScriptManager->disconnect(); 428 m_injectedScriptManager->disconnect();
429 m_overlay->layoutEditor()->setCSSAgent(nullptr);
428 m_agents.discardAgents(); 430 m_agents.discardAgents();
429 m_instrumentingAgents->reset(); 431 m_instrumentingAgents->reset();
430 } 432 }
431 433
432 void WebDevToolsAgentImpl::initializeDeferredAgents() 434 void WebDevToolsAgentImpl::initializeDeferredAgents()
433 { 435 {
434 if (m_deferredAgentsInitialized) 436 if (m_deferredAgentsInitialized)
435 return; 437 return;
436 m_deferredAgentsInitialized = true; 438 m_deferredAgentsInitialized = true;
437 439
438 InjectedScriptManager* injectedScriptManager = m_injectedScriptManager.get() ; 440 InjectedScriptManager* injectedScriptManager = m_injectedScriptManager.get() ;
439 441
440 OwnPtrWillBeRawPtr<InspectorResourceAgent> resourceAgentPtr(InspectorResourc eAgent::create(m_pageAgent)); 442 OwnPtrWillBeRawPtr<InspectorResourceAgent> resourceAgentPtr(InspectorResourc eAgent::create(m_pageAgent));
441 m_resourceAgent = resourceAgentPtr.get(); 443 m_resourceAgent = resourceAgentPtr.get();
442 m_agents.append(resourceAgentPtr.release()); 444 m_agents.append(resourceAgentPtr.release());
443 445
444 OwnPtrWillBeRawPtr<InspectorCSSAgent> cssAgentPtr(InspectorCSSAgent::create( m_domAgent, m_pageAgent, m_resourceAgent)); 446 OwnPtrWillBeRawPtr<InspectorCSSAgent> cssAgentPtr(InspectorCSSAgent::create( m_domAgent, m_pageAgent, m_resourceAgent));
445 m_cssAgent = cssAgentPtr.get(); 447 m_cssAgent = cssAgentPtr.get();
446 m_agents.append(cssAgentPtr.release()); 448 m_agents.append(cssAgentPtr.release());
449 m_overlay->layoutEditor()->setCSSAgent(m_cssAgent.get());
dgozman 2015/06/25 10:10:39 I'd rather call |m_overlay->setCSSAgent()|, which
sergeyv 2015/06/25 12:19:16 Done.
447 450
448 m_agents.append(InspectorAnimationAgent::create(m_pageAgent, m_domAgent)); 451 m_agents.append(InspectorAnimationAgent::create(m_pageAgent, m_domAgent));
449 452
450 m_agents.append(InspectorMemoryAgent::create()); 453 m_agents.append(InspectorMemoryAgent::create());
451 454
452 m_agents.append(InspectorApplicationCacheAgent::create(m_pageAgent)); 455 m_agents.append(InspectorApplicationCacheAgent::create(m_pageAgent));
453 456
454 OwnPtrWillBeRawPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgen t::create(MainThreadDebugger::instance(), m_pageAgent, injectedScriptManager, m_ overlay, m_pageRuntimeAgent->debuggerId())); 457 OwnPtrWillBeRawPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgen t::create(MainThreadDebugger::instance(), m_pageAgent, injectedScriptManager, m_ overlay, m_pageRuntimeAgent->debuggerId()));
455 InspectorDebuggerAgent* debuggerAgent = debuggerAgentPtr.get(); 458 InspectorDebuggerAgent* debuggerAgent = debuggerAgentPtr.get();
456 m_agents.append(debuggerAgentPtr.release()); 459 m_agents.append(debuggerAgentPtr.release());
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
741 if (!InspectorBackendDispatcher::getCommandName(message, &commandName)) 744 if (!InspectorBackendDispatcher::getCommandName(message, &commandName))
742 return false; 745 return false;
743 return commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_pauseCmd) 746 return commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_pauseCmd)
744 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointCmd) 747 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointCmd)
745 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointByUrlCmd) 748 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointByUrlCmd)
746 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_removeBreakpointCmd) 749 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_removeBreakpointCmd)
747 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointsActiveCmd); 750 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointsActiveCmd);
748 } 751 }
749 752
750 } // namespace blink 753 } // namespace blink
OLDNEW
« Source/core/inspector/LayoutEditor.h ('K') | « Source/web/InspectorOverlayImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698