| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 Google Inc. All rights reserved. | 2 * Copyright (c) 2012 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2013 BlackBerry Limited. All rights reserved. | 3 * Copyright (C) 2013 BlackBerry Limited. 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 380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 391 // characters have been shaped, too. | 391 // characters have been shaped, too. |
| 392 currentClusterResult = currentClusterResult == Shaped ? Shap
ed : NotDef; | 392 currentClusterResult = currentClusterResult == Shaped ? Shap
ed : NotDef; |
| 393 } | 393 } |
| 394 continue; | 394 continue; |
| 395 } | 395 } |
| 396 // We've moved to a new cluster. | 396 // We've moved to a new cluster. |
| 397 previousClusterResult = currentClusterResult; | 397 previousClusterResult = currentClusterResult; |
| 398 currentClusterResult = glyphInfo[glyphIndex].codepoint == 0 ? NotDef
: Shaped; | 398 currentClusterResult = glyphInfo[glyphIndex].codepoint == 0 ? NotDef
: Shaped; |
| 399 } else { | 399 } else { |
| 400 // The code below operates on the "flanks"/changes between NotDef | 400 // The code below operates on the "flanks"/changes between NotDef |
| 401 // and Shaped. In order to keep the code below from explictly | 401 // and Shaped. In order to keep the code below from explicitly |
| 402 // dealing with character indices and run end, we explicitly | 402 // dealing with character indices and run end, we explicitly |
| 403 // terminate the cluster/run here by setting the result value to the | 403 // terminate the cluster/run here by setting the result value to the |
| 404 // opposite of what it was, leading to atChange turning true. | 404 // opposite of what it was, leading to atChange turning true. |
| 405 previousClusterResult = currentClusterResult; | 405 previousClusterResult = currentClusterResult; |
| 406 currentClusterResult = currentClusterResult == NotDef ? Shaped : Not
Def; | 406 currentClusterResult = currentClusterResult == NotDef ? Shaped : Not
Def; |
| 407 } | 407 } |
| 408 | 408 |
| 409 bool atChange = (previousClusterResult != currentClusterResult) && previ
ousClusterResult != Unknown; | 409 bool atChange = (previousClusterResult != currentClusterResult) && previ
ousClusterResult != Unknown; |
| 410 if (!atChange) | 410 if (!atChange) |
| 411 continue; | 411 continue; |
| (...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 795 } | 795 } |
| 796 | 796 |
| 797 // Don't need to check m_textRun.allowsTrailingExpansion() since it's covere
d by !m_expansionOpportunityCount above | 797 // Don't need to check m_textRun.allowsTrailingExpansion() since it's covere
d by !m_expansionOpportunityCount above |
| 798 spacing += nextExpansionPerOpportunity(); | 798 spacing += nextExpansionPerOpportunity(); |
| 799 m_isAfterExpansion = true; | 799 m_isAfterExpansion = true; |
| 800 return spacing; | 800 return spacing; |
| 801 } | 801 } |
| 802 | 802 |
| 803 | 803 |
| 804 } // namespace blink | 804 } // namespace blink |
| OLD | NEW |