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

Side by Side Diff: Source/core/inspector/InspectorDebuggerAgent.cpp

Issue 14362015: WIP enum / V8PerContextData solution (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Crash during GC Created 7 years, 8 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 Apple Inc. All rights reserved. 2 * Copyright (C) 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2010-2011 Google Inc. All rights reserved. 3 * Copyright (C) 2010-2011 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after
635 635
636 void InspectorDebuggerAgent::didParseSource(const String& scriptId, const Script & script) 636 void InspectorDebuggerAgent::didParseSource(const String& scriptId, const Script & script)
637 { 637 {
638 // Don't send script content to the front end until it's really needed. 638 // Don't send script content to the front end until it's really needed.
639 const bool* isContentScript = script.isContentScript ? &script.isContentScri pt : 0; 639 const bool* isContentScript = script.isContentScript ? &script.isContentScri pt : 0;
640 String sourceMapURL = sourceMapURLForScript(script); 640 String sourceMapURL = sourceMapURLForScript(script);
641 String* sourceMapURLParam = sourceMapURL.isNull() ? 0 : &sourceMapURL; 641 String* sourceMapURLParam = sourceMapURL.isNull() ? 0 : &sourceMapURL;
642 String sourceURL; 642 String sourceURL;
643 if (!script.startLine && !script.startColumn) 643 if (!script.startLine && !script.startColumn)
644 sourceURL = ContentSearchUtils::findSourceURL(script.source); 644 sourceURL = ContentSearchUtils::findSourceURL(script.source);
645
645 bool hasSourceURL = !sourceURL.isEmpty(); 646 bool hasSourceURL = !sourceURL.isEmpty();
646 String scriptURL = hasSourceURL ? sourceURL : script.url; 647 String scriptURL = hasSourceURL ? sourceURL : script.url;
647 bool* hasSourceURLParam = hasSourceURL ? &hasSourceURL : 0; 648 bool* hasSourceURLParam = hasSourceURL ? &hasSourceURL : 0;
648 m_frontend->scriptParsed(scriptId, scriptURL, script.startLine, script.start Column, script.endLine, script.endColumn, isContentScript, sourceMapURLParam, ha sSourceURLParam); 649 m_frontend->scriptParsed(scriptId, scriptURL, script.startLine, script.start Column, script.endLine, script.endColumn, isContentScript, sourceMapURLParam, ha sSourceURLParam);
649 650
650 m_scripts.set(scriptId, script); 651 m_scripts.set(scriptId, script);
651 652
652 if (scriptURL.isEmpty()) 653 if (scriptURL.isEmpty())
653 return; 654 return;
654 655
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
771 void InspectorDebuggerAgent::reset() 772 void InspectorDebuggerAgent::reset()
772 { 773 {
773 m_scripts.clear(); 774 m_scripts.clear();
774 m_breakpointIdToDebugServerBreakpointIds.clear(); 775 m_breakpointIdToDebugServerBreakpointIds.clear();
775 if (m_frontend) 776 if (m_frontend)
776 m_frontend->globalObjectCleared(); 777 m_frontend->globalObjectCleared();
777 } 778 }
778 779
779 } // namespace WebCore 780 } // namespace WebCore
780 781
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698