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

Side by Side Diff: third_party/WebKit/Source/core/loader/resource/ImageResourceTest.cpp

Issue 2680163010: Remove unintendedly resurrected MockImageResourceClient.h (Closed)
Patch Set: Created 3 years, 10 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/loader/resource/MockImageResourceClient.h » ('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) 2013, Google Inc. All rights reserved. 2 * Copyright (c) 2013, 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 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "core/loader/resource/ImageResource.h" 31 #include "core/loader/resource/ImageResource.h"
32 32
33 #include <memory> 33 #include <memory>
34 #include "core/loader/resource/MockImageResourceClient.h"
35 #include "core/loader/resource/MockImageResourceObserver.h" 34 #include "core/loader/resource/MockImageResourceObserver.h"
36 #include "platform/SharedBuffer.h" 35 #include "platform/SharedBuffer.h"
37 #include "platform/exported/WrappedResourceResponse.h" 36 #include "platform/exported/WrappedResourceResponse.h"
38 #include "platform/graphics/BitmapImage.h" 37 #include "platform/graphics/BitmapImage.h"
39 #include "platform/graphics/Image.h" 38 #include "platform/graphics/Image.h"
40 #include "platform/loader/fetch/FetchInitiatorInfo.h" 39 #include "platform/loader/fetch/FetchInitiatorInfo.h"
41 #include "platform/loader/fetch/FetchRequest.h" 40 #include "platform/loader/fetch/FetchRequest.h"
42 #include "platform/loader/fetch/MemoryCache.h" 41 #include "platform/loader/fetch/MemoryCache.h"
43 #include "platform/loader/fetch/MockResourceClient.h" 42 #include "platform/loader/fetch/MockResourceClient.h"
44 #include "platform/loader/fetch/ResourceFetcher.h" 43 #include "platform/loader/fetch/ResourceFetcher.h"
(...skipping 1200 matching lines...) Expand 10 before | Expand all | Expand 10 after
1245 EXPECT_TRUE(observer->imageNotifyFinishedCalled()); 1244 EXPECT_TRUE(observer->imageNotifyFinishedCalled());
1246 EXPECT_TRUE(imageResource->getContent()->getImage()->isBitmapImage()); 1245 EXPECT_TRUE(imageResource->getContent()->getImage()->isBitmapImage());
1247 EXPECT_EQ(50, imageResource->getContent()->getImage()->width()); 1246 EXPECT_EQ(50, imageResource->getContent()->getImage()->width());
1248 EXPECT_EQ(50, imageResource->getContent()->getImage()->height()); 1247 EXPECT_EQ(50, imageResource->getContent()->getImage()->height());
1249 1248
1250 WTF::setTimeFunctionsForTesting(nullptr); 1249 WTF::setTimeFunctionsForTesting(nullptr);
1251 } 1250 }
1252 1251
1253 } // namespace 1252 } // namespace
1254 } // namespace blink 1253 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/loader/resource/MockImageResourceClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698