Source/core/rendering/RenderLayerScrollableArea.cpp - Issue 247803003: Remove assumption that null containerForRepaint assumes RenderView

Side by Side Diff: Source/core/rendering/RenderLayerScrollableArea.cpp

Issue 247803003: Remove assumption that null containerForRepaint assumes RenderView (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 8 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 unified diff | Download patch | Annotate | Revision Log

« Source/core/frame/FrameView.cpp ('K') | « Source/core/frame/FrameView.cpp ('k') | Source/core/rendering/RenderObject.cpp » ('j') | Source/core/rendering/RenderObject.cpp » ('J')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.	2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.

3 *	3 *

4 * Portions are Copyright (C) 1998 Netscape Communications Corporation.	4 * Portions are Copyright (C) 1998 Netscape Communications Corporation.

5 *	5 *

6 * Other contributors:	6 * Other contributors:

7 * Robert O'Callahan <roc+@cs.cmu.edu>	7 * Robert O'Callahan <roc+@cs.cmu.edu>

8 * David Baron <dbaron@fas.harvard.edu>	8 * David Baron <dbaron@fas.harvard.edu>

9 * Christian Biesinger <cbiesinger@web.de>	9 * Christian Biesinger <cbiesinger@web.de>

10 * Randall Jesup <rjesup@wgate.com>	10 * Randall Jesup <rjesup@wgate.com>

(...skipping 363 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
374 RenderLayerModelObject* repaintContainer = m_box->containerForRepaint();	374 RenderLayerModelObject* repaintContainer = m_box->containerForRepaint();

375 // The caret rect needs to be invalidated after scrolling	375 // The caret rect needs to be invalidated after scrolling

376 frame->selection().setCaretRectNeedsUpdate();	376 frame->selection().setCaretRectNeedsUpdate();

377	377

378 FloatQuad quadForFakeMouseMoveEvent;	378 FloatQuad quadForFakeMouseMoveEvent;

379 if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled())	379 if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled())

380 quadForFakeMouseMoveEvent = FloatQuad(layer()->renderer()->previousRepai ntRect());	380 quadForFakeMouseMoveEvent = FloatQuad(layer()->renderer()->previousRepai ntRect());

381 else	381 else

382 quadForFakeMouseMoveEvent = FloatQuad(layer()->repainter().repaintRect() );	382 quadForFakeMouseMoveEvent = FloatQuad(layer()->repainter().repaintRect() );

383	383

384 if (repaintContainer)	384 quadForFakeMouseMoveEvent = repaintContainer->localToAbsoluteQuad(quadForFak eMouseMoveEvent);

385 quadForFakeMouseMoveEvent = repaintContainer->localToAbsoluteQuad(quadFo rFakeMouseMoveEvent);

386 frame->eventHandler().dispatchFakeMouseMoveEventSoonInQuad(quadForFakeMouseM oveEvent);	385 frame->eventHandler().dispatchFakeMouseMoveEventSoonInQuad(quadForFakeMouseM oveEvent);

387	386

388 bool requiresRepaint = true;	387 bool requiresRepaint = true;

389	388

390 if (m_box->view()->compositor()->inCompositingMode()) {	389 if (m_box->view()->compositor()->inCompositingMode()) {

391 // Hits in virtual/gpu/fast/canvas/canvas-scroll-path-into-view.html.	390 // Hits in virtual/gpu/fast/canvas/canvas-scroll-path-into-view.html.

392 DisableCompositingQueryAsserts disabler;	391 DisableCompositingQueryAsserts disabler;

393 bool onlyScrolledCompositedLayers = scrollsOverflow()	392 bool onlyScrolledCompositedLayers = scrollsOverflow()

394 && !layer()->hasVisibleNonLayerContent()	393 && !layer()->hasVisibleNonLayerContent()

395 && !layer()->hasNonCompositedChild()	394 && !layer()->hasNonCompositedChild()

(...skipping 1132 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1528 void RenderLayerScrollableArea::setForceNeedsCompositedScrolling(ForceNeedsCompo sitedScrollingMode mode)	1527 void RenderLayerScrollableArea::setForceNeedsCompositedScrolling(ForceNeedsCompo sitedScrollingMode mode)

1529 {	1528 {

1530 if (m_forceNeedsCompositedScrolling == mode)	1529 if (m_forceNeedsCompositedScrolling == mode)

1531 return;	1530 return;

1532	1531

1533 m_forceNeedsCompositedScrolling = mode;	1532 m_forceNeedsCompositedScrolling = mode;

1534 layer()->didUpdateNeedsCompositedScrolling();	1533 layer()->didUpdateNeedsCompositedScrolling();

1535 }	1534 }

1536	1535

1537 } // Namespace WebCore	1536 } // Namespace WebCore

OLD	NEW