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

Unified Diff: Source/WebCore/testing/Internals.cpp

Issue 13646003: DevTools: Remove ENABLE(INSPECTOR) and ENABLE(JAVASCRIPT_DEBUGGER) from the code. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: comments addressed 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/testing/Internals.h ('k') | Source/WebCore/workers/DefaultSharedWorkerRepository.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/testing/Internals.cpp
diff --git a/Source/WebCore/testing/Internals.cpp b/Source/WebCore/testing/Internals.cpp
index 8dd36d6352ec0ad75674c9d89898d1f30ca7bbc7..1bd24b66a1f769def5567729031c7716221774d9 100644
--- a/Source/WebCore/testing/Internals.cpp
+++ b/Source/WebCore/testing/Internals.cpp
@@ -156,7 +156,6 @@ static MockPagePopupDriver* s_pagePopupDriver = 0;
using namespace HTMLNames;
-#if ENABLE(INSPECTOR)
class InspectorFrontendClientDummy : public InspectorFrontendClientLocal {
public:
InspectorFrontendClientDummy(InspectorController*, Page*);
@@ -200,7 +199,6 @@ bool InspectorFrontendChannelDummy::sendMessageToFrontend(const String& message)
{
return InspectorClient::doDispatchMessageOnFrontendPage(m_frontendPage, message);
}
-#endif // ENABLE(INSPECTOR)
static bool markerTypesFrom(const String& markerType, DocumentMarker::MarkerTypes& result)
{
@@ -270,10 +268,8 @@ void Internals::resetToConsistentState(Page* page)
if (page->chrome())
page->chrome()->client()->resetPagePopupDriver();
#endif
-#if ENABLE(INSPECTOR) && ENABLE(JAVASCRIPT_DEBUGGER)
if (page->inspectorController())
page->inspectorController()->setProfilerEnabled(false);
-#endif
#if ENABLE(VIDEO_TRACK) && !PLATFORM(WIN)
page->group().captionPreferences()->setTestingMode(false);
#endif
@@ -925,7 +921,6 @@ PassRefPtr<ClientRect> Internals::boundingBox(Element* element, ExceptionCode& e
PassRefPtr<ClientRectList> Internals::inspectorHighlightRects(Document* document, ExceptionCode& ec)
{
-#if ENABLE(INSPECTOR)
if (!document || !document->page() || !document->page()->inspectorController()) {
ec = INVALID_ACCESS_ERR;
return ClientRectList::create();
@@ -934,11 +929,6 @@ PassRefPtr<ClientRectList> Internals::inspectorHighlightRects(Document* document
Highlight highlight;
document->page()->inspectorController()->getHighlight(&highlight);
return ClientRectList::create(highlight.quads);
-#else
- UNUSED_PARAM(document);
- UNUSED_PARAM(ec);
- return ClientRectList::create();
-#endif
}
unsigned Internals::markerCountForNode(Node* node, const String& markerType, ExceptionCode& ec)
@@ -1430,18 +1420,14 @@ PassRefPtr<NodeList> Internals::nodesFromRect(Document* document, int x, int y,
void Internals::emitInspectorDidBeginFrame()
{
-#if ENABLE(INSPECTOR)
InspectorController* inspectorController = contextDocument()->frame()->page()->inspectorController();
inspectorController->didBeginFrame();
-#endif
}
void Internals::emitInspectorDidCancelFrame()
{
-#if ENABLE(INSPECTOR)
InspectorController* inspectorController = contextDocument()->frame()->page()->inspectorController();
inspectorController->didCancelFrame();
-#endif
}
void Internals::setBatteryStatus(Document* document, const String& eventType, bool charging, double chargingTime, double dischargingTime, double level, ExceptionCode& ec)
@@ -1536,7 +1522,6 @@ void Internals::toggleOverwriteModeEnabled(Document* document, ExceptionCode&)
document->frame()->editor()->toggleOverwriteModeEnabled();
}
-#if ENABLE(INSPECTOR)
unsigned Internals::numberOfLiveNodes() const
{
return InspectorCounters::counterValue(InspectorCounters::NodeCounter);
@@ -1621,7 +1606,6 @@ void Internals::setJavaScriptProfilingEnabled(bool enabled, ExceptionCode& ec)
page->inspectorController()->setProfilerEnabled(enabled);
}
-#endif // ENABLE(INSPECTOR)
bool Internals::hasGrammarMarker(Document* document, int from, int length, ExceptionCode&)
{
« no previous file with comments | « Source/WebCore/testing/Internals.h ('k') | Source/WebCore/workers/DefaultSharedWorkerRepository.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698