diff options
| author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-26 08:46:30 +0000 |
|---|---|---|
| committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-26 08:46:30 +0000 |
| commit | c7580b6cc34348be847fe5f82f4ddb14f2c40a66 (patch) | |
| tree | ab71659b600ff2e5e9eb004abe9c9a29a155fa09 /webkit/glue | |
| parent | 488e14bf4ff59f70efc1d2ebf39cf9c8391387e5 (diff) | |
| download | chromium_src-c7580b6cc34348be847fe5f82f4ddb14f2c40a66.zip chromium_src-c7580b6cc34348be847fe5f82f4ddb14f2c40a66.tar.gz chromium_src-c7580b6cc34348be847fe5f82f4ddb14f2c40a66.tar.bz2 | |
DevTools: extend experimental.debugger API to potentially allow non-tab debuggees.
This change migrates from
attach(tabId, ...) syntax to the
attach({tabId:tabId}, ...) as suggested during the extension API review.
BUG=
TEST=
Review URL: http://codereview.chromium.org/8341017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107316 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/webkit_glue.cc | 11 | ||||
| -rw-r--r-- | webkit/glue/webkit_glue.h | 6 |
2 files changed, 17 insertions, 0 deletions
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index 1d89305..67ee630 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -30,6 +30,7 @@ #endif #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebData.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" @@ -50,6 +51,7 @@ using WebKit::WebCanvas; using WebKit::WebData; +using WebKit::WebDevToolsAgent; using WebKit::WebElement; using WebKit::WebFrame; using WebKit::WebGlyphCache; @@ -444,4 +446,13 @@ int GetGlyphPageCount() { return WebGlyphCache::pageCount(); } +std::string GetInspectorProtocolVersion() { + return WebDevToolsAgent::inspectorProtocolVersion().utf8(); +} + +bool IsInspectorProtocolVersionSupported(const std::string& version) { + return WebDevToolsAgent::supportsInspectorProtocolVersion( + WebString::fromUTF8(version)); +} + } // namespace webkit_glue diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h index 60764b9..66ba1a5 100644 --- a/webkit/glue/webkit_glue.h +++ b/webkit/glue/webkit_glue.h @@ -147,6 +147,12 @@ WebKit::WebCanvas* ToWebCanvas(skia::PlatformCanvas*); // used to get memory usage statistics. int GetGlyphPageCount(); +// Returns WebKit Web Inspector protocol version. +std::string GetInspectorProtocolVersion(); + +// Tells caller whether the given protocol version is supported by the. +bool IsInspectorProtocolVersionSupported(const std::string& version); + //---- END FUNCTIONS IMPLEMENTED BY WEBKIT/GLUE ------------------------------- |