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

Side by Side Diff: Source/WebCore/inspector/InspectorInstrumentation.h

Issue 11366107: Merge 133052 - Web Inspector: frame chooser does not work on subsequent inspector open. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/
Patch Set: Created 8 years, 1 month 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 Google Inc. All rights reserved. 2 * Copyright (C) 2010 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 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 250
251 static void networkStateChanged(Page*); 251 static void networkStateChanged(Page*);
252 static void updateApplicationCacheStatus(Frame*); 252 static void updateApplicationCacheStatus(Frame*);
253 253
254 #if ENABLE(INSPECTOR) 254 #if ENABLE(INSPECTOR)
255 static void frontendCreated() { s_frontendCounter += 1; } 255 static void frontendCreated() { s_frontendCounter += 1; }
256 static void frontendDeleted() { s_frontendCounter -= 1; } 256 static void frontendDeleted() { s_frontendCounter -= 1; }
257 static bool hasFrontends() { return s_frontendCounter; } 257 static bool hasFrontends() { return s_frontendCounter; }
258 static bool canvasAgentEnabled(ScriptExecutionContext*); 258 static bool canvasAgentEnabled(ScriptExecutionContext*);
259 static bool consoleAgentEnabled(ScriptExecutionContext*); 259 static bool consoleAgentEnabled(ScriptExecutionContext*);
260 static bool runtimeAgentEnabled(Frame*);
261 static bool timelineAgentEnabled(ScriptExecutionContext*); 260 static bool timelineAgentEnabled(ScriptExecutionContext*);
262 static bool collectingHTMLParseErrors(Page*); 261 static bool collectingHTMLParseErrors(Page*);
263 #else 262 #else
264 static bool hasFrontends() { return false; } 263 static bool hasFrontends() { return false; }
265 static bool canvasAgentEnabled(ScriptExecutionContext*) { return false; } 264 static bool canvasAgentEnabled(ScriptExecutionContext*) { return false; }
266 static bool consoleAgentEnabled(ScriptExecutionContext*) { return false; } 265 static bool consoleAgentEnabled(ScriptExecutionContext*) { return false; }
267 static bool runtimeAgentEnabled(Frame*) { return false; } 266 static bool runtimeAgentEnabled(Frame*) { return false; }
268 static bool timelineAgentEnabled(ScriptExecutionContext*) { return false; } 267 static bool timelineAgentEnabled(ScriptExecutionContext*) { return false; }
269 static bool collectingHTMLParseErrors(Page*) { return false; } 268 static bool collectingHTMLParseErrors(Page*) { return false; }
270 #endif 269 #endif
(...skipping 1298 matching lines...) Expand 10 before | Expand all | Expand 10 after
1569 { 1568 {
1570 if (document) 1569 if (document)
1571 return instrumentingAgentsForPage(document->page()); 1570 return instrumentingAgentsForPage(document->page());
1572 return 0; 1571 return 0;
1573 } 1572 }
1574 #endif 1573 #endif
1575 1574
1576 } // namespace WebCore 1575 } // namespace WebCore
1577 1576
1578 #endif // !defined(InspectorInstrumentation_h) 1577 #endif // !defined(InspectorInstrumentation_h)
OLDNEW
« no previous file with comments | « Source/WebCore/inspector/InspectorController.cpp ('k') | Source/WebCore/inspector/InspectorInstrumentation.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698