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

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

Issue 1004113004: [DevTools] Do not instrument with InspectorInspectorAgent. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ASSERT(isMainThread) 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/core/inspector/InspectorInstrumentation.idl ('k') | no next file » | 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 690 matching lines...) Expand 10 before | Expand all | Expand 10 after
701 m_client->resumeStartup(); 701 m_client->resumeStartup();
702 } 702 }
703 703
704 void WebDevToolsAgentImpl::setLayerTreeId(int layerTreeId) 704 void WebDevToolsAgentImpl::setLayerTreeId(int layerTreeId)
705 { 705 {
706 m_tracingAgent->setLayerTreeId(layerTreeId); 706 m_tracingAgent->setLayerTreeId(layerTreeId);
707 } 707 }
708 708
709 void WebDevToolsAgentImpl::evaluateInWebInspector(long callId, const WebString& script) 709 void WebDevToolsAgentImpl::evaluateInWebInspector(long callId, const WebString& script)
710 { 710 {
711 if (InspectorInspectorAgent* inspectorAgent = m_instrumentingAgents->inspect orInspectorAgent()) 711 m_inspectorAgent->evaluateForTestInFrontend(callId, script);
712 inspectorAgent->evaluateForTestInFrontend(callId, script);
713 } 712 }
714 713
715 void WebDevToolsAgentImpl::flushPendingProtocolNotifications() 714 void WebDevToolsAgentImpl::flushPendingProtocolNotifications()
716 { 715 {
717 if (!m_attached) 716 if (!m_attached)
718 return; 717 return;
719 718
720 m_agents.flushPendingProtocolNotifications(); 719 m_agents.flushPendingProtocolNotifications();
721 for (size_t i = 0; i < m_notificationQueue.size(); ++i) 720 for (size_t i = 0; i < m_notificationQueue.size(); ++i)
722 m_client->sendProtocolMessage(0, m_notificationQueue[i]->toJSONString(), WebString()); 721 m_client->sendProtocolMessage(0, m_notificationQueue[i]->toJSONString(), WebString());
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
758 if (!InspectorBackendDispatcher::getCommandName(message, &commandName)) 757 if (!InspectorBackendDispatcher::getCommandName(message, &commandName))
759 return false; 758 return false;
760 return commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_pauseCmd) 759 return commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_pauseCmd)
761 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointCmd) 760 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointCmd)
762 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointByUrlCmd) 761 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointByUrlCmd)
763 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_removeBreakpointCmd) 762 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_removeBreakpointCmd)
764 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointsActiveCmd); 763 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointsActiveCmd);
765 } 764 }
766 765
767 } // namespace blink 766 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/inspector/InspectorInstrumentation.idl ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698