Index: webkit/plugins/ppapi/ppb_graphics_2d_impl.cc |
=================================================================== |
--- webkit/plugins/ppapi/ppb_graphics_2d_impl.cc (revision 70358) |
+++ webkit/plugins/ppapi/ppb_graphics_2d_impl.cc (working copy) |
@@ -25,7 +25,7 @@ |
#include "webkit/plugins/ppapi/ppb_image_data_impl.h" |
#if defined(OS_MACOSX) |
-#include "base/mac_util.h" |
+#include "base/mac/mac_util.h" |
#include "base/mac/scoped_cftyperef.h" |
#endif |
@@ -249,7 +249,8 @@ |
return this; |
} |
-PP_Bool PPB_Graphics2D_Impl::Describe(PP_Size* size, PP_Bool* is_always_opaque) { |
+PP_Bool PPB_Graphics2D_Impl::Describe(PP_Size* size, |
+ PP_Bool* is_always_opaque) { |
size->width = image_data_->width(); |
size->height = image_data_->height(); |
*is_always_opaque = PP_FALSE; // TODO(brettw) implement this. |
@@ -497,7 +498,7 @@ |
CGImageCreate( |
backing_bitmap.width(), backing_bitmap.height(), |
8, 32, backing_bitmap.rowBytes(), |
- mac_util::GetSystemColorSpace(), |
+ base::mac::GetSystemColorSpace(), |
kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host, |
data_provider, NULL, false, kCGRenderingIntentDefault)); |