Move rendering/RenderObject to layout/LayoutObject.

Source/core/inspector/InspectorTimelineAgent.cpp

 /*
 * Copyright (C) 2013 Google Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
 * met:
 *
 *     * Redistributions of source code must retain the above copyright
 * notice, this list of conditions and the following disclaimer.
 *     * Redistributions in binary form must reproduce the above
@@ skipping 34 matching lines @@
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/inspector/InspectorLayerTreeAgent.h"
 #include "core/inspector/InspectorNodeIds.h"
 #include "core/inspector/InspectorOverlay.h"
 #include "core/inspector/InspectorPageAgent.h"
 #include "core/inspector/InspectorState.h"
 #include "core/inspector/InstrumentingAgents.h"
 #include "core/inspector/ScriptCallStack.h"
 #include "core/inspector/TimelineRecordFactory.h"
 #include "core/inspector/TraceEventDispatcher.h"
+#include "core/layout/LayoutObject.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/page/Page.h"
-#include "core/rendering/RenderObject.h"
 #include "core/rendering/RenderView.h"
 #include "core/xmlhttprequest/XMLHttpRequest.h"
 #include "platform/TraceEvent.h"
 #include "platform/graphics/DeferredImageDecoder.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/network/ResourceRequest.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/DateMath.h"
 
 namespace blink {
@@ skipping 463 matching lines @@
 {
     bool isPartial;
     unsigned needsLayoutObjects;
     unsigned totalObjects;
     frame->countObjectsNeedingLayout(needsLayoutObjects, totalObjects, isPartial);
 
     pushCurrentRecord(TimelineRecordFactory::createLayoutData(needsLayoutObjects, totalObjects, isPartial), TimelineRecordType::Layout, true, frame);
     return true;
 }
 
-void InspectorTimelineAgent::didLayout(RenderObject* root)
+void InspectorTimelineAgent::didLayout(LayoutObject* root)
 {
     if (m_recordStack.isEmpty())
         return;
     TimelineRecordEntry& entry = m_recordStack.last();
     ASSERT(entry.type == TimelineRecordType::Layout);
     Vector<FloatQuad> quads;
     root->absoluteQuads(quads);
     if (quads.size() >= 1)
         TimelineRecordFactory::setLayoutRoot(entry.data.get(), quads[0], nodeId(root));
     else
@@ skipping 37 matching lines @@
 void InspectorTimelineAgent::didRecalculateStyle(int elementCount)
 {
     if (m_recordStack.isEmpty())
         return;
     TimelineRecordEntry& entry = m_recordStack.last();
     ASSERT(entry.type == TimelineRecordType::RecalculateStyles);
     TimelineRecordFactory::setStyleRecalcDetails(entry.data.get(), elementCount);
     didCompleteCurrentRecord(TimelineRecordType::RecalculateStyles);
 }
 
-void InspectorTimelineAgent::willPaint(RenderObject* renderer, const GraphicsLayer* graphicsLayer)
+void InspectorTimelineAgent::willPaint(LayoutObject* renderer, const GraphicsLayer* graphicsLayer)
 {
     LocalFrame* frame = renderer->frame();
 
     TraceEventDispatcher::instance()->processBackgroundEvents();
     double paintSetupStart = m_paintSetupStart;
     m_paintSetupStart = 0;
     if (graphicsLayer) {
         int layerIdentifier = graphicsLayer->platformLayer()->id();
         int nodeIdentifier = nodeId(renderer);
         ASSERT(layerIdentifier && nodeIdentifier);
         m_layerToNodeMap.set(layerIdentifier, nodeIdentifier);
         if (paintSetupStart) {
             RefPtr<TimelineEvent> paintSetupRecord = TimelineRecordFactory::createGenericRecord(paintSetupStart, 0, TimelineRecordType::PaintSetup, TimelineRecordFactory::createLayerData(nodeIdentifier));
             paintSetupRecord->setEndTime(m_paintSetupEnd);
             addRecordToTimeline(paintSetupRecord, paintSetupStart);
         }
     }
     pushCurrentRecord(JSONObject::create(), TimelineRecordType::Paint, true, frame, true);
 }
 
-void InspectorTimelineAgent::didPaint(RenderObject* renderer, const GraphicsLayer* graphicsLayer, GraphicsContext*, const LayoutRect& clipRect)
+void InspectorTimelineAgent::didPaint(LayoutObject* renderer, const GraphicsLayer* graphicsLayer, GraphicsContext*, const LayoutRect& clipRect)
 {
     TimelineRecordEntry& entry = m_recordStack.last();
     ASSERT(entry.type == TimelineRecordType::Paint);
     FloatQuad quad;
     localToPageQuad(*renderer, clipRect, &quad);
     int graphicsLayerId = graphicsLayer ? graphicsLayer->platformLayer()->id() : 0;
     TimelineRecordFactory::setPaintData(entry.data.get(), quad, nodeId(renderer), graphicsLayerId);
     didCompleteCurrentRecord(TimelineRecordType::Paint);
     if (m_mayEmitFirstPaint && !graphicsLayer) {
         m_mayEmitFirstPaint = false;
         appendRecord(JSONObject::create(), TimelineRecordType::MarkFirstPaint, false, 0);
     }
 }
 
 void InspectorTimelineAgent::willPaintImage(RenderImage* renderImage)
 {
     ASSERT(!m_imageBeingPainted);
     m_imageBeingPainted = renderImage;
 }
 
 void InspectorTimelineAgent::didPaintImage()
 {
     m_imageBeingPainted = 0;
 }
 
-void InspectorTimelineAgent::willScrollLayer(RenderObject* renderer)
+void InspectorTimelineAgent::willScrollLayer(LayoutObject* renderer)
 {
     pushCurrentRecord(TimelineRecordFactory::createLayerData(nodeId(renderer)), TimelineRecordType::ScrollLayer, false, renderer->frame());
 }
 
 void InspectorTimelineAgent::didScrollLayer()
 {
     didCompleteCurrentRecord(TimelineRecordType::ScrollLayer);
 }
 
 void InspectorTimelineAgent::willDecodeImage(const String& imageType)
@@ skipping 594 matching lines @@
 {
     if (m_platformInstrumentationClientInstalledAtStackDepth) {
         m_platformInstrumentationClientInstalledAtStackDepth = 0;
         PlatformInstrumentation::setClient(0);
     }
     m_pendingFrameRecord.clear();
     m_recordStack.clear();
     m_id++;
 }
 
-void InspectorTimelineAgent::localToPageQuad(const RenderObject& renderer, const LayoutRect& rect, FloatQuad* quad)
+void InspectorTimelineAgent::localToPageQuad(const LayoutObject& renderer, const LayoutRect& rect, FloatQuad* quad)
 {
     LocalFrame* frame = renderer.frame();
     FrameView* view = frame->view();
     FloatQuad absolute = renderer.localToAbsoluteQuad(FloatQuad(rect));
     quad->setP1(view->contentsToRootView(roundedIntPoint(absolute.p1())));
     quad->setP2(view->contentsToRootView(roundedIntPoint(absolute.p2())));
     quad->setP3(view->contentsToRootView(roundedIntPoint(absolute.p3())));
     quad->setP4(view->contentsToRootView(roundedIntPoint(absolute.p4())));
 }
 
 long long InspectorTimelineAgent::nodeId(Node* node)
 {
     return node ? InspectorNodeIds::idForNode(node)  : 0;
 }
 
-long long InspectorTimelineAgent::nodeId(RenderObject* renderer)
+long long InspectorTimelineAgent::nodeId(LayoutObject* renderer)
 {
     return InspectorNodeIds::idForNode(renderer->generatingNode());
 }
 
 double InspectorTimelineAgent::timestamp()
 {
     return WTF::monotonicallyIncreasingTime() * msPerSecond;
 }
 
 LocalFrame* InspectorTimelineAgent::inspectedFrame() const
@@ skipping 61 matching lines @@
 {
     visitor->trace(m_timelineAgent);
 }
 
 void TimelineThreadState::trace(Visitor* visitor)
 {
     visitor->trace(recordStack);
 }
 
 } // namespace blink