Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(162)

Unified Diff: sky/engine/core/frame/FrameView.cpp

Issue 758843004: Delete most of rendering/compositing. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sky/engine/core/frame/FrameView.cpp
diff --git a/sky/engine/core/frame/FrameView.cpp b/sky/engine/core/frame/FrameView.cpp
index 79004724f25a249339a9bbbc71061f29feaeddd0..7163e74d12c71f922365941fcf34c60d7bc42380 100644
--- a/sky/engine/core/frame/FrameView.cpp
+++ b/sky/engine/core/frame/FrameView.cpp
@@ -46,7 +46,6 @@
#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"
@@ -172,11 +171,6 @@ void FrameView::setFrameRect(const IntRect& newRect)
return;
Widget::setFrameRect(newRect);
-
- if (RenderView* renderView = this->renderView()) {
- if (renderView->usesCompositing())
- renderView->compositor()->frameViewDidChangeSize();
- }
}
Page* FrameView::page() const
@@ -201,12 +195,6 @@ IntPoint FrameView::clampOffsetAtScale(const IntPoint& offset, float scale) cons
return clampedOffset;
}
-void FrameView::updateAcceleratedCompositingSettings()
-{
- if (RenderView* renderView = this->renderView())
- renderView->compositor()->updateAcceleratedCompositingSettings();
-}
-
void FrameView::recalcOverflowAfterStyleChange()
{
RenderView* renderView = this->renderView();
@@ -396,10 +384,6 @@ void FrameView::layout(bool allowSubtree)
layer->updateLayerPositionsAfterLayout();
- if (m_doFullPaintInvalidation)
- renderView()->compositor()->fullyInvalidatePaint();
- renderView()->compositor()->didLayout();
-
m_layoutCount++;
ASSERT(!rootForThisLayout->needsLayout());
@@ -897,11 +881,8 @@ void FrameView::updateLayoutAndStyleForPainting()
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();
}
@@ -972,13 +953,10 @@ IntPoint FrameView::convertToRenderer(const RenderObject& renderer, const IntPoi
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);
@@ -989,8 +967,6 @@ void FrameView::setTracksPaintInvalidations(bool trackPaintInvalidations)
void FrameView::resetTrackedPaintInvalidations()
{
m_trackedPaintInvalidationRects.clear();
- if (RenderView* renderView = this->renderView())
- renderView->compositor()->resetTrackedPaintInvalidationRects();
}
String FrameView::trackedPaintInvalidationRectsAsText() const

Powered by Google App Engine
This is Rietveld 408576698