From ed9d640f124d281a8b4088d292204f3f92fc8848 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Wed, 21 Dec 2011 20:02:39 +0000 Subject: [PATCH] Mac: Fix compile errors due to Chromium update. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@438 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- libcef/browser_impl_mac.mm | 4 ++-- libcef/browser_webview_delegate_mac.mm | 8 ++++---- libcef/external_popup_menu_mac.mm | 2 +- libcef/web_drag_source_mac.mm | 2 +- libcef/web_drop_target_mac.mm | 4 ++-- libcef/webview_host_mac.mm | 2 +- libcef/webwidget_host_mac.mm | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libcef/browser_impl_mac.mm b/libcef/browser_impl_mac.mm index 347278a0a..1a93a4a28 100644 --- a/libcef/browser_impl_mac.mm +++ b/libcef/browser_impl_mac.mm @@ -11,8 +11,8 @@ #import #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "webkit/glue/webpreferences.h" diff --git a/libcef/browser_webview_delegate_mac.mm b/libcef/browser_webview_delegate_mac.mm index 04476246a..1338487fc 100644 --- a/libcef/browser_webview_delegate_mac.mm +++ b/libcef/browser_webview_delegate_mac.mm @@ -17,9 +17,9 @@ #include "skia/ext/skia_utils_mac.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragData.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebImage.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPoint.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebDragData.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebImage.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenu.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "webkit/glue/webcursor.h" @@ -298,7 +298,7 @@ void BrowserWebViewDelegate::startDragging(const WebDragData& data, NSImage* ns_image = nil; if (!image.isNull()) { - const SkBitmap& bitmap = gfx::CGImageToSkBitmap(image.getCGImageRef()); + const SkBitmap& bitmap = image.getSkBitmap(); CGColorSpaceRef color_space = base::mac::GetSystemColorSpace(); ns_image = gfx::SkBitmapToNSImageWithColorSpace(bitmap, color_space); } diff --git a/libcef/external_popup_menu_mac.mm b/libcef/external_popup_menu_mac.mm index 8f62e0502..addd4f6b9 100644 --- a/libcef/external_popup_menu_mac.mm +++ b/libcef/external_popup_menu_mac.mm @@ -8,7 +8,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebExternalPopupMenuClient.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenuInfo.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" #include "webkit/glue/webmenurunner_mac.h" ExternalPopupMenu::ExternalPopupMenu( diff --git a/libcef/web_drag_source_mac.mm b/libcef/web_drag_source_mac.mm index 59ec06c41..4a608bb60 100644 --- a/libcef/web_drag_source_mac.mm +++ b/libcef/web_drag_source_mac.mm @@ -24,7 +24,7 @@ #import "third_party/mozilla/NSPasteboard+Utils.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPoint.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "ui/gfx/mac/nsimage_cache.h" #include "webkit/glue/webdropdata.h" diff --git a/libcef/web_drop_target_mac.mm b/libcef/web_drop_target_mac.mm index 0ef5b4ad4..ef54ed4c0 100644 --- a/libcef/web_drop_target_mac.mm +++ b/libcef/web_drop_target_mac.mm @@ -13,9 +13,9 @@ #include "base/logging.h" #include "base/sys_string_conversions.h" #import "third_party/mozilla/NSPasteboard+Utils.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragData.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebDragData.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPoint.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "webkit/glue/webdropdata.h" #include "webkit/glue/window_open_disposition.h" diff --git a/libcef/webview_host_mac.mm b/libcef/webview_host_mac.mm index a0ccbe8d3..0aa40426d 100644 --- a/libcef/webview_host_mac.mm +++ b/libcef/webview_host_mac.mm @@ -12,7 +12,7 @@ #include "skia/ext/platform_canvas.h" #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebInputEventFactory.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" diff --git a/libcef/webwidget_host_mac.mm b/libcef/webwidget_host_mac.mm index 6f94c7ab0..90ea726b2 100644 --- a/libcef/webwidget_host_mac.mm +++ b/libcef/webwidget_host_mac.mm @@ -11,7 +11,7 @@ #import "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #import "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenu.h" #import "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" -#import "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" +#import "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" #import "third_party/skia/include/core/SkRegion.h" #import "ui/gfx/rect.h" #import "ui/gfx/size.h"