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

Side by Side Diff: Source/web/tests/WebImageTest.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 | « Source/web/tests/TextFinderTest.cpp ('k') | Source/web/tests/WebInputEventConversionTest.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) 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 21 matching lines...) Expand all
32 #include "public/platform/WebImage.h" 32 #include "public/platform/WebImage.h"
33 33
34 #include "platform/SharedBuffer.h" 34 #include "platform/SharedBuffer.h"
35 #include "public/platform/Platform.h" 35 #include "public/platform/Platform.h"
36 #include "public/platform/WebData.h" 36 #include "public/platform/WebData.h"
37 #include "public/platform/WebSize.h" 37 #include "public/platform/WebSize.h"
38 #include "public/platform/WebUnitTestSupport.h" 38 #include "public/platform/WebUnitTestSupport.h"
39 #include <gtest/gtest.h> 39 #include <gtest/gtest.h>
40 40
41 using namespace blink; 41 using namespace blink;
42 using namespace blink;
43 42
44 namespace { 43 namespace {
45 44
46 static PassRefPtr<SharedBuffer> readFile(const char* fileName) 45 static PassRefPtr<SharedBuffer> readFile(const char* fileName)
47 { 46 {
48 String filePath = Platform::current()->unitTestSupport()->webKitRootDir(); 47 String filePath = Platform::current()->unitTestSupport()->webKitRootDir();
49 filePath.append("/Source/web/tests/data/"); 48 filePath.append("/Source/web/tests/data/");
50 filePath.append(fileName); 49 filePath.append(fileName);
51 50
52 return Platform::current()->unitTestSupport()->readFromFile(filePath); 51 return Platform::current()->unitTestSupport()->readFromFile(filePath);
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 const char badImage[] = "hello world"; 91 const char badImage[] = "hello world";
93 WebVector<WebImage> images = WebImage::framesFromData(WebData(badImage)); 92 WebVector<WebImage> images = WebImage::framesFromData(WebData(badImage));
94 ASSERT_EQ(0u, images.size()); 93 ASSERT_EQ(0u, images.size());
95 94
96 WebImage image = WebImage::fromData(WebData(badImage), WebSize()); 95 WebImage image = WebImage::fromData(WebData(badImage), WebSize());
97 EXPECT_TRUE(image.getSkBitmap().empty()); 96 EXPECT_TRUE(image.getSkBitmap().empty());
98 EXPECT_TRUE(image.getSkBitmap().isNull()); 97 EXPECT_TRUE(image.getSkBitmap().isNull());
99 } 98 }
100 99
101 } // namespace 100 } // namespace
OLDNEW
« no previous file with comments | « Source/web/tests/TextFinderTest.cpp ('k') | Source/web/tests/WebInputEventConversionTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698