summaryrefslogtreecommitdiffstats
path: root/ppapi/shared_impl
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-10 20:08:11 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-10 20:08:11 +0000
commit9761270755f2fe1fabdf1fadc9a8968b24888973 (patch)
treec4b98080636ba5bc4f790522be69ece85a8f3432 /ppapi/shared_impl
parent7431930ddbb9200aad662b7390c04c561a456678 (diff)
downloadchromium_src-9761270755f2fe1fabdf1fadc9a8968b24888973.zip
chromium_src-9761270755f2fe1fabdf1fadc9a8968b24888973.tar.gz
chromium_src-9761270755f2fe1fabdf1fadc9a8968b24888973.tar.bz2
remove WEBKIT_USING_CG
We haven't set WEBKIT_USING_CG for several stable releases and do not intend to set it again in the forseeable future. This deletes the now-dead code BUG=none TEST=compiles Review URL: https://chromiumcodereview.appspot.com/10392018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136369 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/shared_impl')
-rw-r--r--ppapi/shared_impl/private/ppb_browser_font_trusted_shared.cc10
-rw-r--r--ppapi/shared_impl/private/ppb_font_shared.cc10
2 files changed, 2 insertions, 18 deletions
diff --git a/ppapi/shared_impl/private/ppb_browser_font_trusted_shared.cc b/ppapi/shared_impl/private/ppb_browser_font_trusted_shared.cc
index ab7c45a..0d73691 100644
--- a/ppapi/shared_impl/private/ppb_browser_font_trusted_shared.cc
+++ b/ppapi/shared_impl/private/ppb_browser_font_trusted_shared.cc
@@ -309,15 +309,7 @@ void PPB_BrowserFont_Trusted_Shared::DrawTextToCanvas(
clip->size.width, clip->size.height);
}
-#if WEBKIT_USING_SKIA
- WebCanvas* canvas = destination;
-#elif WEBKIT_USING_CG
- WebCanvas* canvas = skia::GetBitmapContext(skia::GetTopDevice(*destination));
-#else
- NOTIMPLEMENTED();
- return;
-#endif
- font_->drawText(canvas, run, web_position, color, web_clip,
+ font_->drawText(destination, run, web_position, color, web_clip,
PP_ToBool(image_data_is_opaque));
}
diff --git a/ppapi/shared_impl/private/ppb_font_shared.cc b/ppapi/shared_impl/private/ppb_font_shared.cc
index 3918088..36c9ed2 100644
--- a/ppapi/shared_impl/private/ppb_font_shared.cc
+++ b/ppapi/shared_impl/private/ppb_font_shared.cc
@@ -236,15 +236,7 @@ void FontImpl::DrawTextAt(const DrawTextParams& params) {
params.clip->size.width, params.clip->size.height);
}
-#if WEBKIT_USING_SKIA
- WebCanvas* canvas = params.destination;
-#elif WEBKIT_USING_CG
- WebCanvas* canvas = skia::GetBitmapContext(skia::GetTopDevice(*destination));
-#else
- NOTIMPLEMENTED();
- return;
-#endif
- font_->drawText(canvas, run, web_position, params.color, web_clip,
+ font_->drawText(params.destination, run, web_position, params.color, web_clip,
params.image_data_is_opaque == PP_TRUE);
}