Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / inspector / InspectorController.h

diff --git a/src/third_party/WebKit/Source/core/inspector/InspectorController.h b/src/third_party/WebKit/Source/core/inspector/InspectorController.h
index 0c85ea5..cb20342 100644 (file)
--- a/src/third_party/WebKit/Source/core/inspector/InspectorController.h
+++ b/src/third_party/WebKit/Source/core/inspector/InspectorController.h
@@ -55,6 +55,7 @@ class InspectorFrontendClient;
 class InspectorLayerTreeAgent;
 class InspectorPageAgent;
 class InspectorTimelineAgent;
+class InspectorTracingAgent;
 class InspectorOverlay;
 class InspectorState;
 class InstrumentingAgents;
@@ -67,8 +68,6 @@ class PlatformMouseEvent;
 class PlatformTouchEvent;
 class Node;
 
-struct Highlight;
-
 class InspectorController {
     WTF_MAKE_NONCOPYABLE(InspectorController);
     WTF_MAKE_FAST_ALLOCATED;
@@ -81,11 +80,11 @@ public:
     void setTextAutosizingEnabled(bool);
     void setDeviceScaleAdjustment(float);
 
-    void inspectedPageDestroyed();
+    void willBeDestroyed();
     void registerModuleAgent(PassOwnPtr<InspectorAgent>);
 
     void setInspectorFrontendClient(PassOwnPtr<InspectorFrontendClient>);
-    void didClearWindowObjectInMainWorld(LocalFrame*);
+    void didClearDocumentOfWindowObject(LocalFrame*);
     void setInjectedScriptForOrigin(const String& origin, const String& source);
 
     void dispatchMessageFromFrontend(const String& message);
@@ -100,9 +99,6 @@ public:
 
     void inspect(Node*);
     void drawHighlight(GraphicsContext&) const;
-    void getHighlight(Highlight*) const;
-    void hideHighlight();
-    Node* highlightedNode() const;
 
     bool handleGestureEvent(LocalFrame*, const PlatformGestureEvent&);
     bool handleMouseEvent(LocalFrame*, const PlatformMouseEvent&);
@@ -129,7 +125,7 @@ public:
     void willComposite();
     void didComposite();
 
-    void processGPUEvent(double timestamp, int phase, bool foreign, size_t usedGPUMemoryBytes);
+    void processGPUEvent(double timestamp, int phase, bool foreign, uint64_t usedGPUMemoryBytes, uint64_t limitGPUMemoryBytes);
 
     void scriptsEnabled(bool);
 
@@ -152,6 +148,7 @@ private:
     InspectorPageAgent* m_pageAgent;
     InspectorTimelineAgent* m_timelineAgent;
     InspectorLayerTreeAgent* m_layerTreeAgent;
+    InspectorTracingAgent* m_tracingAgent;
 
     RefPtr<InspectorBackendDispatcher> m_inspectorBackendDispatcher;
     OwnPtr<InspectorFrontendClient> m_inspectorFrontendClient;