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

Unified Diff: webkit/glue/plugins/pepper_font.cc

Issue 3014034: Linux: Fix some NULL versus 0 issues to appease gcc-4.5. (Closed)
Patch Set: Created 10 years, 5 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 | « webkit/glue/plugins/pepper_device_context_2d.cc ('k') | webkit/glue/plugins/pepper_image_data.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/plugins/pepper_font.cc
diff --git a/webkit/glue/plugins/pepper_font.cc b/webkit/glue/plugins/pepper_font.cc
index af4cb81ddcce3f9e88081f6a651ef496531c576a..378842a7dcd2f019bb3475637642d66e5e929ddc 100644
--- a/webkit/glue/plugins/pepper_font.cc
+++ b/webkit/glue/plugins/pepper_font.cc
@@ -24,14 +24,14 @@ PP_Resource MatchFontWithFallback(PP_Module module_id,
#if defined(OS_LINUX)
PluginModule* module = PluginModule::FromPPModule(module_id);
if (!module)
- return NULL;
+ return 0;
int fd = webkit_glue::MatchFontWithFallback(description->face,
description->weight >= 700,
description->italic,
description->charset);
if (fd == -1)
- return NULL;
+ return 0;
scoped_refptr<Font> font(new Font(module, fd));
« no previous file with comments | « webkit/glue/plugins/pepper_device_context_2d.cc ('k') | webkit/glue/plugins/pepper_image_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698