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

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

Issue 2741223002: Use correct ScrollbarTheme to paintScrollCorner (Closed)
Patch Set: remove NOTREACHED handler Created 3 years, 9 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 11172 matching lines...) Expand 10 before | Expand all | Expand 10 after
11183 WebMouseEvent mouseReleaseEvent( 11183 WebMouseEvent mouseReleaseEvent(
11184 WebInputEvent::MouseUp, WebFloatPoint(1, 1), WebFloatPoint(1, 1), 11184 WebInputEvent::MouseUp, WebFloatPoint(1, 1), WebFloatPoint(1, 1),
11185 WebPointerProperties::Button::Left, 0, 11185 WebPointerProperties::Button::Left, 0,
11186 WebInputEvent::Modifiers::LeftButtonDown, TimeTicks::Now().InSeconds()); 11186 WebInputEvent::Modifiers::LeftButtonDown, TimeTicks::Now().InSeconds());
11187 mouseReleaseEvent.setFrameScale(1); 11187 mouseReleaseEvent.setFrameScale(1);
11188 document->frame()->eventHandler().handleMouseReleaseEvent(mouseReleaseEvent); 11188 document->frame()->eventHandler().handleMouseReleaseEvent(mouseReleaseEvent);
11189 EXPECT_EQ(scrollbar->pressedPart(), ScrollbarPart::NoPart); 11189 EXPECT_EQ(scrollbar->pressedPart(), ScrollbarPart::NoPart);
11190 EXPECT_EQ(scrollbar->hoveredPart(), ScrollbarPart::NoPart); 11190 EXPECT_EQ(scrollbar->hoveredPart(), ScrollbarPart::NoPart);
11191 } 11191 }
11192 11192
11193 TEST_F(WebFrameTest,
11194 CustomScrollbarInOverlayScrollbarThemeWillNotCauseDCHECKFails) {
11195 registerMockedHttpURLLoad(
11196 "custom-scrollbar-dcheck-failed-when-paint-scroll-corner.html");
11197 FrameTestHelpers::WebViewHelper webViewHelper;
11198 WebViewImpl* webView = webViewHelper.initializeAndLoad(
11199 m_baseURL +
11200 "custom-scrollbar-dcheck-failed-when-paint-scroll-corner.html");
11201
11202 webViewHelper.resize(WebSize(200, 200));
11203
11204 // No DCHECK Fails. Issue 676678.
11205 webView->updateAllLifecyclePhases();
11206 }
11207
11193 static void disableCompositing(WebSettings* settings) { 11208 static void disableCompositing(WebSettings* settings) {
11194 settings->setAcceleratedCompositingEnabled(false); 11209 settings->setAcceleratedCompositingEnabled(false);
11195 settings->setPreferCompositingToLCDTextEnabled(false); 11210 settings->setPreferCompositingToLCDTextEnabled(false);
11196 } 11211 }
11197 11212
11198 // Make sure overlay scrollbars on non-composited scrollers fade out and set 11213 // Make sure overlay scrollbars on non-composited scrollers fade out and set
11199 // the hidden bit as needed. 11214 // the hidden bit as needed.
11200 TEST_F(WebFrameTest, TestNonCompositedOverlayScrollbarsFade) { 11215 TEST_F(WebFrameTest, TestNonCompositedOverlayScrollbarsFade) {
11201 FrameTestHelpers::WebViewHelper webViewHelper; 11216 FrameTestHelpers::WebViewHelper webViewHelper;
11202 WebViewImpl* webViewImpl = webViewHelper.initialize( 11217 WebViewImpl* webViewImpl = webViewHelper.initialize(
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
11442 "document.querySelector('input').focus();")); 11457 "document.querySelector('input').focus();"));
11443 11458
11444 // Verify that the right WebWidgetClient has been notified. 11459 // Verify that the right WebWidgetClient has been notified.
11445 EXPECT_TRUE(webWidgetClient.didShowVirtualKeyboard()); 11460 EXPECT_TRUE(webWidgetClient.didShowVirtualKeyboard());
11446 11461
11447 remoteFrame->close(); 11462 remoteFrame->close();
11448 webViewHelper.reset(); 11463 webViewHelper.reset();
11449 } 11464 }
11450 11465
11451 } // namespace blink 11466 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698