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

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

Issue 1924043002: Switch the inheritance of WebViewClient from WebWidgetClient to protected. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, fix new test Created 4 years, 7 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) 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 #include "web/WebViewImpl.h" 45 #include "web/WebViewImpl.h"
46 #include "web/tests/FrameTestHelpers.h" 46 #include "web/tests/FrameTestHelpers.h"
47 47
48 namespace blink { 48 namespace blink {
49 49
50 class ScrollingCoordinatorTest : public testing::Test { 50 class ScrollingCoordinatorTest : public testing::Test {
51 public: 51 public:
52 ScrollingCoordinatorTest() 52 ScrollingCoordinatorTest()
53 : m_baseURL("http://www.test.com/") 53 : m_baseURL("http://www.test.com/")
54 { 54 {
55 m_helper.initialize(true, 0, &m_mockWebViewClient, &configureSettings); 55 m_helper.initialize(true, nullptr, &m_mockWebViewClient, nullptr, &confi gureSettings);
56 webViewImpl()->resize(IntSize(320, 240)); 56 webViewImpl()->resize(IntSize(320, 240));
57 57
58 // OSX attaches main frame scrollbars to the VisualViewport so the Visua lViewport layers need 58 // OSX attaches main frame scrollbars to the VisualViewport so the Visua lViewport layers need
59 // to be initialized. 59 // to be initialized.
60 webViewImpl()->updateAllLifecyclePhases(); 60 webViewImpl()->updateAllLifecyclePhases();
61 webViewImpl()->setRootGraphicsLayer( 61 webViewImpl()->setRootGraphicsLayer(
62 webViewImpl()->mainFrameImpl()->frame()->view()->layoutView()->compo sitor()->rootGraphicsLayer()); 62 webViewImpl()->mainFrameImpl()->frame()->view()->layoutView()->compo sitor()->rootGraphicsLayer());
63 } 63 }
64 64
65 ~ScrollingCoordinatorTest() override 65 ~ScrollingCoordinatorTest() override
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 EXPECT_FALSE(scrollLayer->shouldScrollOnMainThread()); 624 EXPECT_FALSE(scrollLayer->shouldScrollOnMainThread());
625 625
626 fixedPos->setInlineStyleProperty(CSSPropertyTransform, CSSValueNone); 626 fixedPos->setInlineStyleProperty(CSSPropertyTransform, CSSValueNone);
627 forceFullCompositingUpdate(); 627 forceFullCompositingUpdate();
628 628
629 EXPECT_FALSE(static_cast<LayoutBoxModelObject*>(fixedPos->layoutObject())->l ayer()->hasCompositedLayerMapping()); 629 EXPECT_FALSE(static_cast<LayoutBoxModelObject*>(fixedPos->layoutObject())->l ayer()->hasCompositedLayerMapping());
630 EXPECT_TRUE(scrollLayer->shouldScrollOnMainThread()); 630 EXPECT_TRUE(scrollLayer->shouldScrollOnMainThread());
631 } 631 }
632 632
633 } // namespace blink 633 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698