ui/gfx/font_unittest.cc - Issue 6990051: Unix ifdefs patch for ui/ and webkit/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/gfx/font_unittest.cc

Issue 6990051: Unix ifdefs patch for ui/ and webkit/ (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: removed some too general ifdefs and ppapi changes Created 9 years, 7 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:

Index: ui/gfx/font_unittest.cc

diff --git a/ui/gfx/font_unittest.cc b/ui/gfx/font_unittest.cc

index 7ea01db4d0b5ff2edbbbb92135315fe84fc3bfda..b8de407bb92df218742f0752ba1e1c873aa80e4e 100644

--- a/ui/gfx/font_unittest.cc

+++ b/ui/gfx/font_unittest.cc

@@ -7,7 +7,7 @@

#include "base/utf_string_conversions.h"

#include "testing/gtest/include/gtest/gtest.h"

-#if defined(OS_LINUX)

+#if defined(OS_POSIX) && !defined(OS_MACOSX)

#include <pango/pango.h>

#elif defined(OS_WIN)

#include "ui/gfx/platform_font_win.h"

@@ -22,7 +22,7 @@ class FontTest : public testing::Test {

// Fulfills the memory management contract as outlined by the comment at

// gfx::Font::GetNativeFont().

void FreeIfNecessary(gfx::NativeFont font) {

-#if defined(OS_LINUX)

+#if defined(OS_POSIX) && !defined(OS_MACOSX)

pango_font_description_free(font);

#endif

}