[webkit-changes] [144631] trunk/Source/WebCore

Mon, 04 Mar 2013 08:20:50 -0800

Title: [144631] trunk/Source/WebCore
Revision
144631
Author
[email protected]
Date
2013-03-04 08:22:50 -0800 (Mon, 04 Mar 2013)

Log Message

Fix debug build under certain configurations, cause was
http://trac.webkit.org/changeset/144624.

* inspector/InspectorController.cpp:
(WebCore::InspectorController::InspectorController):
* inspector/InspectorLayerTreeAgent.cpp:
(WebCore::InspectorLayerTreeAgent::InspectorLayerTreeAgent):
* inspector/InspectorLayerTreeAgent.h:
(WebCore):
(WebCore::InspectorLayerTreeAgent::create):
(InspectorLayerTreeAgent):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (144630 => 144631)


--- trunk/Source/WebCore/ChangeLog	2013-03-04 16:22:30 UTC (rev 144630)
+++ trunk/Source/WebCore/ChangeLog	2013-03-04 16:22:50 UTC (rev 144631)
@@ -1,3 +1,17 @@
+2013-03-04  Antoine Quint  <[email protected]>
+
+        Fix debug build under certain configurations, cause was
+        http://trac.webkit.org/changeset/144624.
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::InspectorController):
+        * inspector/InspectorLayerTreeAgent.cpp:
+        (WebCore::InspectorLayerTreeAgent::InspectorLayerTreeAgent):
+        * inspector/InspectorLayerTreeAgent.h:
+        (WebCore):
+        (WebCore::InspectorLayerTreeAgent::create):
+        (InspectorLayerTreeAgent):
+
 2013-03-04  Allan Sandfeld Jensen  <[email protected]>
 
         [Qt] REGRESSION(r141240) Crash in PluginPackage::fetchInfo

Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (144630 => 144631)


--- trunk/Source/WebCore/inspector/InspectorController.cpp	2013-03-04 16:22:30 UTC (rev 144630)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp	2013-03-04 16:22:50 UTC (rev 144631)
@@ -167,7 +167,7 @@
     m_agents.append(InspectorInputAgent::create(m_instrumentingAgents.get(), m_state.get(), page));
 
 #if USE(ACCELERATED_COMPOSITING)
-    m_agents.append(InspectorLayerTreeAgent::create(m_instrumentingAgents.get(), m_state.get(), page));
+    m_agents.append(InspectorLayerTreeAgent::create(m_instrumentingAgents.get(), m_state.get()));
 #endif
 
     ASSERT_ARG(inspectorClient, inspectorClient);

Modified: trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp (144630 => 144631)


--- trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp	2013-03-04 16:22:30 UTC (rev 144630)
+++ trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp	2013-03-04 16:22:50 UTC (rev 144631)
@@ -41,7 +41,6 @@
 #include "InspectorState.h"
 #include "InstrumentingAgents.h"
 #include "IntRect.h"
-#include "Page.h"
 #include "RenderLayer.h"
 #include "RenderLayerBacking.h"
 #include "RenderView.h"
@@ -52,9 +51,8 @@
 static const char layerTreeAgentEnabled[] = "layerTreeAgentEnabled";
 };
 
-InspectorLayerTreeAgent::InspectorLayerTreeAgent(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* state, Page* page)
+InspectorLayerTreeAgent::InspectorLayerTreeAgent(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* state)
     : InspectorBaseAgent<InspectorLayerTreeAgent>("LayerTree", instrumentingAgents, state)
-    , m_inspectedPage(page)
     , m_frontend(0)
 {
 }

Modified: trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h (144630 => 144631)


--- trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h	2013-03-04 16:22:30 UTC (rev 144630)
+++ trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h	2013-03-04 16:22:50 UTC (rev 144631)
@@ -44,15 +44,14 @@
 
 class InspectorState;
 class InstrumentingAgents;
-class Page;
 
 typedef String ErrorString;
 
 class InspectorLayerTreeAgent : public InspectorBaseAgent<InspectorLayerTreeAgent>, public InspectorBackendDispatcher::LayerTreeCommandHandler {
 public:
-    static PassOwnPtr<InspectorLayerTreeAgent> create(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* state, Page* page)
+    static PassOwnPtr<InspectorLayerTreeAgent> create(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* state)
     {
-        return adoptPtr(new InspectorLayerTreeAgent(instrumentingAgents, state, page));
+        return adoptPtr(new InspectorLayerTreeAgent(instrumentingAgents, state));
     }
     ~InspectorLayerTreeAgent();
 
@@ -69,7 +68,7 @@
     virtual void disable(ErrorString*);
 
 private:
-    InspectorLayerTreeAgent(InstrumentingAgents*, InspectorCompositeState*, Page*);
+    InspectorLayerTreeAgent(InstrumentingAgents*, InspectorCompositeState*);
 
     // RenderLayer-related methods.
     String bind(const RenderLayer*);
@@ -78,7 +77,6 @@
     PassRefPtr<TypeBuilder::LayerTree::Layer> buildObjectForLayer(RenderLayer*);
     PassRefPtr<TypeBuilder::LayerTree::IntRect> buildObjectForIntRect(const IntRect&);
         
-    Page* m_inspectedPage;
     InspectorFrontend::LayerTree* m_frontend;
 
     HashMap<const RenderLayer*, String> m_documentLayerToIdMap;

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to