Delete most of rendering/compositing.

sky/engine/core/frame/FrameView.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 28 matching lines @@
 #include "sky/engine/core/html/parser/TextResourceDecoder.h"
 #include "sky/engine/core/inspector/InspectorTraceEvents.h"
 #include "sky/engine/core/loader/FrameLoaderClient.h"
 #include "sky/engine/core/page/Chrome.h"
 #include "sky/engine/core/page/ChromeClient.h"
 #include "sky/engine/core/page/EventHandler.h"
 #include "sky/engine/core/page/FocusController.h"
 #include "sky/engine/core/page/Page.h"
 #include "sky/engine/core/rendering/RenderLayer.h"
 #include "sky/engine/core/rendering/RenderView.h"
-#include "sky/engine/core/rendering/compositing/RenderLayerCompositor.h"
 #include "sky/engine/core/rendering/style/RenderStyle.h"
 #include "sky/engine/platform/ScriptForbiddenScope.h"
 #include "sky/engine/platform/TraceEvent.h"
 #include "sky/engine/platform/fonts/FontCache.h"
 #include "sky/engine/platform/geometry/FloatRect.h"
 #include "sky/engine/platform/graphics/GraphicsContext.h"
 #include "sky/engine/platform/graphics/GraphicsLayerDebugInfo.h"
 #include "sky/engine/platform/scroll/ScrollAnimator.h"
 #include "sky/engine/platform/scroll/Scrollbar.h"
 #include "sky/engine/platform/text/TextStream.h"
@@ skipping 105 matching lines @@
     }
 }
 
 void FrameView::setFrameRect(const IntRect& newRect)
 {
     IntRect oldRect = frameRect();
     if (newRect == oldRect)
         return;
 
     Widget::setFrameRect(newRect);
-
-    if (RenderView* renderView = this->renderView()) {
-        if (renderView->usesCompositing())
-            renderView->compositor()->frameViewDidChangeSize();
-    }
 }
 
 Page* FrameView::page() const
 {
     return frame().page();
 }
 
 RenderView* FrameView::renderView() const
 {
     return frame().contentRenderer();
 }
 
 IntPoint FrameView::clampOffsetAtScale(const IntPoint& offset, float scale) const
 {
     FloatSize scaledSize = unscaledVisibleContentSize();
     if (scale)
         scaledSize.scale(1 / scale);
 
     IntPoint clampedOffset = offset;
     clampedOffset = clampedOffset.shrunkTo(
         IntPoint(size()) - expandedIntSize(scaledSize));
     return clampedOffset;
 }
 
-void FrameView::updateAcceleratedCompositingSettings()
-{
-    if (RenderView* renderView = this->renderView())
-        renderView->compositor()->updateAcceleratedCompositingSettings();
-}
-
 void FrameView::recalcOverflowAfterStyleChange()
 {
     RenderView* renderView = this->renderView();
     RELEASE_ASSERT(renderView);
     if (!renderView->needsOverflowRecalcAfterStyleChange())
         return;
 
     renderView->recalcOverflowAfterStyleChange();
 }
 
@@ skipping 169 matching lines @@
         m_layoutSubtreeRoot = 0;
         // We need to ensure that we mark up all renderers up to the RenderView
         // for paint invalidation. This simplifies our code as we just always
         // do a full tree walk.
         if (RenderObject* container = rootForThisLayout->container())
             container->setMayNeedPaintInvalidation(true);
     } // Reset m_layoutSchedulingEnabled to its previous value.
 
     layer->updateLayerPositionsAfterLayout();
 
-    if (m_doFullPaintInvalidation)
-        renderView()->compositor()->fullyInvalidatePaint();
-    renderView()->compositor()->didLayout();
-
     m_layoutCount++;
 
     ASSERT(!rootForThisLayout->needsLayout());
 
     scheduleOrPerformPostLayoutTasks();
 
     TRACE_EVENT_END1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Layout", "endData", InspectorLayoutEvent::endData(rootForThisLayout));
 
     m_nestedLayoutCount--;
     if (m_nestedLayoutCount)
@@ skipping 477 matching lines @@
 }
 
 void FrameView::updateLayoutAndStyleForPainting()
 {
     // Updating layout can run script, which can tear down the FrameView.
     RefPtr<FrameView> protector(this);
 
     updateLayoutAndStyleIfNeededRecursive();
 
     if (RenderView* view = renderView()) {
-        TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "UpdateLayerTree", TRACE_EVENT_SCOPE_PROCESS, "frame", m_frame.get());
-        view->compositor()->updateIfNeededRecursive();
-
+        TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "InvalidateTreeAndUpdateIframes", TRACE_EVENT_SCOPE_PROCESS, "frame", m_frame.get());
         invalidateTreeIfNeededRecursive();
-
         view->updateIFramesAfterLayout();
     }
 
     ASSERT(lifecycle().state() == DocumentLifecycle::PaintInvalidationClean);
 }
 
 void FrameView::updateLayoutAndStyleIfNeededRecursive()
 {
     // We have to crawl our entire tree looking for any FrameViews that need
     // layout and make sure they are up to date.
@@ skipping 50 matching lines @@
     return roundedIntPoint(renderer.localToAbsolute(rendererPoint, UseTransforms));
 }
 
 IntPoint FrameView::convertToRenderer(const RenderObject& renderer, const IntPoint& viewPoint) const
 {
     return roundedIntPoint(renderer.absoluteToLocal(viewPoint, UseTransforms));
 }
 
 void FrameView::setTracksPaintInvalidations(bool trackPaintInvalidations)
 {
+    // FIXME(sky): Does this code work anymore now that we don't have the compositor?
     if (trackPaintInvalidations == m_isTrackingPaintInvalidations)
         return;
 
-    // FIXME(sky): simplify
-    if (RenderView* renderView = m_frame->contentRenderer())
-        renderView->compositor()->setTracksPaintInvalidations(trackPaintInvalidations);
-
     TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("blink.invalidation"),
         "FrameView::setTracksPaintInvalidations", TRACE_EVENT_SCOPE_PROCESS, "enabled", trackPaintInvalidations);
 
     resetTrackedPaintInvalidations();
     m_isTrackingPaintInvalidations = trackPaintInvalidations;
 }
 
 void FrameView::resetTrackedPaintInvalidations()
 {
     m_trackedPaintInvalidationRects.clear();
-    if (RenderView* renderView = this->renderView())
-        renderView->compositor()->resetTrackedPaintInvalidationRects();
 }
 
 String FrameView::trackedPaintInvalidationRectsAsText() const
 {
     TextStream ts;
     if (!m_trackedPaintInvalidationRects.isEmpty()) {
         ts << "(repaint rects\n";
         for (size_t i = 0; i < m_trackedPaintInvalidationRects.size(); ++i)
             ts << "  (rect " << m_trackedPaintInvalidationRects[i].x() << " " << m_trackedPaintInvalidationRects[i].y() << " " << m_trackedPaintInvalidationRects[i].width() << " " << m_trackedPaintInvalidationRects[i].height() << ")\n";
         ts << ")\n";
@@ skipping 45 matching lines @@
 void FrameView::setLayoutSizeInternal(const IntSize& size)
 {
     if (m_layoutSize == size)
         return;
 
     m_layoutSize = size;
     contentsResized();
 }
 
 } // namespace blink