| 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 1903 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1914 MainThreadScrollingReason::kIsNotStackingContextAndLCDText; | 1914 MainThreadScrollingReason::kIsNotStackingContextAndLCDText; |
| 1915 } | 1915 } |
| 1916 | 1916 |
| 1917 needs_composited_scrolling = false; | 1917 needs_composited_scrolling = false; |
| 1918 } | 1918 } |
| 1919 | 1919 |
| 1920 // TODO(schenney) Tests fail if we do not also exclude | 1920 // TODO(schenney) Tests fail if we do not also exclude |
| 1921 // layer->layoutObject().style()->hasBorderDecoration() (missing background | 1921 // layer->layoutObject().style()->hasBorderDecoration() (missing background |
| 1922 // behind dashed borders). Resolve this case, or not, and update this check | 1922 // behind dashed borders). Resolve this case, or not, and update this check |
| 1923 // with the results. | 1923 // with the results. |
| 1924 if (layer->GetLayoutObject().Style()->HasBorderRadius()) { | |
| 1925 non_composited_main_thread_scrolling_reasons_ |= | |
| 1926 MainThreadScrollingReason::kHasBorderRadius; | |
| 1927 needs_composited_scrolling = false; | |
| 1928 } | |
| 1929 if (layer->GetLayoutObject().HasClip() || | 1924 if (layer->GetLayoutObject().HasClip() || |
| 1930 layer->HasDescendantWithClipPath() || layer->HasAncestorWithClipPath()) { | 1925 layer->HasDescendantWithClipPath() || layer->HasAncestorWithClipPath()) { |
| 1931 non_composited_main_thread_scrolling_reasons_ |= | 1926 non_composited_main_thread_scrolling_reasons_ |= |
| 1932 MainThreadScrollingReason::kHasClipRelatedProperty; | 1927 MainThreadScrollingReason::kHasClipRelatedProperty; |
| 1933 needs_composited_scrolling = false; | 1928 needs_composited_scrolling = false; |
| 1934 } | 1929 } |
| 1935 | 1930 |
| 1936 DCHECK(!(non_composited_main_thread_scrolling_reasons_ & | 1931 DCHECK(!(non_composited_main_thread_scrolling_reasons_ & |
| 1937 ~MainThreadScrollingReason::kNonCompositedReasons)); | 1932 ~MainThreadScrollingReason::kNonCompositedReasons)); |
| 1938 return needs_composited_scrolling; | 1933 return needs_composited_scrolling; |
| (...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2210 | 2205 |
| 2211 void PaintLayerScrollableArea::DelayScrollOffsetClampScope:: | 2206 void PaintLayerScrollableArea::DelayScrollOffsetClampScope:: |
| 2212 ClampScrollableAreas() { | 2207 ClampScrollableAreas() { |
| 2213 for (auto& scrollable_area : *needs_clamp_) | 2208 for (auto& scrollable_area : *needs_clamp_) |
| 2214 scrollable_area->ClampScrollOffsetAfterOverflowChange(); | 2209 scrollable_area->ClampScrollOffsetAfterOverflowChange(); |
| 2215 delete needs_clamp_; | 2210 delete needs_clamp_; |
| 2216 needs_clamp_ = nullptr; | 2211 needs_clamp_ = nullptr; |
| 2217 } | 2212 } |
| 2218 | 2213 |
| 2219 } // namespace blink | 2214 } // namespace blink |
| OLD | NEW |