diff options
Diffstat (limited to 'chrome/renderer')
-rw-r--r-- | chrome/renderer/print_web_view_helper_mac.mm | 1 | ||||
-rw-r--r-- | chrome/renderer/webplugin_delegate_pepper.cc | 6 | ||||
-rw-r--r-- | chrome/renderer/webplugin_delegate_proxy.cc | 4 |
3 files changed, 3 insertions, 8 deletions
diff --git a/chrome/renderer/print_web_view_helper_mac.mm b/chrome/renderer/print_web_view_helper_mac.mm index 97410dc..3864b31 100644 --- a/chrome/renderer/print_web_view_helper_mac.mm +++ b/chrome/renderer/print_web_view_helper_mac.mm @@ -9,7 +9,6 @@ #include "app/l10n_util.h" #include "base/logging.h" #include "base/process_util.h" -#include "base/scoped_cftyperef.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" #include "chrome/renderer/render_view.h" diff --git a/chrome/renderer/webplugin_delegate_pepper.cc b/chrome/renderer/webplugin_delegate_pepper.cc index ea434f6..7d0a5a2 100644 --- a/chrome/renderer/webplugin_delegate_pepper.cc +++ b/chrome/renderer/webplugin_delegate_pepper.cc @@ -25,7 +25,7 @@ #include "base/path_service.h" #include "base/process_util.h" #if defined(OS_MACOSX) -#include "base/scoped_cftyperef.h" +#include "base/mac/scoped_cftyperef.h" #endif #include "base/scoped_ptr.h" #include "base/string_number_conversions.h" @@ -1739,11 +1739,11 @@ void WebPluginDelegatePepper::DrawSkBitmapToCanvas( int canvas_height) { SkAutoLockPixels lock(bitmap); DCHECK(bitmap.getConfig() == SkBitmap::kARGB_8888_Config); - scoped_cftyperef<CGDataProviderRef> data_provider( + base::mac::ScopedCFTypeRef<CGDataProviderRef> data_provider( CGDataProviderCreateWithData( NULL, bitmap.getAddr32(0, 0), bitmap.rowBytes() * bitmap.height(), NULL)); - scoped_cftyperef<CGImageRef> image( + base::mac::ScopedCFTypeRef<CGImageRef> image( CGImageCreate( bitmap.width(), bitmap.height(), 8, 32, bitmap.rowBytes(), diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc index f4229ff..b5baf2e 100644 --- a/chrome/renderer/webplugin_delegate_proxy.cc +++ b/chrome/renderer/webplugin_delegate_proxy.cc @@ -55,10 +55,6 @@ #include "ipc/ipc_channel_posix.h" #endif -#if defined(OS_MACOSX) -#include "base/scoped_cftyperef.h" -#endif - using WebKit::WebBindings; using WebKit::WebCursorInfo; using WebKit::WebDragData; |