Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights |
| 3 * reserved. | 3 * reserved. |
| 4 * | 4 * |
| 5 * Portions are Copyright (C) 1998 Netscape Communications Corporation. | 5 * Portions are Copyright (C) 1998 Netscape Communications Corporation. |
| 6 * | 6 * |
| 7 * Other contributors: | 7 * Other contributors: |
| 8 * Robert O'Callahan <roc+@cs.cmu.edu> | 8 * Robert O'Callahan <roc+@cs.cmu.edu> |
| 9 * David Baron <dbaron@fas.harvard.edu> | 9 * David Baron <dbaron@fas.harvard.edu> |
| 10 * Christian Biesinger <cbiesinger@gmail.com> | 10 * Christian Biesinger <cbiesinger@gmail.com> |
| (...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 406 | 406 |
| 407 FloatQuad quadForFakeMouseMoveEvent = FloatQuad(FloatRect( | 407 FloatQuad quadForFakeMouseMoveEvent = FloatQuad(FloatRect( |
| 408 layer()->layoutObject()->previousVisualRectIncludingCompositedScrolling( | 408 layer()->layoutObject()->previousVisualRectIncludingCompositedScrolling( |
| 409 paintInvalidationContainer))); | 409 paintInvalidationContainer))); |
| 410 | 410 |
| 411 quadForFakeMouseMoveEvent = | 411 quadForFakeMouseMoveEvent = |
| 412 paintInvalidationContainer.localToAbsoluteQuad(quadForFakeMouseMoveEvent); | 412 paintInvalidationContainer.localToAbsoluteQuad(quadForFakeMouseMoveEvent); |
| 413 frame->eventHandler().dispatchFakeMouseMoveEventSoonInQuad( | 413 frame->eventHandler().dispatchFakeMouseMoveEventSoonInQuad( |
| 414 quadForFakeMouseMoveEvent); | 414 quadForFakeMouseMoveEvent); |
| 415 | 415 |
| 416 Page* page = frame->page(); | 416 if (scrollType == UserScroll || scrollType == CompositorScroll) { |
| 417 if (page) | 417 if (Page* page = frame->page()) |
|
tdresser
2017/01/03 13:56:32
Why move this assignment into the conditional?
szager1
2017/01/03 20:24:22
I have no opinion on this. I restored the previou
bokan
2017/01/04 23:53:09
No need to change anything again, just FYI, but I
| |
| 418 page->chromeClient().clearToolTip(*frame); | 418 page->chromeClient().clearToolTip(*frame); |
| 419 } | |
| 419 | 420 |
| 420 bool requiresPaintInvalidation = true; | 421 bool requiresPaintInvalidation = true; |
| 421 | 422 |
| 422 if (box().view()->compositor()->inCompositingMode()) { | 423 if (box().view()->compositor()->inCompositingMode()) { |
| 423 bool onlyScrolledCompositedLayers = | 424 bool onlyScrolledCompositedLayers = |
| 424 scrollsOverflow() && layer()->isAllScrollingContentComposited() && | 425 scrollsOverflow() && layer()->isAllScrollingContentComposited() && |
| 425 box().style()->backgroundLayers().attachment() != | 426 box().style()->backgroundLayers().attachment() != |
| 426 LocalBackgroundAttachment; | 427 LocalBackgroundAttachment; |
| 427 | 428 |
| 428 if (usesCompositedScrolling() || onlyScrolledCompositedLayers) | 429 if (usesCompositedScrolling() || onlyScrolledCompositedLayers) |
| (...skipping 1643 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2072 | 2073 |
| 2073 void PaintLayerScrollableArea::DelayScrollOffsetClampScope:: | 2074 void PaintLayerScrollableArea::DelayScrollOffsetClampScope:: |
| 2074 clampScrollableAreas() { | 2075 clampScrollableAreas() { |
| 2075 for (auto& scrollableArea : *s_needsClamp) | 2076 for (auto& scrollableArea : *s_needsClamp) |
| 2076 scrollableArea->clampScrollOffsetAfterOverflowChange(); | 2077 scrollableArea->clampScrollOffsetAfterOverflowChange(); |
| 2077 delete s_needsClamp; | 2078 delete s_needsClamp; |
| 2078 s_needsClamp = nullptr; | 2079 s_needsClamp = nullptr; |
| 2079 } | 2080 } |
| 2080 | 2081 |
| 2081 } // namespace blink | 2082 } // namespace blink |
| OLD | NEW |