3 files changed, 14 insertions, 14 deletions

diff --git a/webkit/glue/plugins/pepper_private.cc b/webkit/glue/plugins/pepper_private.cc
index 3a09656..e35006b 100644
--- a/webkit/glue/plugins/pepper_private.cc
+++ b/webkit/glue/plugins/pepper_private.cc
@@ -94,29 +94,29 @@ PP_Resource GetResourceImage(PP_Module module_id, PP_ResourceImage image_id) {
     }
   }
   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();
@@ -128,14 +128,14 @@ PP_Resource GetFontFileWithFallback(
 #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));
 
@@ -143,7 +143,7 @@ PP_Resource GetFontFileWithFallback(
 #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
 }
 
diff --git a/webkit/glue/plugins/pepper_transport.cc b/webkit/glue/plugins/pepper_transport.cc
index 0b650d2..ed5e05f 100644
--- a/webkit/glue/plugins/pepper_transport.cc
+++ b/webkit/glue/plugins/pepper_transport.cc
@@ -20,7 +20,7 @@ PP_Resource CreateTransport(PP_Module module,
                             const char* name,
                             const char* proto) {
   // TODO(juberti): implement me
-  PP_Resource p(NULL);
+  PP_Resource p(0);
   return p;
 }
 
@@ -68,7 +68,7 @@ int32_t GetNextAddress(PP_Resource transport,
 // from the remote peer.
 int32_t ReceiveRemoteAddress(PP_Resource transport,
                              PP_Var address) {
-  // TODO(juberti): impelement me
+  // TODO(juberti): implement me
   return 0;
 }
 
diff --git a/webkit/glue/webvideoframe_impl.cc b/webkit/glue/webvideoframe_impl.cc
index e1195a7..a838cd6 100644
--- a/webkit/glue/webvideoframe_impl.cc
+++ b/webkit/glue/webvideoframe_impl.cc
@@ -60,25 +60,25 @@ WebVideoFrame::Format WebVideoFrameImpl::format() const {
 unsigned WebVideoFrameImpl::width() const {
   if (video_frame_.get())
     return video_frame_->width();
-  return NULL;
+  return 0;
 }
 
 unsigned WebVideoFrameImpl::height() const {
   if (video_frame_.get())
     return video_frame_->height();
-  return NULL;
+  return 0;
 }
 
 unsigned WebVideoFrameImpl::planes() const {
   if (video_frame_.get())
     return video_frame_->planes();
-  return NULL;
+  return 0;
 }
 
 int WebVideoFrameImpl::stride(unsigned plane) const {
   if (video_frame_.get())
     return static_cast<int>(video_frame_->stride(plane));
-  return NULL;
+  return 0;
 }
 
 const void* WebVideoFrameImpl::data(unsigned plane) const {