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

Side by Side Diff: Source/platform/image-decoders/webp/WEBPImageDecoderTest.cpp

Issue 499543002: Removing duplicate 'using namespace blink;' in platform and web (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 3 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) 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 28 matching lines...) Expand all
39 #include "public/platform/WebSize.h" 39 #include "public/platform/WebSize.h"
40 #include "public/platform/WebUnitTestSupport.h" 40 #include "public/platform/WebUnitTestSupport.h"
41 #include "wtf/OwnPtr.h" 41 #include "wtf/OwnPtr.h"
42 #include "wtf/PassOwnPtr.h" 42 #include "wtf/PassOwnPtr.h"
43 #include "wtf/StringHasher.h" 43 #include "wtf/StringHasher.h"
44 #include "wtf/Vector.h" 44 #include "wtf/Vector.h"
45 #include "wtf/dtoa/utils.h" 45 #include "wtf/dtoa/utils.h"
46 #include <gtest/gtest.h> 46 #include <gtest/gtest.h>
47 47
48 using namespace blink; 48 using namespace blink;
49 using namespace blink;
50 49
51 namespace { 50 namespace {
52 51
53 PassRefPtr<SharedBuffer> readFile(const char* fileName) 52 PassRefPtr<SharedBuffer> readFile(const char* fileName)
54 { 53 {
55 String filePath = Platform::current()->unitTestSupport()->webKitRootDir(); 54 String filePath = Platform::current()->unitTestSupport()->webKitRootDir();
56 filePath.append(fileName); 55 filePath.append(fileName);
57 56
58 return Platform::current()->unitTestSupport()->readFromFile(filePath); 57 return Platform::current()->unitTestSupport()->readFromFile(filePath);
59 } 58 }
(...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after
656 655
657 TEST(StaticWebPTests, notAnimated) 656 TEST(StaticWebPTests, notAnimated)
658 { 657 {
659 OwnPtr<WEBPImageDecoder> decoder = createDecoder(); 658 OwnPtr<WEBPImageDecoder> decoder = createDecoder();
660 RefPtr<SharedBuffer> data = readFile("/LayoutTests/fast/images/resources/web p-color-profile-lossy.webp"); 659 RefPtr<SharedBuffer> data = readFile("/LayoutTests/fast/images/resources/web p-color-profile-lossy.webp");
661 ASSERT_TRUE(data.get()); 660 ASSERT_TRUE(data.get());
662 decoder->setData(data.get(), true); 661 decoder->setData(data.get(), true);
663 EXPECT_EQ(1u, decoder->frameCount()); 662 EXPECT_EQ(1u, decoder->frameCount());
664 EXPECT_EQ(cAnimationNone, decoder->repetitionCount()); 663 EXPECT_EQ(cAnimationNone, decoder->repetitionCount());
665 } 664 }
OLDNEW
« no previous file with comments | « Source/platform/image-decoders/jpeg/JPEGImageDecoderTest.cpp ('k') | Source/web/PopupContainerTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698