| 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 1879 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1890 MainThreadScrollingReason::kIsNotStackingContextAndLCDText; | 1890 MainThreadScrollingReason::kIsNotStackingContextAndLCDText; |
| 1891 } | 1891 } |
| 1892 | 1892 |
| 1893 needs_composited_scrolling = false; | 1893 needs_composited_scrolling = false; |
| 1894 } | 1894 } |
| 1895 | 1895 |
| 1896 // TODO(schenney) Tests fail if we do not also exclude | 1896 // TODO(schenney) Tests fail if we do not also exclude |
| 1897 // layer->layoutObject().style()->hasBorderDecoration() (missing background | 1897 // layer->layoutObject().style()->hasBorderDecoration() (missing background |
| 1898 // behind dashed borders). Resolve this case, or not, and update this check | 1898 // behind dashed borders). Resolve this case, or not, and update this check |
| 1899 // with the results. | 1899 // with the results. |
| 1900 if (layer->GetLayoutObject().Style()->HasBorderRadius()) { | 1900 |
| 1901 non_composited_main_thread_scrolling_reasons_ |= | |
| 1902 MainThreadScrollingReason::kHasBorderRadius; | |
| 1903 needs_composited_scrolling = false; | |
| 1904 } | |
| 1905 if (layer->GetLayoutObject().HasClip() || | 1901 if (layer->GetLayoutObject().HasClip() || |
| 1906 layer->HasDescendantWithClipPath() || layer->HasAncestorWithClipPath()) { | 1902 layer->HasDescendantWithClipPath() || layer->HasAncestorWithClipPath()) { |
| 1907 non_composited_main_thread_scrolling_reasons_ |= | 1903 non_composited_main_thread_scrolling_reasons_ |= |
| 1908 MainThreadScrollingReason::kHasClipRelatedProperty; | 1904 MainThreadScrollingReason::kHasClipRelatedProperty; |
| 1909 needs_composited_scrolling = false; | 1905 needs_composited_scrolling = false; |
| 1910 } | 1906 } |
| 1911 | 1907 |
| 1912 DCHECK(!(non_composited_main_thread_scrolling_reasons_ & | 1908 DCHECK(!(non_composited_main_thread_scrolling_reasons_ & |
| 1913 ~MainThreadScrollingReason::kNonCompositedReasons)); | 1909 ~MainThreadScrollingReason::kNonCompositedReasons)); |
| 1914 return needs_composited_scrolling; | 1910 return needs_composited_scrolling; |
| (...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2186 | 2182 |
| 2187 void PaintLayerScrollableArea::DelayScrollOffsetClampScope:: | 2183 void PaintLayerScrollableArea::DelayScrollOffsetClampScope:: |
| 2188 ClampScrollableAreas() { | 2184 ClampScrollableAreas() { |
| 2189 for (auto& scrollable_area : *needs_clamp_) | 2185 for (auto& scrollable_area : *needs_clamp_) |
| 2190 scrollable_area->ClampScrollOffsetAfterOverflowChange(); | 2186 scrollable_area->ClampScrollOffsetAfterOverflowChange(); |
| 2191 delete needs_clamp_; | 2187 delete needs_clamp_; |
| 2192 needs_clamp_ = nullptr; | 2188 needs_clamp_ = nullptr; |
| 2193 } | 2189 } |
| 2194 | 2190 |
| 2195 } // namespace blink | 2191 } // namespace blink |
| OLD | NEW |