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

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

Issue 1840113005: Move viewport actions into an ApplyScroll callback. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 8336 matching lines...) Expand 10 before | Expand all | Expand 10 after
8347 webViewHelper.resize(WebSize(200, 200)); 8347 webViewHelper.resize(WebSize(200, 200));
8348 8348
8349 // On disabling ReportWheelOverscroll, overscroll is not reported on MouseWh eel. 8349 // On disabling ReportWheelOverscroll, overscroll is not reported on MouseWh eel.
8350 webViewHelper.webView()->settings()->setReportWheelOverscroll(false); 8350 webViewHelper.webView()->settings()->setReportWheelOverscroll(false);
8351 EXPECT_CALL(client, didOverscroll(_, _, _, _)).Times(0); 8351 EXPECT_CALL(client, didOverscroll(_, _, _, _)).Times(0);
8352 ScrollByWheel(&webViewHelper, 10, 10, 1000, 1000); 8352 ScrollByWheel(&webViewHelper, 10, 10, 1000, 1000);
8353 Mock::VerifyAndClearExpectations(&client); 8353 Mock::VerifyAndClearExpectations(&client);
8354 8354
8355 // On enabling ReportWheelOverscroll, overscroll is reported on MouseWheel. 8355 // On enabling ReportWheelOverscroll, overscroll is reported on MouseWheel.
8356 webViewHelper.webView()->settings()->setReportWheelOverscroll(true); 8356 webViewHelper.webView()->settings()->setReportWheelOverscroll(true);
8357 EXPECT_CALL(client, didOverscroll(WebFloatSize(-1000, -1000), WebFloatSize(- 1000, -1000), WebFloatPoint(), WebFloatSize())); 8357 EXPECT_CALL(client, didOverscroll(WebFloatSize(-1000, -1000), WebFloatSize(- 1000, -1000), WebFloatPoint(-1, -1), WebFloatSize()));
8358 ScrollByWheel(&webViewHelper, 10, 10, 1000, 1000); 8358 ScrollByWheel(&webViewHelper, 10, 10, 1000, 1000);
8359 Mock::VerifyAndClearExpectations(&client); 8359 Mock::VerifyAndClearExpectations(&client);
8360 } 8360 }
8361 8361
8362 TEST_F(WebFrameTest, OrientationFrameDetach) 8362 TEST_F(WebFrameTest, OrientationFrameDetach)
8363 { 8363 {
8364 RuntimeEnabledFeatures::setOrientationEventEnabled(true); 8364 RuntimeEnabledFeatures::setOrientationEventEnabled(true);
8365 registerMockedHttpURLLoad("orientation-frame-detach.html"); 8365 registerMockedHttpURLLoad("orientation-frame-detach.html");
8366 FrameTestHelpers::WebViewHelper webViewHelper; 8366 FrameTestHelpers::WebViewHelper webViewHelper;
8367 WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "orie ntation-frame-detach.html", true); 8367 WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "orie ntation-frame-detach.html", true);
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
8499 } 8499 }
8500 8500
8501 TEST_F(WebFrameVisibilityChangeTest, RemoteFrameParentVisibilityChange) 8501 TEST_F(WebFrameVisibilityChangeTest, RemoteFrameParentVisibilityChange)
8502 { 8502 {
8503 swapLocalFrameToRemoteFrame(); 8503 swapLocalFrameToRemoteFrame();
8504 executeScriptOnMainFrame(WebScriptSource("document.querySelector('iframe').p arentElement.style.display = 'none';")); 8504 executeScriptOnMainFrame(WebScriptSource("document.querySelector('iframe').p arentElement.style.display = 'none';"));
8505 EXPECT_FALSE(remoteFrameClient()->isVisible()); 8505 EXPECT_FALSE(remoteFrameClient()->isVisible());
8506 } 8506 }
8507 8507
8508 } // namespace blink 8508 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698