Skip to content

Commit

Permalink
WebKit merge 52454:52459 with fix for canary break.
Browse files Browse the repository at this point in the history
BUG=none
TEST=none
TBR=pkasting


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35117 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
japhet@chromium.org committed Dec 21, 2009
1 parent 212096f commit fdb3a50
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
3 changes: 2 additions & 1 deletion webkit/glue/webdevtoolsfrontend_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit fdb3a50

Please sign in to comment.