Move rendering/RenderObject to layout/LayoutObject.

Source/core/fetch/ResourceLoadPriorityOptimizer.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 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/fetch/ResourceLoadPriorityOptimizer.h"
-#include "core/rendering/RenderObject.h"
+#include "core/layout/LayoutObject.h"
 #include "platform/TraceEvent.h"
 
 #include "wtf/Vector.h"
 
 namespace blink {
 
 ResourceLoadPriorityOptimizer* ResourceLoadPriorityOptimizer::resourceLoadPriorityOptimizer()
 {
     DEFINE_STATIC_LOCAL(ResourceLoadPriorityOptimizer, s_renderLoadOptimizer, ());
     return &s_renderLoadOptimizer;
@@ skipping 11 matching lines @@
 }
 
 ResourceLoadPriorityOptimizer::ResourceLoadPriorityOptimizer()
 {
 }
 
 ResourceLoadPriorityOptimizer::~ResourceLoadPriorityOptimizer()
 {
 }
 
-void ResourceLoadPriorityOptimizer::addRenderObject(RenderObject* renderer)
+void ResourceLoadPriorityOptimizer::addLayoutObject(LayoutObject* renderer)
 {
     m_objects.add(renderer);
     renderer->setHasPendingResourceUpdate(true);
 }
 
-void ResourceLoadPriorityOptimizer::removeRenderObject(RenderObject* renderer)
+void ResourceLoadPriorityOptimizer::removeLayoutObject(LayoutObject* renderer)
 {
     if (!renderer->hasPendingResourceUpdate())
         return;
     m_objects.remove(renderer);
     renderer->setHasPendingResourceUpdate(false);
 }
 
 void ResourceLoadPriorityOptimizer::updateAllImageResourcePriorities()
 {
     TRACE_EVENT0("blink", "ResourceLoadPriorityOptimizer::updateAllImageResourcePriorities");
 
     m_imageResources.clear();
 
-    Vector<RenderObject*> objectsToRemove;
-    for (const auto& renderObject : m_objects) {
-        if (!renderObject->updateImageLoadingPriorities())
-            objectsToRemove.append(renderObject);
+    Vector<LayoutObject*> objectsToRemove;
+    for (const auto& layoutObject : m_objects) {
+        if (!layoutObject->updateImageLoadingPriorities())
+            objectsToRemove.append(layoutObject);
     }
     m_objects.removeAll(objectsToRemove);
 
     updateImageResourcesWithLoadPriority();
 }
 
 void ResourceLoadPriorityOptimizer::updateImageResourcesWithLoadPriority()
 {
     for (const auto& resource : m_imageResources) {
         ResourceLoadPriority priority = resource.value->status == Visible ?
@@ skipping 17 matching lines @@
         screenArea += static_cast<uint32_t>(screenRect.width() * screenRect.height());
 
     ImageResourceMap::AddResult result = m_imageResources.add(img->identifier(), adoptPtr(new ResourceAndVisibility(img, status, screenArea)));
     if (!result.isNewEntry && status == Visible) {
         result.storedValue->value->status = Visible;
         result.storedValue->value->screenArea += screenArea;
     }
 }
 
 }