third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp - Issue 2945093002: Use WebViewHelper::LocalMainFrame where possible.

Side by Side Diff: third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp

Issue 2945093002: Use WebViewHelper::LocalMainFrame where possible. (Closed)

Patch Set: Rebasing... Created 3 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2012 Google Inc. All rights reserved.	2 * Copyright (C) 2012 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 * 1. Redistributions of source code must retain the above copyright	7 * 1. Redistributions of source code must retain the above copyright

8 * notice, this list of conditions and the following disclaimer.	8 * notice, this list of conditions and the following disclaimer.

9 * 2. Redistributions in binary form must reproduce the above copyright	9 * 2. Redistributions in binary form must reproduce the above copyright

10 * notice, this list of conditions and the following disclaimer in the	10 * notice, this list of conditions and the following disclaimer in the

(...skipping 93 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
104 WebString::FromUTF8(file_name));	104 WebString::FromUTF8(file_name));

105 }	105 }

106	106

107 WebLayer* GetRootScrollLayer() {	107 WebLayer* GetRootScrollLayer() {

108 GraphicsLayer* layer =	108 GraphicsLayer* layer =

109 GetFrame()->View()->LayoutViewportScrollableArea()->LayerForScrolling();	109 GetFrame()->View()->LayoutViewportScrollableArea()->LayerForScrolling();

110 return layer ? layer->PlatformLayer() : nullptr;	110 return layer ? layer->PlatformLayer() : nullptr;

111 }	111 }

112	112

113 WebViewBase* GetWebView() const { return helper_.WebView(); }	113 WebViewBase* GetWebView() const { return helper_.WebView(); }

114 LocalFrame* GetFrame() const {	114 LocalFrame* GetFrame() const { return helper_.LocalMainFrame()->GetFrame(); }

115 return helper_.WebView()->MainFrameImpl()->GetFrame();

116 }

117	115

118 WebLayerTreeView* GetWebLayerTreeView() const {	116 WebLayerTreeView* GetWebLayerTreeView() const {

119 return GetWebView()->LayerTreeView();	117 return GetWebView()->LayerTreeView();

120 }	118 }

121	119

122 protected:	120 protected:

123 std::string base_url_;	121 std::string base_url_;

124	122

125 private:	123 private:

126 static void ConfigureSettings(WebSettings* settings) {	124 static void ConfigureSettings(WebSettings* settings) {

(...skipping 1130 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1257 ForceFullCompositingUpdate();	1255 ForceFullCompositingUpdate();

1258 PaintLayerScrollableArea* scrollable_area2 =	1256 PaintLayerScrollableArea* scrollable_area2 =

1259 ToLayoutBoxModelObject(container2->GetLayoutObject())	1257 ToLayoutBoxModelObject(container2->GetLayoutObject())

1260 ->GetScrollableArea();	1258 ->GetScrollableArea();

1261 ASSERT_TRUE(scrollable_area2);	1259 ASSERT_TRUE(scrollable_area2);

1262 EXPECT_TRUE(scrollable_area2->GetNonCompositedMainThreadScrollingReasons() &	1260 EXPECT_TRUE(scrollable_area2->GetNonCompositedMainThreadScrollingReasons() &

1263 MainThreadScrollingReason::kHasBorderRadius);	1261 MainThreadScrollingReason::kHasBorderRadius);

1264 }	1262 }

1265	1263

1266 } // namespace blink	1264 } // namespace blink

OLD	NEW