| 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 385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 396 } | 396 } |
| 397 | 397 |
| 398 bool ShouldForcefullyTerminatePluginProcess() { | 398 bool ShouldForcefullyTerminatePluginProcess() { |
| 399 return g_forcefully_terminate_plugin_process; | 399 return g_forcefully_terminate_plugin_process; |
| 400 } | 400 } |
| 401 | 401 |
| 402 WebCanvas* ToWebCanvas(skia::PlatformCanvas* canvas) { | 402 WebCanvas* ToWebCanvas(skia::PlatformCanvas* canvas) { |
| 403 #if WEBKIT_USING_SKIA | 403 #if WEBKIT_USING_SKIA |
| 404 return canvas; | 404 return canvas; |
| 405 #elif WEBKIT_USING_CG | 405 #elif WEBKIT_USING_CG |
| 406 return canvas->getTopPlatformDevice().GetBitmapContext(); | 406 return skia::GetBitmapContext(skia::GetTopDevice(*canvas)); |
| 407 #else | 407 #else |
| 408 NOTIMPLEMENTED(); | 408 NOTIMPLEMENTED(); |
| 409 return NULL; | 409 return NULL; |
| 410 #endif | 410 #endif |
| 411 } | 411 } |
| 412 | 412 |
| 413 int GetGlyphPageCount() { | 413 int GetGlyphPageCount() { |
| 414 return WebGlyphCache::pageCount(); | 414 return WebGlyphCache::pageCount(); |
| 415 } | 415 } |
| 416 | 416 |
| 417 } // namespace webkit_glue | 417 } // namespace webkit_glue |
| OLD | NEW |