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

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

Issue 1230533002: Fix virtual/override/final usage in Source/web/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 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/PinchViewportTest.cpp ('k') | Source/web/tests/ScrollAnimatorNoneTest.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 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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 return m_webPrerenders.empty(); 87 return m_webPrerenders.empty();
88 } 88 }
89 89
90 void clear() 90 void clear()
91 { 91 {
92 m_webPrerenders.clear(); 92 m_webPrerenders.clear();
93 } 93 }
94 94
95 private: 95 private:
96 // From WebPrerendererClient: 96 // From WebPrerendererClient:
97 virtual void willAddPrerender(WebPrerender* prerender) override 97 void willAddPrerender(WebPrerender* prerender) override
98 { 98 {
99 prerender->setExtraData(m_extraData.leakPtr()); 99 prerender->setExtraData(m_extraData.leakPtr());
100 100
101 ASSERT(!prerender->isNull()); 101 ASSERT(!prerender->isNull());
102 m_webPrerenders.push_back(*prerender); 102 m_webPrerenders.push_back(*prerender);
103 } 103 }
104 104
105 OwnPtr<WebPrerender::ExtraData> m_extraData; 105 OwnPtr<WebPrerender::ExtraData> m_extraData;
106 std::list<WebPrerender> m_webPrerenders; 106 std::list<WebPrerender> m_webPrerenders;
107 }; 107 };
108 108
109 class TestPrerenderingSupport : public WebPrerenderingSupport { 109 class TestPrerenderingSupport : public WebPrerenderingSupport {
110 public: 110 public:
111 TestPrerenderingSupport() 111 TestPrerenderingSupport()
112 { 112 {
113 initialize(this); 113 initialize(this);
114 } 114 }
115 115
116 virtual ~TestPrerenderingSupport() 116 ~TestPrerenderingSupport() override
117 { 117 {
118 shutdown(); 118 shutdown();
119 } 119 }
120 120
121 void clear() 121 void clear()
122 { 122 {
123 m_addedPrerenders.clear(); 123 m_addedPrerenders.clear();
124 m_canceledPrerenders.clear(); 124 m_canceledPrerenders.clear();
125 m_abandonedPrerenders.clear(); 125 m_abandonedPrerenders.clear();
126 } 126 }
(...skipping 21 matching lines...) Expand all
148 private: 148 private:
149 class WebPrerenderEqual : public std::binary_function<WebPrerender, WebPrere nder, bool> { 149 class WebPrerenderEqual : public std::binary_function<WebPrerender, WebPrere nder, bool> {
150 public: 150 public:
151 bool operator()(const WebPrerender& first, const WebPrerender& second) c onst 151 bool operator()(const WebPrerender& first, const WebPrerender& second) c onst
152 { 152 {
153 return first.toPrerender() == second.toPrerender(); 153 return first.toPrerender() == second.toPrerender();
154 } 154 }
155 }; 155 };
156 156
157 // From WebPrerenderingSupport: 157 // From WebPrerenderingSupport:
158 virtual void add(const WebPrerender& prerender) override 158 void add(const WebPrerender& prerender) override
159 { 159 {
160 m_addedPrerenders.push_back(prerender); 160 m_addedPrerenders.push_back(prerender);
161 } 161 }
162 162
163 virtual void cancel(const WebPrerender& prerender) override 163 void cancel(const WebPrerender& prerender) override
164 { 164 {
165 m_canceledPrerenders.push_back(prerender); 165 m_canceledPrerenders.push_back(prerender);
166 } 166 }
167 167
168 virtual void abandon(const WebPrerender& prerender) override 168 void abandon(const WebPrerender& prerender) override
169 { 169 {
170 m_abandonedPrerenders.push_back(prerender); 170 m_abandonedPrerenders.push_back(prerender);
171 } 171 }
172 172
173 std::vector<WebPrerender> m_addedPrerenders; 173 std::vector<WebPrerender> m_addedPrerenders;
174 std::vector<WebPrerender> m_canceledPrerenders; 174 std::vector<WebPrerender> m_canceledPrerenders;
175 std::vector<WebPrerender> m_abandonedPrerenders; 175 std::vector<WebPrerender> m_abandonedPrerenders;
176 }; 176 };
177 177
178 class PrerenderingTest : public testing::Test { 178 class PrerenderingTest : public testing::Test {
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 321
322 TEST_F(PrerenderingTest, ExtraData) 322 TEST_F(PrerenderingTest, ExtraData)
323 { 323 {
324 class TestExtraData : public WebPrerender::ExtraData { 324 class TestExtraData : public WebPrerender::ExtraData {
325 public: 325 public:
326 explicit TestExtraData(bool* alive) : m_alive(alive) 326 explicit TestExtraData(bool* alive) : m_alive(alive)
327 { 327 {
328 *alive = true; 328 *alive = true;
329 } 329 }
330 330
331 virtual ~TestExtraData() { *m_alive = false; } 331 ~TestExtraData() override { *m_alive = false; }
332 332
333 private: 333 private:
334 bool* m_alive; 334 bool* m_alive;
335 }; 335 };
336 336
337 bool alive = false; 337 bool alive = false;
338 { 338 {
339 prerendererClient()->setExtraDataForNextPrerender(new TestExtraData(&ali ve)); 339 prerendererClient()->setExtraDataForNextPrerender(new TestExtraData(&ali ve));
340 initialize("http://www.foo.com/", "prerender/single_prerender.html"); 340 initialize("http://www.foo.com/", "prerender/single_prerender.html");
341 EXPECT_TRUE(alive); 341 EXPECT_TRUE(alive);
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 WebPrerender relNextOnly = prerendererClient()->releaseWebPrerender(); 498 WebPrerender relNextOnly = prerendererClient()->releaseWebPrerender();
499 EXPECT_EQ(toWebURL("http://rel-next-only.com/"), relNextOnly.url()); 499 EXPECT_EQ(toWebURL("http://rel-next-only.com/"), relNextOnly.url());
500 EXPECT_EQ(PrerenderRelTypeNext, relNextOnly.relTypes()); 500 EXPECT_EQ(PrerenderRelTypeNext, relNextOnly.relTypes());
501 501
502 WebPrerender relNextAndPrerender = prerendererClient()->releaseWebPrerender( ); 502 WebPrerender relNextAndPrerender = prerendererClient()->releaseWebPrerender( );
503 EXPECT_EQ(toWebURL("http://rel-next-and-prerender.com/"), relNextAndPrerende r.url()); 503 EXPECT_EQ(toWebURL("http://rel-next-and-prerender.com/"), relNextAndPrerende r.url());
504 EXPECT_EQ(static_cast<unsigned>(PrerenderRelTypeNext | PrerenderRelTypePrere nder), relNextAndPrerender.relTypes()); 504 EXPECT_EQ(static_cast<unsigned>(PrerenderRelTypeNext | PrerenderRelTypePrere nder), relNextAndPrerender.relTypes());
505 } 505 }
506 506
507 } // namespace 507 } // namespace
OLDNEW
« no previous file with comments | « Source/web/tests/PinchViewportTest.cpp ('k') | Source/web/tests/ScrollAnimatorNoneTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698