Commit ddc343bd authored by rbyers@chromium.org's avatar rbyers@chromium.org

Disable some compositing state asserts seen on Mac builds

Test scenarios:
http://www.rbyers.net/eventTest.html - scrolling the page or div (has a wheel handler but doesn't call preventDefault)
Loading https://twitter.com/pwnall

BUG=343132

Review URL: https://codereview.chromium.org/180803012

git-svn-id: svn://svn.chromium.org/blink/trunk@168478 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 66968e97
...@@ -474,6 +474,9 @@ static inline bool frameElementAndViewPermitScroll(HTMLFrameElementBase* frameEl ...@@ -474,6 +474,9 @@ static inline bool frameElementAndViewPermitScroll(HTMLFrameElementBase* frameEl
void RenderBox::scrollRectToVisible(const LayoutRect& rect, const ScrollAlignment& alignX, const ScrollAlignment& alignY) 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; RenderBox* parentBox = 0;
LayoutRect newRect = rect; LayoutRect newRect = rect;
...@@ -738,6 +741,9 @@ int RenderBox::instrinsicScrollbarLogicalWidth() const ...@@ -738,6 +741,9 @@ int RenderBox::instrinsicScrollbarLogicalWidth() const
bool RenderBox::scroll(ScrollDirection direction, ScrollGranularity granularity, float delta) 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 // Logical scroll is a higher level concept, all directions by here must be physical
ASSERT(!isLogical(direction)); ASSERT(!isLogical(direction));
......
...@@ -146,21 +146,33 @@ GraphicsLayer* RenderLayerScrollableArea::layerForScrolling() const ...@@ -146,21 +146,33 @@ GraphicsLayer* RenderLayerScrollableArea::layerForScrolling() const
GraphicsLayer* RenderLayerScrollableArea::layerForHorizontalScrollbar() const GraphicsLayer* RenderLayerScrollableArea::layerForHorizontalScrollbar() const
{ {
// See crbug.com/343132.
DisableCompositingQueryAsserts disabler;
return m_box->hasCompositedLayerMapping() ? m_box->compositedLayerMapping()->layerForHorizontalScrollbar() : 0; return m_box->hasCompositedLayerMapping() ? m_box->compositedLayerMapping()->layerForHorizontalScrollbar() : 0;
} }
GraphicsLayer* RenderLayerScrollableArea::layerForVerticalScrollbar() const GraphicsLayer* RenderLayerScrollableArea::layerForVerticalScrollbar() const
{ {
// See crbug.com/343132.
DisableCompositingQueryAsserts disabler;
return m_box->hasCompositedLayerMapping() ? m_box->compositedLayerMapping()->layerForVerticalScrollbar() : 0; return m_box->hasCompositedLayerMapping() ? m_box->compositedLayerMapping()->layerForVerticalScrollbar() : 0;
} }
GraphicsLayer* RenderLayerScrollableArea::layerForScrollCorner() const GraphicsLayer* RenderLayerScrollableArea::layerForScrollCorner() const
{ {
// See crbug.com/343132.
DisableCompositingQueryAsserts disabler;
return m_box->hasCompositedLayerMapping() ? m_box->compositedLayerMapping()->layerForScrollCorner() : 0; return m_box->hasCompositedLayerMapping() ? m_box->compositedLayerMapping()->layerForScrollCorner() : 0;
} }
void RenderLayerScrollableArea::invalidateScrollbarRect(Scrollbar* scrollbar, const IntRect& rect) void RenderLayerScrollableArea::invalidateScrollbarRect(Scrollbar* scrollbar, const IntRect& rect)
{ {
// See crbug.com/343132.
DisableCompositingQueryAsserts disabler;
if (scrollbar == m_vBar.get()) { if (scrollbar == m_vBar.get()) {
if (GraphicsLayer* layer = layerForVerticalScrollbar()) { if (GraphicsLayer* layer = layerForVerticalScrollbar()) {
layer->setNeedsDisplayInRect(rect); layer->setNeedsDisplayInRect(rect);
......
...@@ -1302,6 +1302,9 @@ void RenderLayerCompositor::rootFixedBackgroundsChanged() ...@@ -1302,6 +1302,9 @@ void RenderLayerCompositor::rootFixedBackgroundsChanged()
if (!supportsFixedRootBackgroundCompositing()) if (!supportsFixedRootBackgroundCompositing())
return; return;
// crbug.com/343132.
DisableCompositingQueryAsserts disabler;
// To avoid having to make the fixed root background layer fixed positioned to // To avoid having to make the fixed root background layer fixed positioned to
// stay put, we position it in the layer tree as follows: // stay put, we position it in the layer tree as follows:
// //
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment