diff options
author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-31 17:06:34 +0000 |
---|---|---|
committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-31 17:06:34 +0000 |
commit | 2b2a175e89b4f7caa54962f02e9ad0c79f52c74a (patch) | |
tree | 8e5cbdedf63668f46623ca4bc4fd1c8944162916 /webkit/glue/webframe_impl.cc | |
parent | 62e176441dda58a361f5c3d9ee3edff7d5727681 (diff) | |
download | chromium_src-2b2a175e89b4f7caa54962f02e9ad0c79f52c74a.zip chromium_src-2b2a175e89b4f7caa54962f02e9ad0c79f52c74a.tar.gz chromium_src-2b2a175e89b4f7caa54962f02e9ad0c79f52c74a.tar.bz2 |
Mac changes for r4070 et seq. Make jsbindings, webcore, port, and glue share
the same HEADER_SEARCH_PATHS. For the couple of cases where we want to use
headers from third_party/WebKit, redirect the #includes in the port headers.
Review URL: http://codereview.chromium.org/8964
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4288 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webframe_impl.cc')
-rw-r--r-- | webkit/glue/webframe_impl.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc index 71181a2..a84a104 100644 --- a/webkit/glue/webframe_impl.cc +++ b/webkit/glue/webframe_impl.cc @@ -1859,8 +1859,14 @@ bool WebFrameImpl::SpoolPage(int page, gfx::PlatformCanvas* canvas) { return false; } +#if defined(OS_WIN) || defined(OS_LINUX) PlatformContextSkia context(canvas); GraphicsContext spool(&context); +#elif defined(OS_MACOSX) + CGContextRef context = canvas->beginPlatformPaint(); + GraphicsContext spool(context); +#endif + DCHECK(pages_[page].x() == 0); // Offset to get the right square. spool.translate(0, -static_cast<float>(pages_[page].y())); |