summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-18 13:27:14 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-18 13:27:14 +0000
commit1b77870c93bf8a5949abda8e1de80974f11b509b (patch)
tree56e040dc1dafbcd231eb40ec1017a3fc17829f03 /webkit
parent70d2e568fbaf89bfea019c69a837befa370b3217 (diff)
downloadchromium_src-1b77870c93bf8a5949abda8e1de80974f11b509b.zip
chromium_src-1b77870c93bf8a5949abda8e1de80974f11b509b.tar.gz
chromium_src-1b77870c93bf8a5949abda8e1de80974f11b509b.tar.bz2
Revert the src/webkit part of r11958 since it broke the build.
TBR=pfeldman Review URL: http://codereview.chromium.org/42332 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11960 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/build/V8Bindings/SConscript1
-rw-r--r--webkit/build/V8Bindings/V8Bindings.vcproj4
-rw-r--r--webkit/glue/inspector_client_impl.cc4
-rw-r--r--webkit/port/bindings/v8/v8_custom.h9
-rw-r--r--webkit/webkit.gyp1
5 files changed, 2 insertions, 17 deletions
diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript
index ed95005..73f8911 100644
--- a/webkit/build/V8Bindings/SConscript
+++ b/webkit/build/V8Bindings/SConscript
@@ -372,7 +372,6 @@ inputs = [
'$WEBCORE_DIR/bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp',
'$WEBCORE_DIR/bindings/v8/custom/V8HTMLPlugInElementCustom.cpp',
'$WEBCORE_DIR/bindings/v8/custom/V8HTMLSelectElementCustom.cpp',
- '$WEBCORE_DIR/bindings/v8/custom/V8InspectorControllerCustom.cpp',
'$WEBCORE_DIR/bindings/v8/custom/V8LocationCustom.cpp',
'$WEBCORE_DIR/bindings/v8/custom/V8MessageChannelConstructor.cpp',
'$WEBCORE_DIR/bindings/v8/custom/V8NamedNodeMapCustom.cpp',
diff --git a/webkit/build/V8Bindings/V8Bindings.vcproj b/webkit/build/V8Bindings/V8Bindings.vcproj
index 4aab599..0ae35829 100644
--- a/webkit/build/V8Bindings/V8Bindings.vcproj
+++ b/webkit/build/V8Bindings/V8Bindings.vcproj
@@ -212,10 +212,6 @@
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8InspectorControllerCustom.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8LocationCustom.cpp"
>
</File>
diff --git a/webkit/glue/inspector_client_impl.cc b/webkit/glue/inspector_client_impl.cc
index 704d9e7..de44d45 100644
--- a/webkit/glue/inspector_client_impl.cc
+++ b/webkit/glue/inspector_client_impl.cc
@@ -166,8 +166,8 @@ String WebInspectorClient::localizedStringsURL() {
}
String WebInspectorClient::hiddenPanels() {
- // Enumerate tabs that are currently disabled.
- return "scripts,profiles,databases";
+ NOTIMPLEMENTED();
+ return String();
}
void WebInspectorClient::populateSetting(
diff --git a/webkit/port/bindings/v8/v8_custom.h b/webkit/port/bindings/v8/v8_custom.h
index 5c490d7..2e33fcf 100644
--- a/webkit/port/bindings/v8/v8_custom.h
+++ b/webkit/port/bindings/v8/v8_custom.h
@@ -406,15 +406,6 @@ DECLARE_CALLBACK(TreeWalkerPreviousNode)
DECLARE_CALLBACK(TreeWalkerNextSibling)
DECLARE_CALLBACK(TreeWalkerPreviousSibling)
-// Custom implementation of InspectorController functions
-DECLARE_CALLBACK(InspectorControllerDebuggerEnabled)
-DECLARE_CALLBACK(InspectorControllerPauseOnExceptions)
-DECLARE_CALLBACK(InspectorControllerProfilerEnabled)
-#if ENABLE(DATABASE)
-DECLARE_CALLBACK(InspectorControllerDatabaseTableNames)
-#endif
-DECLARE_CALLBACK(InspectorControllerWrapCallback)
-
// Custom implementation of NodeIterator functions
DECLARE_CALLBACK(NodeIteratorNextNode)
DECLARE_CALLBACK(NodeIteratorPreviousNode)
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 596b157..0f56456 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -995,7 +995,6 @@
'../third_party/WebKit/WebCore/bindings/v8/custom/V8HTMLPlugInElementCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8HTMLSelectElementCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8HTMLSelectElementCustom.h',
- '../third_party/WebKit/WebCore/bindings/v8/custom/V8InspectorControllerCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8LocationCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8MessageChannelConstructor.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8NamedNodeMapCustom.cpp',