summaryrefslogtreecommitdiffstats
path: root/skia/ext/platform_device_mac.cc
diff options
context:
space:
mode:
authorreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-08 13:17:44 +0000
committerreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-08 13:17:44 +0000
commite2fb32c1d3c8c0618405f973c078dba2c176095d (patch)
tree60175b5b8704f0bbfd0cb9b7e1be91c13f356f5f /skia/ext/platform_device_mac.cc
parentfe9dcce34a033d22bcc0985b8d2f2db41bf20736 (diff)
downloadchromium_src-e2fb32c1d3c8c0618405f973c078dba2c176095d.zip
chromium_src-e2fb32c1d3c8c0618405f973c078dba2c176095d.tar.gz
chromium_src-e2fb32c1d3c8c0618405f973c078dba2c176095d.tar.bz2
mirror of http://codereview.chromium.org/6732027/
Replace include with forward declarations. Remove #import ApplicationServices.h from platform_device_mac.h, and add it back to appropriate .cc files. This is motivated by a conflict between headers included by ApplicationServices.h and WebCore headers. The conflict occurs in WebMediaPlayerClientImpl.cpp if it modified to include platform_canvas.h. With this change, ReleaseBitmapContext() cannot be declared inline in the header, so it is moved to bitmap_platform_device_mac.cc. There is no functional change. This requires that http://trac.webkit.org/changeset/81979 land in the Chromium tree first. (81979 has landed in the WebKit tree.) Review URL: http://codereview.chromium.org/6816025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80926 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/ext/platform_device_mac.cc')
-rw-r--r--skia/ext/platform_device_mac.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/skia/ext/platform_device_mac.cc b/skia/ext/platform_device_mac.cc
index e18c402..73e814e 100644
--- a/skia/ext/platform_device_mac.cc
+++ b/skia/ext/platform_device_mac.cc
@@ -4,6 +4,7 @@
#include "skia/ext/bitmap_platform_device_mac.h"
+#import <ApplicationServices/ApplicationServices.h>
#include "skia/ext/skia_utils_mac.h"
#include "third_party/skia/include/core/SkMatrix.h"
#include "third_party/skia/include/core/SkPath.h"