| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 459 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 470 | 470 |
| 471 void SetForcefullyTerminatePluginProcess(bool value) { | 471 void SetForcefullyTerminatePluginProcess(bool value) { |
| 472 g_forcefully_terminate_plugin_process = value; | 472 g_forcefully_terminate_plugin_process = value; |
| 473 } | 473 } |
| 474 | 474 |
| 475 bool ShouldForcefullyTerminatePluginProcess() { | 475 bool ShouldForcefullyTerminatePluginProcess() { |
| 476 return g_forcefully_terminate_plugin_process; | 476 return g_forcefully_terminate_plugin_process; |
| 477 } | 477 } |
| 478 | 478 |
| 479 WebCanvas* ToWebCanvas(skia::PlatformCanvas* canvas) { | 479 WebCanvas* ToWebCanvas(skia::PlatformCanvas* canvas) { |
| 480 #if WEBKIT_USING_SKIA | |
| 481 return canvas; | 480 return canvas; |
| 482 #elif WEBKIT_USING_CG | |
| 483 return skia::GetBitmapContext(skia::GetTopDevice(*canvas)); | |
| 484 #else | |
| 485 NOTIMPLEMENTED(); | |
| 486 return NULL; | |
| 487 #endif | |
| 488 } | 481 } |
| 489 | 482 |
| 490 int GetGlyphPageCount() { | 483 int GetGlyphPageCount() { |
| 491 return WebGlyphCache::pageCount(); | 484 return WebGlyphCache::pageCount(); |
| 492 } | 485 } |
| 493 | 486 |
| 494 std::string GetInspectorProtocolVersion() { | 487 std::string GetInspectorProtocolVersion() { |
| 495 return WebDevToolsAgent::inspectorProtocolVersion().utf8(); | 488 return WebDevToolsAgent::inspectorProtocolVersion().utf8(); |
| 496 } | 489 } |
| 497 | 490 |
| (...skipping 15 matching lines...) Expand all Loading... |
| 513 case WebKit::WebReferrerPolicyAlways: | 506 case WebKit::WebReferrerPolicyAlways: |
| 514 case WebKit::WebReferrerPolicyNever: | 507 case WebKit::WebReferrerPolicyNever: |
| 515 case WebKit::WebReferrerPolicyOrigin: | 508 case WebKit::WebReferrerPolicyOrigin: |
| 516 net_referrer_policy = net::URLRequest::NEVER_CLEAR_REFERRER; | 509 net_referrer_policy = net::URLRequest::NEVER_CLEAR_REFERRER; |
| 517 break; | 510 break; |
| 518 } | 511 } |
| 519 request->set_referrer_policy(net_referrer_policy); | 512 request->set_referrer_policy(net_referrer_policy); |
| 520 } | 513 } |
| 521 | 514 |
| 522 } // namespace webkit_glue | 515 } // namespace webkit_glue |
| OLD | NEW |