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

Unified Diff: Source/core/testing/Internals.cpp

Issue 46163008: Revert "Re-land deferred compositing updates with fixed assumptions" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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
« no previous file with comments | « Source/core/testing/Internals.h ('k') | Source/core/testing/Internals.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/testing/Internals.cpp
diff --git a/Source/core/testing/Internals.cpp b/Source/core/testing/Internals.cpp
index c34d40c85fd6747ac9c88e5532027fc58a0e4329..793b05f67c7f6480643eceafb7845cd1177cff32 100644
--- a/Source/core/testing/Internals.cpp
+++ b/Source/core/testing/Internals.cpp
@@ -1364,11 +1364,9 @@ PassRefPtr<LayerRectList> Internals::touchEventTargetLayerRects(Document* docume
return 0;
}
- // Do any pending layout and compositing update (which may call touchEventTargetRectsChange) to ensure this
+ // Do any pending layouts (which may call touchEventTargetRectsChange) to ensure this
// really takes any previous changes into account.
- forceCompositingUpdate(document, es);
- if (es.hadException())
- return 0;
+ document->updateLayout();
if (RenderView* view = document->renderView()) {
if (RenderLayerCompositor* compositor = view->compositor()) {
@@ -1829,12 +1827,6 @@ String Internals::mainThreadScrollingReasons(Document* document, ExceptionState&
return String();
}
- // Force a re-layout and a compositing update.
- document->updateLayout();
- RenderView* view = document->renderView();
- if (view->compositor())
- view->compositor()->updateCompositingLayers(CompositingUpdateFinishAllDeferredWork);
-
Page* page = document->page();
if (!page)
return String();
@@ -2262,18 +2254,4 @@ bool Internals::loseSharedGraphicsContext3D()
return true;
}
-void Internals::forceCompositingUpdate(Document* document, ExceptionState& es)
-{
- if (!document || !document->renderView()) {
- es.throwUninformativeAndGenericDOMException(InvalidAccessError);
- return;
- }
-
- document->updateLayout();
-
- RenderView* view = document->renderView();
- if (view->compositor())
- view->compositor()->updateCompositingLayers(CompositingUpdateFinishAllDeferredWork);
-}
-
}
« no previous file with comments | « Source/core/testing/Internals.h ('k') | Source/core/testing/Internals.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698