diff options
| author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-18 16:08:26 +0000 |
|---|---|---|
| committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-18 16:08:26 +0000 |
| commit | 28be5797bfa12cfa4e87a2f6cf836dd84ce48093 (patch) | |
| tree | 19056b80e3c5a600949f6bc2c67c01154c839c97 | |
| parent | e91f4bab25df1e3376ad92b0229cfa8916e13793 (diff) | |
| download | chromium_src-28be5797bfa12cfa4e87a2f6cf836dd84ce48093.zip chromium_src-28be5797bfa12cfa4e87a2f6cf836dd84ce48093.tar.gz chromium_src-28be5797bfa12cfa4e87a2f6cf836dd84ce48093.tar.bz2 | |
Unfork WebInspector frontend take 2: New DEPS and webkit/...
Review URL: http://codereview.chromium.org/48132
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11967 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/build/V8Bindings/SConscript | 1 | ||||
| -rw-r--r-- | webkit/build/V8Bindings/V8Bindings.vcproj | 4 | ||||
| -rw-r--r-- | webkit/glue/inspector_client_impl.cc | 4 | ||||
| -rw-r--r-- | webkit/port/bindings/v8/v8_custom.h | 9 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 1 |
6 files changed, 18 insertions, 3 deletions
@@ -19,7 +19,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@167", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@11939", + "/trunk/deps/third_party/WebKit@11958", "src/third_party/icu38": "/trunk/deps/third_party/icu38@11496", diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript index 73f8911..ed95005 100644 --- a/webkit/build/V8Bindings/SConscript +++ b/webkit/build/V8Bindings/SConscript @@ -372,6 +372,7 @@ 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 0ae35829..4aab599 100644 --- a/webkit/build/V8Bindings/V8Bindings.vcproj +++ b/webkit/build/V8Bindings/V8Bindings.vcproj @@ -212,6 +212,10 @@ > </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 de44d45..704d9e7 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() { - NOTIMPLEMENTED(); - return String(); + // Enumerate tabs that are currently disabled. + return "scripts,profiles,databases"; } void WebInspectorClient::populateSetting( diff --git a/webkit/port/bindings/v8/v8_custom.h b/webkit/port/bindings/v8/v8_custom.h index 2e33fcf..5c490d7 100644 --- a/webkit/port/bindings/v8/v8_custom.h +++ b/webkit/port/bindings/v8/v8_custom.h @@ -406,6 +406,15 @@ 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 0f56456..596b157 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -995,6 +995,7 @@ '../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', |