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

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

Issue 1174283002: Fix unit test style in Source/web/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: remove static Created 5 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/web/tests/ScrollAnimatorNoneTest.cpp ('k') | Source/web/tests/SpinLockTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y 16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y
17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N 19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N
20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */ 23 */
24 24
25 #include "config.h" 25 #include "config.h"
26
27 #include "core/page/scrolling/ScrollingCoordinator.h" 26 #include "core/page/scrolling/ScrollingCoordinator.h"
28 27
29 #include "core/layout/LayoutPart.h" 28 #include "core/layout/LayoutPart.h"
30 #include "core/layout/LayoutView.h" 29 #include "core/layout/LayoutView.h"
31 #include "core/layout/compositing/CompositedDeprecatedPaintLayerMapping.h" 30 #include "core/layout/compositing/CompositedDeprecatedPaintLayerMapping.h"
32 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h" 31 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h"
33 #include "core/page/Page.h" 32 #include "core/page/Page.h"
34 #include "platform/graphics/GraphicsLayer.h" 33 #include "platform/graphics/GraphicsLayer.h"
35 #include "platform/testing/URLTestHelpers.h" 34 #include "platform/testing/URLTestHelpers.h"
36 #include "public/platform/Platform.h" 35 #include "public/platform/Platform.h"
37 #include "public/platform/WebLayer.h" 36 #include "public/platform/WebLayer.h"
38 #include "public/platform/WebLayerPositionConstraint.h" 37 #include "public/platform/WebLayerPositionConstraint.h"
39 #include "public/platform/WebLayerTreeView.h" 38 #include "public/platform/WebLayerTreeView.h"
40 #include "public/platform/WebUnitTestSupport.h" 39 #include "public/platform/WebUnitTestSupport.h"
41 #include "public/web/WebSettings.h" 40 #include "public/web/WebSettings.h"
42 #include "public/web/WebViewClient.h" 41 #include "public/web/WebViewClient.h"
43 #include "web/WebLocalFrameImpl.h" 42 #include "web/WebLocalFrameImpl.h"
44 #include "web/WebViewImpl.h" 43 #include "web/WebViewImpl.h"
45 #include "web/tests/FrameTestHelpers.h" 44 #include "web/tests/FrameTestHelpers.h"
46 #include <gtest/gtest.h> 45 #include <gtest/gtest.h>
47 46
48 using namespace blink; 47 namespace blink {
49
50 namespace {
51 48
52 class ScrollingCoordinatorTest : public testing::Test { 49 class ScrollingCoordinatorTest : public testing::Test {
53 public: 50 public:
54 ScrollingCoordinatorTest() 51 ScrollingCoordinatorTest()
55 : m_baseURL("http://www.test.com/") 52 : m_baseURL("http://www.test.com/")
56 { 53 {
57 m_helper.initialize(true, 0, &m_mockWebViewClient, &configureSettings); 54 m_helper.initialize(true, 0, &m_mockWebViewClient, &configureSettings);
58 webViewImpl()->resize(IntSize(320, 240)); 55 webViewImpl()->resize(IntSize(320, 240));
59 56
60 // OSX attaches main frame scrollbars to the PinchViewport so the PinchV iewport layers need 57 // OSX attaches main frame scrollbars to the PinchViewport so the PinchV iewport layers need
61 // to be initialized. 58 // to be initialized.
62 webViewImpl()->layout(); 59 webViewImpl()->layout();
63 webViewImpl()->setRootGraphicsLayer( 60 webViewImpl()->setRootGraphicsLayer(
64 webViewImpl()->mainFrameImpl()->frame()->view()->layoutView()->compo sitor()->rootGraphicsLayer()); 61 webViewImpl()->mainFrameImpl()->frame()->view()->layoutView()->compo sitor()->rootGraphicsLayer());
65 } 62 }
66 63
67 virtual ~ScrollingCoordinatorTest() 64 ~ScrollingCoordinatorTest() override
68 { 65 {
69 Platform::current()->unitTestSupport()->unregisterAllMockedURLs(); 66 Platform::current()->unitTestSupport()->unregisterAllMockedURLs();
70 } 67 }
71 68
72 void navigateTo(const std::string& url) 69 void navigateTo(const std::string& url)
73 { 70 {
74 FrameTestHelpers::loadFrame(webViewImpl()->mainFrame(), url); 71 FrameTestHelpers::loadFrame(webViewImpl()->mainFrame(), url);
75 } 72 }
76 73
77 void forceFullCompositingUpdate() 74 void forceFullCompositingUpdate()
(...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
601 EXPECT_TRUE(static_cast<LayoutBoxModelObject*>(fixedPos->layoutObject())->la yer()->hasCompositedDeprecatedPaintLayerMapping()); 598 EXPECT_TRUE(static_cast<LayoutBoxModelObject*>(fixedPos->layoutObject())->la yer()->hasCompositedDeprecatedPaintLayerMapping());
602 EXPECT_FALSE(scrollLayer->shouldScrollOnMainThread()); 599 EXPECT_FALSE(scrollLayer->shouldScrollOnMainThread());
603 600
604 fixedPos->setInlineStyleProperty(CSSPropertyTransform, CSSValueNone); 601 fixedPos->setInlineStyleProperty(CSSPropertyTransform, CSSValueNone);
605 forceFullCompositingUpdate(); 602 forceFullCompositingUpdate();
606 603
607 EXPECT_FALSE(static_cast<LayoutBoxModelObject*>(fixedPos->layoutObject())->l ayer()->hasCompositedDeprecatedPaintLayerMapping()); 604 EXPECT_FALSE(static_cast<LayoutBoxModelObject*>(fixedPos->layoutObject())->l ayer()->hasCompositedDeprecatedPaintLayerMapping());
608 EXPECT_TRUE(scrollLayer->shouldScrollOnMainThread()); 605 EXPECT_TRUE(scrollLayer->shouldScrollOnMainThread());
609 } 606 }
610 607
611 } // namespace 608 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/tests/ScrollAnimatorNoneTest.cpp ('k') | Source/web/tests/SpinLockTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698