| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "webkit/glue/webkit_glue.h" | 5 #include "webkit/glue/webkit_glue.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <objidl.h> | 8 #include <objidl.h> |
| 9 #include <mlang.h> | 9 #include <mlang.h> |
| 10 #elif defined(OS_POSIX) && !defined(OS_MACOSX) | 10 #elif defined(OS_POSIX) && !defined(OS_MACOSX) |
| (...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 400 } | 400 } |
| 401 | 401 |
| 402 bool ShouldForcefullyTerminatePluginProcess() { | 402 bool ShouldForcefullyTerminatePluginProcess() { |
| 403 return g_forcefully_terminate_plugin_process; | 403 return g_forcefully_terminate_plugin_process; |
| 404 } | 404 } |
| 405 | 405 |
| 406 WebCanvas* ToWebCanvas(skia::PlatformCanvas* canvas) { | 406 WebCanvas* ToWebCanvas(skia::PlatformCanvas* canvas) { |
| 407 #if WEBKIT_USING_SKIA | 407 #if WEBKIT_USING_SKIA |
| 408 return canvas; | 408 return canvas; |
| 409 #elif WEBKIT_USING_CG | 409 #elif WEBKIT_USING_CG |
| 410 return canvas->getTopPlatformDevice().GetBitmapContext(); | 410 return skia::platform_util::GetBitmapContext(&canvas->getTopDevice()); |
| 411 #else | 411 #else |
| 412 NOTIMPLEMENTED(); | 412 NOTIMPLEMENTED(); |
| 413 return NULL; | 413 return NULL; |
| 414 #endif | 414 #endif |
| 415 } | 415 } |
| 416 | 416 |
| 417 int GetGlyphPageCount() { | 417 int GetGlyphPageCount() { |
| 418 return WebGlyphCache::pageCount(); | 418 return WebGlyphCache::pageCount(); |
| 419 } | 419 } |
| 420 | 420 |
| 421 } // namespace webkit_glue | 421 } // namespace webkit_glue |
| OLD | NEW |