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

Side by Side Diff: Source/bindings/v8/PageScriptDebugServer.cpp

Issue 336553003: Change Page::m_mainFrame to be a Frame. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased Created 6 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
« no previous file with comments | « no previous file | Source/core/css/MediaValues.cpp » ('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) 2011 Google Inc. All rights reserved. 2 * Copyright (c) 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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 , m_pausedPage(0) 102 , m_pausedPage(0)
103 { 103 {
104 } 104 }
105 105
106 PageScriptDebugServer::~PageScriptDebugServer() 106 PageScriptDebugServer::~PageScriptDebugServer()
107 { 107 {
108 } 108 }
109 109
110 void PageScriptDebugServer::addListener(ScriptDebugListener* listener, Page* pag e) 110 void PageScriptDebugServer::addListener(ScriptDebugListener* listener, Page* pag e)
111 { 111 {
112 ScriptController& scriptController = page->mainFrame()->script(); 112 ScriptController& scriptController = page->deprecatedLocalMainFrame()->scrip t();
113 if (!scriptController.canExecuteScripts(NotAboutToExecuteScript)) 113 if (!scriptController.canExecuteScripts(NotAboutToExecuteScript))
114 return; 114 return;
115 115
116 v8::HandleScope scope(m_isolate); 116 v8::HandleScope scope(m_isolate);
117 v8::Local<v8::Context> debuggerContext = v8::Debug::GetDebugContext(); 117 v8::Local<v8::Context> debuggerContext = v8::Debug::GetDebugContext();
118 v8::Context::Scope contextScope(debuggerContext); 118 v8::Context::Scope contextScope(debuggerContext);
119 119
120 v8::Local<v8::Object> debuggerScript = m_debuggerScript.newLocal(m_isolate); 120 v8::Local<v8::Object> debuggerScript = m_debuggerScript.newLocal(m_isolate);
121 if (!m_listenersMap.size()) { 121 if (!m_listenersMap.size()) {
122 ensureDebuggerScriptCompiled(); 122 ensureDebuggerScriptCompiled();
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 UseCounter::muteForInspector(); 311 UseCounter::muteForInspector();
312 } 312 }
313 313
314 void PageScriptDebugServer::unmuteWarningsAndDeprecations() 314 void PageScriptDebugServer::unmuteWarningsAndDeprecations()
315 { 315 {
316 FrameConsole::unmute(); 316 FrameConsole::unmute();
317 UseCounter::unmuteForInspector(); 317 UseCounter::unmuteForInspector();
318 } 318 }
319 319
320 } // namespace WebCore 320 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/css/MediaValues.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698