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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: skia/ext/vector_canvas_unittest.cc

Issue 12095045: Merge 175642 (also includes 175980) (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1364/src/
Patch Set: Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/base/v8_unit_test.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/ext/vector_canvas_unittest.cc
===================================================================
--- skia/ext/vector_canvas_unittest.cc (revision 179457)
+++ skia/ext/vector_canvas_unittest.cc (working copy)
@@ -334,8 +334,10 @@
void LoadPngFileToSkBitmap(const FilePath& filename,
SkBitmap* bitmap,
bool is_opaque) {
+ FilePath absolute_path(filename);
+ file_util::AbsolutePath(&absolute_path);
std::string compressed;
- file_util::ReadFileToString(filename, &compressed);
+ file_util::ReadFileToString(absolute_path, &compressed);
ASSERT_TRUE(compressed.size());
ASSERT_TRUE(gfx::PNGCodec::Decode(
« no previous file with comments | « chrome/test/base/v8_unit_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698