Linux: More gcc 4.5 NULL versus 0 fixes.

webkit/glue/plugins/pepper_private.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "build/build_config.h"
 
 #include "webkit/glue/plugins/pepper_private.h"
 
 #include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
@@ skipping 76 matching lines @@
 
 PP_Resource GetResourceImage(PP_Module module_id, PP_ResourceImage image_id) {
   int res_id = 0;
   for (size_t i = 0; i < arraysize(kResourceImageMap); ++i) {
     if (kResourceImageMap[i].pp_id == image_id) {
       res_id = kResourceImageMap[i].res_id;
       break;
     }
   }
   if (res_id == 0)
-    return NULL;
+    return 0;
 
   SkBitmap* res_bitmap =
       ResourceBundle::GetSharedInstance().GetBitmapNamed(res_id);
 
   PluginModule* module = PluginModule::FromPPModule(module_id);
   if (!module)
-    return NULL;
+    return 0;
   scoped_refptr<pepper::ImageData> image_data(new pepper::ImageData(module));
   if (!image_data->Init(PP_IMAGEDATAFORMAT_BGRA_PREMUL,
                         res_bitmap->width(), res_bitmap->height(), false)) {
-    return NULL;
+    return 0;
   }
 
   ImageDataAutoMapper mapper(image_data);
   if (!mapper.is_valid())
-    return NULL;
+    return 0;
 
   skia::PlatformCanvas* canvas = image_data->mapped_canvas();
   SkBitmap& ret_bitmap =
       const_cast<SkBitmap&>(canvas->getTopPlatformDevice().accessBitmap(true));
   if (!res_bitmap->copyTo(&ret_bitmap, SkBitmap::kARGB_8888_Config, NULL)) {
-    return NULL;
+    return 0;
   }
 
   return image_data->GetReference();
 }
 
 PP_Resource GetFontFileWithFallback(
     PP_Module module_id,
     const PP_PrivateFontFileDescription* description) {
 #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<PrivateFontFile> font(new PrivateFontFile(module, fd));
 
   return font->GetReference();
 #else
   // For trusted pepper plugins, this is only needed in Linux since font loading
   // on Windows and Mac works through the renderer sandbox.
-  return false;
+  return 0;
 #endif
 }
 
 bool GetFontTableForPrivateFontFile(PP_Resource font_file,
                                     uint32_t table,
                                     void* output,
                                     uint32_t* output_length) {
 #if defined(OS_LINUX)
   scoped_refptr<PrivateFontFile> font(
       Resource::GetAs<PrivateFontFile>(font_file));
@@ skipping 25 matching lines @@
                                    uint32_t* output_length) {
   size_t temp_size = static_cast<size_t>(*output_length);
   bool rv = webkit_glue::GetFontTable(
       fd_, table, static_cast<uint8_t*>(output), &temp_size);
   *output_length = static_cast<uint32_t>(temp_size);
   return rv;
 }
 #endif
 
 }  // namespace pepper