Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(315)

Unified Diff: third_party/WebKit/Source/web/tests/VisualViewportTest.cpp

Issue 2830003002: Remove redundant WebLocalFrame* parameter from DidChangeScrollOffset (Closed)
Patch Set: Rebase Created 3 years, 8 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:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/web/tests/VisualViewportTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp b/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp
index 0f100a02acc31ef4a41974cb2101b34ed9d68a31..8bc5872c48ca52da702ac283f6f1181b2315dec0 100644
--- a/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp
+++ b/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp
@@ -1113,7 +1113,7 @@ TEST_P(VisualViewportTest, TestWebViewResizeCausesViewportConstrainedLayout) {
class MockWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
public:
MOCK_METHOD1(ShowContextMenu, void(const WebContextMenuData&));
- MOCK_METHOD1(DidChangeScrollOffset, void(WebLocalFrame*));
+ MOCK_METHOD0(DidChangeScrollOffset, void());
};
MATCHER_P2(ContextMenuAtLocation,
@@ -1167,7 +1167,7 @@ TEST_P(VisualViewportTest, TestContextMenuShownInCorrectLocation) {
// should still appear at the location of the event, relative to the WebView.
VisualViewport& visualViewport = frame()->GetPage()->GetVisualViewport();
webViewImpl()->SetPageScaleFactor(2);
- EXPECT_CALL(mockWebFrameClient, DidChangeScrollOffset(_));
+ EXPECT_CALL(mockWebFrameClient, DidChangeScrollOffset());
visualViewport.SetLocation(FloatPoint(60, 80));
EXPECT_CALL(mockWebFrameClient, ShowContextMenu(ContextMenuAtLocation(
mouseDownEvent.PositionInWidget().x,
@@ -1196,17 +1196,17 @@ TEST_P(VisualViewportTest, TestClientNotifiedOfScrollEvents) {
webViewImpl()->SetPageScaleFactor(2);
VisualViewport& visualViewport = frame()->GetPage()->GetVisualViewport();
- EXPECT_CALL(mockWebFrameClient, DidChangeScrollOffset(_));
+ EXPECT_CALL(mockWebFrameClient, DidChangeScrollOffset());
visualViewport.SetLocation(FloatPoint(60, 80));
Mock::VerifyAndClearExpectations(&mockWebFrameClient);
// Scroll vertically.
- EXPECT_CALL(mockWebFrameClient, DidChangeScrollOffset(_));
+ EXPECT_CALL(mockWebFrameClient, DidChangeScrollOffset());
visualViewport.SetLocation(FloatPoint(60, 90));
Mock::VerifyAndClearExpectations(&mockWebFrameClient);
// Scroll horizontally.
- EXPECT_CALL(mockWebFrameClient, DidChangeScrollOffset(_));
+ EXPECT_CALL(mockWebFrameClient, DidChangeScrollOffset());
visualViewport.SetLocation(FloatPoint(70, 90));
// Reset the old client so destruction can occur naturally.
« no previous file with comments | « third_party/WebKit/Source/web/LocalFrameClientImpl.cpp ('k') | third_party/WebKit/Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698