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: Fix zee nits 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

« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/core/rendering/RenderObject.cpp » ('j') | no next file with comments »

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 364 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
375 RenderLayerModelObject* repaintContainer = m_box->containerForRepaint();	375 RenderLayerModelObject* repaintContainer = m_box->containerForRepaint();

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

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

378	378

379 FloatQuad quadForFakeMouseMoveEvent;	379 FloatQuad quadForFakeMouseMoveEvent;

380 if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled())	380 if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled())

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

382 else	382 else

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

384	384

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

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

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

388	387

389 bool requiresRepaint = true;	388 bool requiresRepaint = true;

390	389

391 if (m_box->view()->compositor()->staleInCompositingMode()) {	390 if (m_box->view()->compositor()->staleInCompositingMode()) {

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

393 DisableCompositingQueryAsserts disabler;	392 DisableCompositingQueryAsserts disabler;

394 bool onlyScrolledCompositedLayers = scrollsOverflow()	393 bool onlyScrolledCompositedLayers = scrollsOverflow()

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

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

(...skipping 1126 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1523 void RenderLayerScrollableArea::setForceNeedsCompositedScrolling(ForceNeedsCompo sitedScrollingMode mode)	1522 void RenderLayerScrollableArea::setForceNeedsCompositedScrolling(ForceNeedsCompo sitedScrollingMode mode)

1524 {	1523 {

1525 if (m_forceNeedsCompositedScrolling == mode)	1524 if (m_forceNeedsCompositedScrolling == mode)

1526 return;	1525 return;

1527	1526

1528 m_forceNeedsCompositedScrolling = mode;	1527 m_forceNeedsCompositedScrolling = mode;

1529 layer()->didUpdateNeedsCompositedScrolling();	1528 layer()->didUpdateNeedsCompositedScrolling();

1530 }	1529 }

1531	1530

1532 } // Namespace WebCore	1531 } // Namespace WebCore

OLD	NEW