diff options
| author | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-08 13:17:44 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-08 13:17:44 +0000 |
| commit | e2fb32c1d3c8c0618405f973c078dba2c176095d (patch) | |
| tree | 60175b5b8704f0bbfd0cb9b7e1be91c13f356f5f /skia/ext/bitmap_platform_device_data.h | |
| parent | fe9dcce34a033d22bcc0985b8d2f2db41bf20736 (diff) | |
| download | chromium_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/bitmap_platform_device_data.h')
| -rw-r--r-- | skia/ext/bitmap_platform_device_data.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/skia/ext/bitmap_platform_device_data.h b/skia/ext/bitmap_platform_device_data.h index 36e0ad5..ff9b74f 100644 --- a/skia/ext/bitmap_platform_device_data.h +++ b/skia/ext/bitmap_platform_device_data.h @@ -43,11 +43,7 @@ class BitmapPlatformDevice::BitmapPlatformDeviceData : #endif #if defined(__APPLE__) - void ReleaseBitmapContext() { - SkASSERT(bitmap_context_); - CGContextRelease(bitmap_context_); - bitmap_context_ = NULL; - } + void ReleaseBitmapContext(); #endif // defined(__APPLE__) // Sets the transform and clip operations. This will not update the CGContext, |