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

Unified Diff: Source/core/rendering/RenderBox.cpp

Issue 180803012: Disable some compositing state asserts seen on Mac builds (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 10 months 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 | « no previous file | Source/core/rendering/RenderLayerScrollableArea.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderBox.cpp
diff --git a/Source/core/rendering/RenderBox.cpp b/Source/core/rendering/RenderBox.cpp
index 760eab0aad7d7832b5fed5c1e2a2aff48cfc7088..c716134da62106a8b89b1ae089d5a1f8387124fd 100644
--- a/Source/core/rendering/RenderBox.cpp
+++ b/Source/core/rendering/RenderBox.cpp
@@ -474,6 +474,9 @@ static inline bool frameElementAndViewPermitScroll(HTMLFrameElementBase* frameEl
void RenderBox::scrollRectToVisible(const LayoutRect& rect, const ScrollAlignment& alignX, const ScrollAlignment& alignY)
{
+ // Presumably the same issue as in setScrollTop. See crbug.com/343132.
+ DisableCompositingQueryAsserts disabler;
+
RenderBox* parentBox = 0;
LayoutRect newRect = rect;
@@ -738,6 +741,9 @@ int RenderBox::instrinsicScrollbarLogicalWidth() const
bool RenderBox::scroll(ScrollDirection direction, ScrollGranularity granularity, float delta)
{
+ // Presumably the same issue as in setScrollTop. See crbug.com/343132.
+ DisableCompositingQueryAsserts disabler;
+
// Logical scroll is a higher level concept, all directions by here must be physical
ASSERT(!isLogical(direction));
« no previous file with comments | « no previous file | Source/core/rendering/RenderLayerScrollableArea.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698