| OLD | NEW |
| 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 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 return std::count_if( | 131 return std::count_if( |
| 132 m_abandonedPrerenders.begin(), m_abandonedPrerenders.end(), | 132 m_abandonedPrerenders.begin(), m_abandonedPrerenders.end(), |
| 133 [&prerender](const WebPrerender& other) { | 133 [&prerender](const WebPrerender& other) { |
| 134 return other.toPrerender() == prerender.toPrerender(); | 134 return other.toPrerender() == prerender.toPrerender(); |
| 135 }); | 135 }); |
| 136 } | 136 } |
| 137 | 137 |
| 138 private: | 138 private: |
| 139 // From WebPrerenderingSupport: | 139 // From WebPrerenderingSupport: |
| 140 void add(const WebPrerender& prerender) override { | 140 void add(const WebPrerender& prerender) override { |
| 141 m_addedPrerenders.append(prerender); | 141 m_addedPrerenders.push_back(prerender); |
| 142 } | 142 } |
| 143 | 143 |
| 144 void cancel(const WebPrerender& prerender) override { | 144 void cancel(const WebPrerender& prerender) override { |
| 145 m_canceledPrerenders.append(prerender); | 145 m_canceledPrerenders.push_back(prerender); |
| 146 } | 146 } |
| 147 | 147 |
| 148 void abandon(const WebPrerender& prerender) override { | 148 void abandon(const WebPrerender& prerender) override { |
| 149 m_abandonedPrerenders.append(prerender); | 149 m_abandonedPrerenders.push_back(prerender); |
| 150 } | 150 } |
| 151 | 151 |
| 152 void prefetchFinished() override {} | 152 void prefetchFinished() override {} |
| 153 | 153 |
| 154 Vector<WebPrerender> m_addedPrerenders; | 154 Vector<WebPrerender> m_addedPrerenders; |
| 155 Vector<WebPrerender> m_canceledPrerenders; | 155 Vector<WebPrerender> m_canceledPrerenders; |
| 156 Vector<WebPrerender> m_abandonedPrerenders; | 156 Vector<WebPrerender> m_abandonedPrerenders; |
| 157 }; | 157 }; |
| 158 | 158 |
| 159 class PrerenderingTest : public testing::Test { | 159 class PrerenderingTest : public testing::Test { |
| (...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 464 | 464 |
| 465 WebPrerender relNextAndPrerender = prerendererClient()->releaseWebPrerender(); | 465 WebPrerender relNextAndPrerender = prerendererClient()->releaseWebPrerender(); |
| 466 EXPECT_EQ(toWebURL("http://rel-next-and-prerender.com/"), | 466 EXPECT_EQ(toWebURL("http://rel-next-and-prerender.com/"), |
| 467 relNextAndPrerender.url()); | 467 relNextAndPrerender.url()); |
| 468 EXPECT_EQ( | 468 EXPECT_EQ( |
| 469 static_cast<unsigned>(PrerenderRelTypeNext | PrerenderRelTypePrerender), | 469 static_cast<unsigned>(PrerenderRelTypeNext | PrerenderRelTypePrerender), |
| 470 relNextAndPrerender.relTypes()); | 470 relNextAndPrerender.relTypes()); |
| 471 } | 471 } |
| 472 | 472 |
| 473 } // namespace | 473 } // namespace |
| OLD | NEW |