1 files changed, 9 insertions, 13 deletions
diff --git a/chromium/third_party/WebKit/public/web/WebDevToolsAgent.h b/chromium/third_party/WebKit/public/web/WebDevToolsAgent.h
index 73a8f82ca4b..2adad796c95 100644
--- a/chromium/third_party/WebKit/public/web/WebDevToolsAgent.h
+++ b/chromium/third_party/WebKit/public/web/WebDevToolsAgent.h
@@ -37,7 +37,6 @@
 namespace blink {
 class WebDevToolsAgentClient;
 class WebDevToolsMessageTransport;
-class WebFrame;
 class WebString;
 class WebURLRequest;
 class WebURLResponse;
@@ -51,14 +50,12 @@ class WebDevToolsAgent {
 public:
     virtual ~WebDevToolsAgent() {}
 
-    // Returns WebKit WebInspector protocol version.
-    BLINK_EXPORT static WebString inspectorProtocolVersion();
-
-    // Returns true if and only if the given protocol version is supported by the WebKit Web Inspector.
-    BLINK_EXPORT static bool supportsInspectorProtocolVersion(const WebString& version);
-
+    // FIXME: remove once migrated to the one with host_id.
     virtual void attach() = 0;
     virtual void reattach(const WebString& savedState) = 0;
+
+    virtual void attach(const WebString& hostId) = 0;
+    virtual void reattach(const WebString& hostId, const WebString& savedState) = 0;
     virtual void detach() = 0;
 
     virtual void didNavigate() = 0;
@@ -74,20 +71,19 @@ public:
     virtual void willComposite() = 0;
     virtual void didComposite() = 0;
 
-    // FIXME: remove it once the client side stops firing these.
-    virtual void processGPUEvent(double timestamp, int phase, bool foreign) = 0;
-
     class GPUEvent {
     public:
-        GPUEvent(double timestamp, int phase, bool foreign, size_t usedGPUMemoryBytes) :
+        GPUEvent(double timestamp, int phase, bool foreign, uint64_t usedGPUMemoryBytes) :
             timestamp(timestamp),
             phase(phase),
             foreign(foreign),
-            usedGPUMemoryBytes(usedGPUMemoryBytes) { }
+            usedGPUMemoryBytes(usedGPUMemoryBytes),
+            limitGPUMemoryBytes(0) { }
         double timestamp;
         int phase;
         bool foreign;
-        size_t usedGPUMemoryBytes;
+        uint64_t usedGPUMemoryBytes;
+        uint64_t limitGPUMemoryBytes;
     };
     virtual void processGPUEvent(const GPUEvent&) = 0;