summaryrefslogtreecommitdiffstats
path: root/WebCore/page/android
diff options
context:
space:
mode:
authorFeng Qian <fqian@google.com>2009-06-17 12:12:20 -0700
committerFeng Qian <fqian@google.com>2009-06-17 12:12:20 -0700
commit5f1ab04193ad0130ca8204aadaceae083aca9881 (patch)
tree5a92cd389e2cfe7fb67197ce14b38469462379f8 /WebCore/page/android
parent194315e5a908cc8ed67d597010544803eef1ac59 (diff)
downloadexternal_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.zip
external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.tar.gz
external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.tar.bz2
Get WebKit r44544.
Diffstat (limited to 'WebCore/page/android')
-rw-r--r--WebCore/page/android/InspectorControllerAndroid.cpp13
1 files changed, 2 insertions, 11 deletions
diff --git a/WebCore/page/android/InspectorControllerAndroid.cpp b/WebCore/page/android/InspectorControllerAndroid.cpp
index c480e94..922c743 100644
--- a/WebCore/page/android/InspectorControllerAndroid.cpp
+++ b/WebCore/page/android/InspectorControllerAndroid.cpp
@@ -27,6 +27,7 @@
#include "InspectorController.h"
#include "InspectorClient.h"
+#include "InspectorFrontend.h"
#include "Frame.h"
#include "Node.h"
@@ -65,7 +66,6 @@ struct InspectorDatabaseResource : public RefCounted<InspectorDatabaseResource>
};
InspectorController::InspectorController(Page*, InspectorClient* client)
- : m_startProfiling(this, 0)
{
m_client = client;
}
@@ -90,16 +90,8 @@ void InspectorController::didOpenDatabase(Database*, String const&, String const
bool InspectorController::enabled() const { return false; }
void InspectorController::inspect(Node*) {}
bool InspectorController::windowVisible() { return false; }
-#if USE(JSC)
-void InspectorController::addProfile(PassRefPtr<JSC::Profile>, unsigned int, const JSC::UString&) {}
-void InspectorController::resourceRetrievedByXMLHttpRequest(unsigned long identifier, const JSC::UString& sourceString) {}
-void InspectorController::failedToParseSource(JSC::ExecState* exec, const JSC::SourceCode& source, int errorLine, const JSC::UString& errorMessage) {}
-void InspectorController::didParseSource(JSC::ExecState* exec, const JSC::SourceCode& source) {}
-void InspectorController::scriptImported(unsigned long identifier, const JSC::UString& sourceString) {}
-#elif USE(V8)
-void InspectorController::resourceRetrievedByXMLHttpRequest(unsigned long identifier, const String& sourceString) {}
+void InspectorController::resourceRetrievedByXMLHttpRequest(unsigned long identifier, const ScriptString& sourceString) {}
void InspectorController::scriptImported(unsigned long identifier, const String& sourceString) {}
-#endif
void InspectorController::inspectedPageDestroyed() {}
void InspectorController::inspectedWindowScriptObjectCleared(Frame* frame) {}
@@ -116,5 +108,4 @@ void InspectorController::handleMousePressOnNode(Node*) {}
void InspectorController::didPause() {}
#endif
-void InspectorController::startUserInitiatedProfiling(Timer<InspectorController>*) {}
} // namespace WebCore