| Index: third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
|
| diff --git a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
|
| index 6454137452f1d4280f9507e3ef0b6eb625ea4745..9a5c80ba78dbabdc2bf721bf4208001c30c0bcae 100644
|
| --- a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
|
| +++ b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
|
| @@ -1054,33 +1054,16 @@ MainThreadScrollingReasons ScrollingCoordinator::mainThreadScrollingReasons() co
|
| return reasons;
|
| }
|
|
|
| -String ScrollingCoordinator::mainThreadScrollingReasonsAsText(MainThreadScrollingReasons reasons)
|
| -{
|
| - StringBuilder stringBuilder;
|
| -
|
| - if (reasons & MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects)
|
| - stringBuilder.append("Has background-attachment:fixed, ");
|
| - if (reasons & MainThreadScrollingReason::kHasNonLayerViewportConstrainedObjects)
|
| - stringBuilder.append("Has non-layer viewport-constrained objects, ");
|
| - if (reasons & MainThreadScrollingReason::kHasStickyPositionObjects)
|
| - stringBuilder.append("Has sticky position objects, ");
|
| - if (reasons & MainThreadScrollingReason::kThreadedScrollingDisabled)
|
| - stringBuilder.append("Threaded scrolling is disabled, ");
|
| - if (reasons & MainThreadScrollingReason::kAnimatingScrollOnMainThread)
|
| - stringBuilder.append("Animating scroll on main thread, ");
|
| -
|
| - if (stringBuilder.length())
|
| - stringBuilder.resize(stringBuilder.length() - 2);
|
| - return stringBuilder.toString();
|
| -}
|
| -
|
| String ScrollingCoordinator::mainThreadScrollingReasonsAsText() const
|
| {
|
| ASSERT(m_page->deprecatedLocalMainFrame()->document()->lifecycle().state() >= DocumentLifecycle::CompositingClean);
|
| - if (WebLayer* scrollLayer = toWebLayer(m_page->deprecatedLocalMainFrame()->view()->layerForScrolling()))
|
| - return mainThreadScrollingReasonsAsText(scrollLayer->mainThreadScrollingReasons());
|
| + if (WebLayer* scrollLayer = toWebLayer(m_page->deprecatedLocalMainFrame()->view()->layerForScrolling())) {
|
| + String result(MainThreadScrollingReason::mainThreadScrollingReasonsAsText(scrollLayer->mainThreadScrollingReasons()).c_str());
|
| + return result;
|
| + }
|
|
|
| - return mainThreadScrollingReasonsAsText(m_lastMainThreadScrollingReasons);
|
| + String result(MainThreadScrollingReason::mainThreadScrollingReasonsAsText(m_lastMainThreadScrollingReasons).c_str());
|
| + return result;
|
| }
|
|
|
| bool ScrollingCoordinator::frameViewIsDirty() const
|
|
|