X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2FWebKit%2FSource%2Fcore%2Finspector%2FInspectorController.cpp;h=b4364bf8866932a9c7c00aef6bfeef65e3ddc3ca;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=701dcaa07b51a04bab90b9ce720d22bacfaa30aa;hpb=7338fba38ba696536d1cc9d389afd716a6ab2fe6;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/third_party/WebKit/Source/core/inspector/InspectorController.cpp b/src/third_party/WebKit/Source/core/inspector/InspectorController.cpp
index 701dcaa..b4364bf 100644
--- a/src/third_party/WebKit/Source/core/inspector/InspectorController.cpp
+++ b/src/third_party/WebKit/Source/core/inspector/InspectorController.cpp
@@ -44,12 +44,9 @@
 #include "core/inspector/InspectorDOMAgent.h"
 #include "core/inspector/InspectorDOMDebuggerAgent.h"
 #include "core/inspector/InspectorDOMStorageAgent.h"
-#include "core/inspector/InspectorDatabaseAgent.h"
 #include "core/inspector/InspectorDebuggerAgent.h"
-#include "core/inspector/InspectorFileSystemAgent.h"
 #include "core/inspector/InspectorFrontendClient.h"
 #include "core/inspector/InspectorHeapProfilerAgent.h"
-#include "core/inspector/InspectorIndexedDBAgent.h"
 #include "core/inspector/InspectorInputAgent.h"
 #include "core/inspector/InspectorInspectorAgent.h"
 #include "core/inspector/InspectorInstrumentation.h"
@@ -67,6 +64,7 @@
 #include "core/inspector/PageDebuggerAgent.h"
 #include "core/inspector/PageRuntimeAgent.h"
 #include "core/page/Page.h"
+#include "core/rendering/RenderLayer.h"
 #include "platform/PlatformMouseEvent.h"
 
 namespace WebCore {
@@ -95,8 +93,6 @@ InspectorController::InspectorController(Page* page, InspectorClient* inspectorC
     m_domAgent = domAgentPtr.get();
     m_agents.append(domAgentPtr.release());
 
-    m_agents.append(InspectorDatabaseAgent::create());
-
     OwnPtr<InspectorTimelineAgent> timelineAgentPtr(InspectorTimelineAgent::create(m_pageAgent, m_domAgent, overlay,
         InspectorTimelineAgent::PageInspector, inspectorClient));
     m_timelineAgent = timelineAgentPtr.get();
@@ -126,6 +122,16 @@ PassOwnPtr<InspectorController> InspectorController::create(Page* page, Inspecto
     return adoptPtr(new InspectorController(page, client));
 }
 
+void InspectorController::setTextAutosizingEnabled(bool enabled)
+{
+    m_pageAgent->setTextAutosizingEnabled(enabled);
+}
+
+void InspectorController::setDeviceScaleAdjustment(float deviceScaleAdjustment)
+{
+    m_pageAgent->setDeviceScaleAdjustment(deviceScaleAdjustment);
+}
+
 void InspectorController::initializeDeferredAgents()
 {
     if (m_deferredAgentsInitialized)
@@ -141,10 +147,6 @@ void InspectorController::initializeDeferredAgents()
 
     m_agents.append(InspectorCSSAgent::create(m_domAgent, m_pageAgent, resourceAgent));
 
-    m_agents.append(InspectorIndexedDBAgent::create(injectedScriptManager, m_pageAgent));
-
-    m_agents.append(InspectorFileSystemAgent::create(m_pageAgent));
-
     m_agents.append(InspectorDOMStorageAgent::create(m_pageAgent));
 
     m_agents.append(InspectorMemoryAgent::create());
@@ -180,6 +182,7 @@ void InspectorController::inspectedPageDestroyed()
 
 void InspectorController::registerModuleAgent(PassOwnPtr<InspectorAgent> agent)
 {
+    m_moduleAgents.append(agent.get());
     m_agents.append(agent);
 }
 
@@ -285,6 +288,8 @@ void InspectorController::evaluateForTestInFrontend(long callId, const String& s
 
 void InspectorController::drawHighlight(GraphicsContext& context) const
 {
+    // https://code.google.com/p/chromium/issues/detail?id=343757
+    DisableCompositingQueryAsserts disabler;
     m_overlay->paint(context);
 }
 
@@ -421,6 +426,13 @@ void InspectorController::didProcessTask()
         domDebuggerAgent->didProcessTask();
 }
 
+void InspectorController::didCommitLoadForMainFrame()
+{
+    Vector<InspectorAgent*> agents = m_moduleAgents;
+    for (size_t i = 0; i < agents.size(); i++)
+        agents[i]->didCommitLoadForMainFrame();
+}
+
 void InspectorController::didBeginFrame(int frameId)
 {
     if (InspectorTimelineAgent* timelineAgent = m_instrumentingAgents->inspectorTimelineAgent())
@@ -453,4 +465,10 @@ void InspectorController::processGPUEvent(double timestamp, int phase, bool fore
         timelineAgent->processGPUEvent(InspectorTimelineAgent::GPUEvent(timestamp, phase, foreign, usedGPUMemoryBytes));
 }
 
+void InspectorController::scriptsEnabled(bool  enabled)
+{
+    if (InspectorPageAgent* pageAgent = m_instrumentingAgents->inspectorPageAgent())
+        pageAgent->scriptsEnabled(enabled);
+}
+
 } // namespace WebCore