| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2000 Dirk Mueller (mueller@kde.org) | 4 * (C) 2000 Dirk Mueller (mueller@kde.org) |
| 5 * Copyright (C) 2003, 2006, 2010, 2011 Apple Inc. All rights reserved. | 5 * Copyright (C) 2003, 2006, 2010, 2011 Apple Inc. All rights reserved. |
| 6 * Copyright (c) 2007, 2008, 2010 Google Inc. All rights reserved. | 6 * Copyright (c) 2007, 2008, 2010 Google Inc. All rights reserved. |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 const PaintFlags& flags) const { | 155 const PaintFlags& flags) const { |
| 156 // Don't draw anything while we are using custom fonts that are in the process | 156 // Don't draw anything while we are using custom fonts that are in the process |
| 157 // of loading, except if the 'force' argument is set to true (in which case it | 157 // of loading, except if the 'force' argument is set to true (in which case it |
| 158 // will use a fallback font). | 158 // will use a fallback font). |
| 159 if (ShouldSkipDrawing() && | 159 if (ShouldSkipDrawing() && |
| 160 custom_font_not_ready_action == kDoNotPaintIfFontNotReady) | 160 custom_font_not_ready_action == kDoNotPaintIfFontNotReady) |
| 161 return false; | 161 return false; |
| 162 | 162 |
| 163 // sub-run painting is not supported for Bidi text. | 163 // sub-run painting is not supported for Bidi text. |
| 164 const TextRun& run = run_info.run; | 164 const TextRun& run = run_info.run; |
| 165 ASSERT((run_info.from == 0) && (run_info.to == run.length())); | 165 DCHECK_EQ(run_info.from, 0u); |
| 166 DCHECK_EQ(run_info.to, run.length()); |
| 166 BidiResolver<TextRunIterator, BidiCharacterRun> bidi_resolver; | 167 BidiResolver<TextRunIterator, BidiCharacterRun> bidi_resolver; |
| 167 bidi_resolver.SetStatus( | 168 bidi_resolver.SetStatus( |
| 168 BidiStatus(run.Direction(), run.DirectionalOverride())); | 169 BidiStatus(run.Direction(), run.DirectionalOverride())); |
| 169 bidi_resolver.SetPositionIgnoringNestedIsolates(TextRunIterator(&run, 0)); | 170 bidi_resolver.SetPositionIgnoringNestedIsolates(TextRunIterator(&run, 0)); |
| 170 | 171 |
| 171 // FIXME: This ownership should be reversed. We should pass BidiRunList | 172 // FIXME: This ownership should be reversed. We should pass BidiRunList |
| 172 // to BidiResolver in createBidiRunsForLine. | 173 // to BidiResolver in createBidiRunsForLine. |
| 173 BidiRunList<BidiCharacterRun>& bidi_runs = bidi_resolver.Runs(); | 174 BidiRunList<BidiCharacterRun>& bidi_runs = bidi_resolver.Runs(); |
| 174 bidi_resolver.CreateBidiRunsForLine(TextRunIterator(&run, run.length())); | 175 bidi_resolver.CreateBidiRunsForLine(TextRunIterator(&run, run.length())); |
| 175 if (!bidi_runs.RunCount()) | 176 if (!bidi_runs.RunCount()) |
| (...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 418 | 419 |
| 419 bool Font::LoadingCustomFonts() const { | 420 bool Font::LoadingCustomFonts() const { |
| 420 return font_fallback_list_ && font_fallback_list_->LoadingCustomFonts(); | 421 return font_fallback_list_ && font_fallback_list_->LoadingCustomFonts(); |
| 421 } | 422 } |
| 422 | 423 |
| 423 bool Font::IsFallbackValid() const { | 424 bool Font::IsFallbackValid() const { |
| 424 return !font_fallback_list_ || font_fallback_list_->IsValid(); | 425 return !font_fallback_list_ || font_fallback_list_->IsValid(); |
| 425 } | 426 } |
| 426 | 427 |
| 427 } // namespace blink | 428 } // namespace blink |
| OLD | NEW |