Update To 11.40.268.0

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

diff --git a/src/third_party/WebKit/Source/core/inspector/InspectorController.cpp b/src/third_party/WebKit/Source/core/inspector/InspectorController.cpp
index 1c578e5..31b1b88 100644 (file)
--- a/src/third_party/WebKit/Source/core/inspector/InspectorController.cpp
+++ b/src/third_party/WebKit/Source/core/inspector/InspectorController.cpp
@@ -37,6 +37,7 @@
 #include "core/inspector/IdentifiersFactory.h"
 #include "core/inspector/InjectedScriptHost.h"
 #include "core/inspector/InjectedScriptManager.h"
+#include "core/inspector/InspectorAnimationAgent.h"
 #include "core/inspector/InspectorApplicationCacheAgent.h"
 #include "core/inspector/InspectorCSSAgent.h"
 #include "core/inspector/InspectorCanvasAgent.h"
@@ -79,6 +80,7 @@ InspectorController::InspectorController(Page* page, InspectorClient* inspectorC
     , m_cssAgent(nullptr)
     , m_resourceAgent(nullptr)
     , m_layerTreeAgent(nullptr)
+    , m_animationAgent(nullptr)
     , m_inspectorFrontendClient(nullptr)
     , m_page(page)
     , m_inspectorClient(inspectorClient)
@@ -99,7 +101,6 @@ InspectorController::InspectorController(Page* page, InspectorClient* inspectorC
     m_domAgent = domAgentPtr.get();
     m_agents.append(domAgentPtr.release());
 
-
     OwnPtrWillBeRawPtr<InspectorLayerTreeAgent> layerTreeAgentPtr(InspectorLayerTreeAgent::create(m_page));
     m_layerTreeAgent = layerTreeAgentPtr.get();
     m_agents.append(layerTreeAgentPtr.release());
@@ -137,6 +138,7 @@ void InspectorController::trace(Visitor* visitor)
     visitor->trace(m_injectedScriptManager);
     visitor->trace(m_state);
     visitor->trace(m_domAgent);
+    visitor->trace(m_animationAgent);
     visitor->trace(m_pageAgent);
     visitor->trace(m_timelineAgent);
     visitor->trace(m_cssAgent);
@@ -185,6 +187,10 @@ void InspectorController::initializeDeferredAgents()
     m_cssAgent = cssAgentPtr.get();
     m_agents.append(cssAgentPtr.release());
 
+    OwnPtrWillBeRawPtr<InspectorAnimationAgent> animationAgentPtr(InspectorAnimationAgent::create(m_domAgent));
+    m_animationAgent = animationAgentPtr.get();
+    m_agents.append(animationAgentPtr.release());
+
     m_agents.append(InspectorDOMStorageAgent::create(m_pageAgent));
 
     m_agents.append(InspectorMemoryAgent::create());
@@ -361,7 +367,7 @@ void InspectorController::setInjectedScriptForOrigin(const String& origin, const
         inspectorAgent->setInjectedScriptForOrigin(origin, source);
 }
 
-void InspectorController::showContextMenu(float x, float y, PassRefPtr<ContextMenuProvider> menuProvider)
+void InspectorController::showContextMenu(float x, float y, PassRefPtrWillBeRawPtr<ContextMenuProvider> menuProvider)
 {
     if (!m_inspectorClient)
         return;
@@ -445,6 +451,11 @@ void InspectorController::setResourcesDataSizeLimitsFromInternals(int maximumRes
         m_resourceAgent->setResourcesDataSizeLimitsFromInternals(maximumResourcesContentSize, maximumSingleResourceContentSize);
 }
 
+PassRefPtr<JSONObject> InspectorController::highlightJSONForNode(Node* node)
+{
+    return m_overlay->highlightJSONForNode(node);
+}
+
 void InspectorController::willProcessTask()
 {
     if (InspectorTimelineAgent* timelineAgent = m_instrumentingAgents->inspectorTimelineAgent())