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

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

Issue 1900583002: Abandon prerenders upon render thread shutdown. (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) 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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 void cancel(const WebPrerender& prerender) override 153 void cancel(const WebPrerender& prerender) override
154 { 154 {
155 m_canceledPrerenders.append(prerender); 155 m_canceledPrerenders.append(prerender);
156 } 156 }
157 157
158 void abandon(const WebPrerender& prerender) override 158 void abandon(const WebPrerender& prerender) override
159 { 159 {
160 m_abandonedPrerenders.append(prerender); 160 m_abandonedPrerenders.append(prerender);
161 } 161 }
162 162
163 void detachRenderer() override
164 {
165 clear();
166 }
167
163 Vector<WebPrerender> m_addedPrerenders; 168 Vector<WebPrerender> m_addedPrerenders;
164 Vector<WebPrerender> m_canceledPrerenders; 169 Vector<WebPrerender> m_canceledPrerenders;
165 Vector<WebPrerender> m_abandonedPrerenders; 170 Vector<WebPrerender> m_abandonedPrerenders;
166 }; 171 };
167 172
168 class PrerenderingTest : public testing::Test { 173 class PrerenderingTest : public testing::Test {
169 public: 174 public:
170 ~PrerenderingTest() override 175 ~PrerenderingTest() override
171 { 176 {
172 Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs(); 177 Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 WebPrerender relNextOnly = prerendererClient()->releaseWebPrerender(); 494 WebPrerender relNextOnly = prerendererClient()->releaseWebPrerender();
490 EXPECT_EQ(toWebURL("http://rel-next-only.com/"), relNextOnly.url()); 495 EXPECT_EQ(toWebURL("http://rel-next-only.com/"), relNextOnly.url());
491 EXPECT_EQ(PrerenderRelTypeNext, relNextOnly.relTypes()); 496 EXPECT_EQ(PrerenderRelTypeNext, relNextOnly.relTypes());
492 497
493 WebPrerender relNextAndPrerender = prerendererClient()->releaseWebPrerender( ); 498 WebPrerender relNextAndPrerender = prerendererClient()->releaseWebPrerender( );
494 EXPECT_EQ(toWebURL("http://rel-next-and-prerender.com/"), relNextAndPrerende r.url()); 499 EXPECT_EQ(toWebURL("http://rel-next-and-prerender.com/"), relNextAndPrerende r.url());
495 EXPECT_EQ(static_cast<unsigned>(PrerenderRelTypeNext | PrerenderRelTypePrere nder), relNextAndPrerender.relTypes()); 500 EXPECT_EQ(static_cast<unsigned>(PrerenderRelTypeNext | PrerenderRelTypePrere nder), relNextAndPrerender.relTypes());
496 } 501 }
497 502
498 } // namespace 503 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698