| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007 Apple Computer, Inc. | 2 * Copyright (C) 2006, 2007 Apple Computer, Inc. |
| 3 * Copyright (c) 2006, 2007, 2008, 2009, 2012 Google Inc. All rights reserved. | 3 * Copyright (c) 2006, 2007, 2008, 2009, 2012 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 404 } | 404 } |
| 405 | 405 |
| 406 SelectObject(dc, oldFont); | 406 SelectObject(dc, oldFont); |
| 407 } | 407 } |
| 408 } | 408 } |
| 409 return m_scriptFontProperties.get(); | 409 return m_scriptFontProperties.get(); |
| 410 } | 410 } |
| 411 | 411 |
| 412 bool FontPlatformData::ensureFontLoaded(HFONT font) | 412 bool FontPlatformData::ensureFontLoaded(HFONT font) |
| 413 { | 413 { |
| 414 WebKit::WebSandboxSupport* sandboxSupport = WebKit::Platform::current()->san
dboxSupport(); | 414 blink::WebSandboxSupport* sandboxSupport = blink::Platform::current()->sandb
oxSupport(); |
| 415 // if there is no sandbox, then we can assume the font | 415 // if there is no sandbox, then we can assume the font |
| 416 // was able to be loaded successfully already | 416 // was able to be loaded successfully already |
| 417 return sandboxSupport ? sandboxSupport->ensureFontLoaded(font) : true; | 417 return sandboxSupport ? sandboxSupport->ensureFontLoaded(font) : true; |
| 418 } | 418 } |
| 419 #endif | 419 #endif |
| 420 | 420 |
| 421 #ifndef NDEBUG | 421 #ifndef NDEBUG |
| 422 String FontPlatformData::description() const | 422 String FontPlatformData::description() const |
| 423 { | 423 { |
| 424 return String(); | 424 return String(); |
| 425 } | 425 } |
| 426 #endif | 426 #endif |
| 427 | 427 |
| 428 } | 428 } |
| OLD | NEW |