| 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 1870 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1881 MainThreadScrollingReason::kIsNotStackingContextAndLCDText; | 1881 MainThreadScrollingReason::kIsNotStackingContextAndLCDText; |
| 1882 } | 1882 } |
| 1883 | 1883 |
| 1884 needs_composited_scrolling = false; | 1884 needs_composited_scrolling = false; |
| 1885 } | 1885 } |
| 1886 | 1886 |
| 1887 // TODO(schenney) Tests fail if we do not also exclude | 1887 // TODO(schenney) Tests fail if we do not also exclude |
| 1888 // layer->layoutObject().style()->hasBorderDecoration() (missing background | 1888 // layer->layoutObject().style()->hasBorderDecoration() (missing background |
| 1889 // behind dashed borders). Resolve this case, or not, and update this check | 1889 // behind dashed borders). Resolve this case, or not, and update this check |
| 1890 // with the results. | 1890 // with the results. |
| 1891 if (layer->GetLayoutObject().Style()->HasBorderRadius()) { | 1891 |
| 1892 non_composited_main_thread_scrolling_reasons_ |= | |
| 1893 MainThreadScrollingReason::kHasBorderRadius; | |
| 1894 needs_composited_scrolling = false; | |
| 1895 } | |
| 1896 if (layer->GetLayoutObject().HasClip() || | 1892 if (layer->GetLayoutObject().HasClip() || |
| 1897 layer->HasDescendantWithClipPath() || layer->HasAncestorWithClipPath()) { | 1893 layer->HasDescendantWithClipPath() || layer->HasAncestorWithClipPath()) { |
| 1898 non_composited_main_thread_scrolling_reasons_ |= | 1894 non_composited_main_thread_scrolling_reasons_ |= |
| 1899 MainThreadScrollingReason::kHasClipRelatedProperty; | 1895 MainThreadScrollingReason::kHasClipRelatedProperty; |
| 1900 needs_composited_scrolling = false; | 1896 needs_composited_scrolling = false; |
| 1901 } | 1897 } |
| 1902 | 1898 |
| 1903 DCHECK(!(non_composited_main_thread_scrolling_reasons_ & | 1899 DCHECK(!(non_composited_main_thread_scrolling_reasons_ & |
| 1904 ~MainThreadScrollingReason::kNonCompositedReasons)); | 1900 ~MainThreadScrollingReason::kNonCompositedReasons)); |
| 1905 return needs_composited_scrolling; | 1901 return needs_composited_scrolling; |
| (...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2177 | 2173 |
| 2178 void PaintLayerScrollableArea::DelayScrollOffsetClampScope:: | 2174 void PaintLayerScrollableArea::DelayScrollOffsetClampScope:: |
| 2179 ClampScrollableAreas() { | 2175 ClampScrollableAreas() { |
| 2180 for (auto& scrollable_area : *needs_clamp_) | 2176 for (auto& scrollable_area : *needs_clamp_) |
| 2181 scrollable_area->ClampScrollOffsetAfterOverflowChange(); | 2177 scrollable_area->ClampScrollOffsetAfterOverflowChange(); |
| 2182 delete needs_clamp_; | 2178 delete needs_clamp_; |
| 2183 needs_clamp_ = nullptr; | 2179 needs_clamp_ = nullptr; |
| 2184 } | 2180 } |
| 2185 | 2181 |
| 2186 } // namespace blink | 2182 } // namespace blink |
| OLD | NEW |