diff options
| author | japhet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-21 23:39:30 +0000 |
|---|---|---|
| committer | japhet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-21 23:39:30 +0000 |
| commit | fdb3a50632f429c57439c9aed91e04376f14beb5 (patch) | |
| tree | e1647289b9d67ad92c05470c039a4282f48ab1cf | |
| parent | 212096fadfdddc785070c66575b6e18f9ce855ed (diff) | |
| download | chromium_src-fdb3a50632f429c57439c9aed91e04376f14beb5.zip chromium_src-fdb3a50632f429c57439c9aed91e04376f14beb5.tar.gz chromium_src-fdb3a50632f429c57439c9aed91e04376f14beb5.tar.bz2 | |
WebKit merge 52454:52459 with fix for canary break.
BUG=none
TEST=none
TBR=pkasting
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35117 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/glue/webdevtoolsfrontend_impl.cc | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "52454", + "webkit_revision": "52459", "ffmpeg_revision": "34297", "skia_revision": "457", "chromium_git": "http://src.chromium.org/git", diff --git a/webkit/glue/webdevtoolsfrontend_impl.cc b/webkit/glue/webdevtoolsfrontend_impl.cc index c6012bc..987cafb 100644 --- a/webkit/glue/webdevtoolsfrontend_impl.cc +++ b/webkit/glue/webdevtoolsfrontend_impl.cc @@ -23,6 +23,7 @@ #include "V8Binding.h" #include "V8CustomBinding.h" #include "V8DOMWrapper.h" +#include "V8InspectorFrontendHost.h" #include "V8Proxy.h" #include "V8Utilities.h" #include <wtf/OwnPtr.h> @@ -173,7 +174,7 @@ WebDevToolsFrontendImpl::WebDevToolsFrontendImpl( WebDevToolsFrontendImpl::JsLoaded); dev_tools_host.AddProtoFunction( "search", - WebCore::V8Custom::v8InspectorFrontendHostSearchCallback); + WebCore::V8InspectorFrontendHost::searchCallback); dev_tools_host.AddProtoFunction( "platform", WebDevToolsFrontendImpl::JsPlatform); |