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

Side by Side Diff: Source/platform/image-decoders/gif/GIFImageDecoderTest.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
« no previous file with comments | « no previous file | Source/platform/image-decoders/jpeg/JPEGImageDecoderTest.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) 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 26 matching lines...) Expand all
37 #include "public/platform/WebData.h" 37 #include "public/platform/WebData.h"
38 #include "public/platform/WebSize.h" 38 #include "public/platform/WebSize.h"
39 #include "public/platform/WebUnitTestSupport.h" 39 #include "public/platform/WebUnitTestSupport.h"
40 #include "wtf/OwnPtr.h" 40 #include "wtf/OwnPtr.h"
41 #include "wtf/PassOwnPtr.h" 41 #include "wtf/PassOwnPtr.h"
42 #include "wtf/StringHasher.h" 42 #include "wtf/StringHasher.h"
43 #include "wtf/Vector.h" 43 #include "wtf/Vector.h"
44 #include <gtest/gtest.h> 44 #include <gtest/gtest.h>
45 45
46 using namespace blink; 46 using namespace blink;
47 using namespace blink;
48 47
49 namespace { 48 namespace {
50 49
51 PassRefPtr<SharedBuffer> readFile(const char* fileName) 50 PassRefPtr<SharedBuffer> readFile(const char* fileName)
52 { 51 {
53 String filePath = Platform::current()->unitTestSupport()->webKitRootDir(); 52 String filePath = Platform::current()->unitTestSupport()->webKitRootDir();
54 filePath.append(fileName); 53 filePath.append(fileName);
55 54
56 return Platform::current()->unitTestSupport()->readFromFile(filePath); 55 return Platform::current()->unitTestSupport()->readFromFile(filePath);
57 } 56 }
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 RefPtr<SharedBuffer> data = readFile("/Source/web/tests/data/invalid-disposa l-method.gif"); 492 RefPtr<SharedBuffer> data = readFile("/Source/web/tests/data/invalid-disposa l-method.gif");
494 ASSERT_TRUE(data.get()); 493 ASSERT_TRUE(data.get());
495 decoder->setData(data.get(), true); 494 decoder->setData(data.get(), true);
496 495
497 EXPECT_EQ(2u, decoder->frameCount()); 496 EXPECT_EQ(2u, decoder->frameCount());
498 // Disposal method 4 is converted to ImageFrame::DisposeOverwritePrevious. 497 // Disposal method 4 is converted to ImageFrame::DisposeOverwritePrevious.
499 EXPECT_EQ(ImageFrame::DisposeOverwritePrevious, decoder->frameBufferAtIndex( 0)->disposalMethod()); 498 EXPECT_EQ(ImageFrame::DisposeOverwritePrevious, decoder->frameBufferAtIndex( 0)->disposalMethod());
500 // Disposal method 5 is ignored. 499 // Disposal method 5 is ignored.
501 EXPECT_EQ(ImageFrame::DisposeNotSpecified, decoder->frameBufferAtIndex(1)->d isposalMethod()); 500 EXPECT_EQ(ImageFrame::DisposeNotSpecified, decoder->frameBufferAtIndex(1)->d isposalMethod());
502 } 501 }
OLDNEW
« no previous file with comments | « no previous file | Source/platform/image-decoders/jpeg/JPEGImageDecoderTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698