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

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

Issue 1131263009: Oilpan: fix build after r195134. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: disable trace() impl, non-Oilpan Created 5 years, 7 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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 } 111 }
112 112
113 static void ensurePageScriptDebugServerCreated(WebDevToolsAgentClient* clien t) 113 static void ensurePageScriptDebugServerCreated(WebDevToolsAgentClient* clien t)
114 { 114 {
115 if (s_instance) 115 if (s_instance)
116 return; 116 return;
117 OwnPtr<ClientMessageLoopAdapter> instance = adoptPtr(new ClientMessageLo opAdapter(adoptPtr(client->createClientMessageLoop()))); 117 OwnPtr<ClientMessageLoopAdapter> instance = adoptPtr(new ClientMessageLo opAdapter(adoptPtr(client->createClientMessageLoop())));
118 s_instance = instance.get(); 118 s_instance = instance.get();
119 v8::Isolate* isolate = V8PerIsolateData::mainThreadIsolate(); 119 v8::Isolate* isolate = V8PerIsolateData::mainThreadIsolate();
120 V8PerIsolateData* data = V8PerIsolateData::from(isolate); 120 V8PerIsolateData* data = V8PerIsolateData::from(isolate);
121 data->setScriptDebugServer(adoptPtrWillBeNoop(new PageScriptDebugServer( instance.release(), isolate))); 121 data->setScriptDebugServer(PageScriptDebugServer::create(instance.releas e(), isolate));
122 } 122 }
123 123
124 static void webViewImplClosed(WebViewImpl* view) 124 static void webViewImplClosed(WebViewImpl* view)
125 { 125 {
126 if (s_instance) 126 if (s_instance)
127 s_instance->m_frozenViews.remove(view); 127 s_instance->m_frozenViews.remove(view);
128 } 128 }
129 129
130 static void webFrameWidgetImplClosed(WebFrameWidgetImpl* widget) 130 static void webFrameWidgetImplClosed(WebFrameWidgetImpl* widget)
131 { 131 {
(...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after
741 if (!InspectorBackendDispatcher::getCommandName(message, &commandName)) 741 if (!InspectorBackendDispatcher::getCommandName(message, &commandName))
742 return false; 742 return false;
743 return commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_pauseCmd) 743 return commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_pauseCmd)
744 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointCmd) 744 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointCmd)
745 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointByUrlCmd) 745 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointByUrlCmd)
746 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_removeBreakpointCmd) 746 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_removeBreakpointCmd)
747 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointsActiveCmd); 747 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointsActiveCmd);
748 } 748 }
749 749
750 } // namespace blink 750 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698