| 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 508 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 519         break; | 519         break; | 
| 520     case FontDescription::EnabledLigaturesState: | 520     case FontDescription::EnabledLigaturesState: | 
| 521         // calt is on by default | 521         // calt is on by default | 
| 522         break; | 522         break; | 
| 523     case FontDescription::NormalLigaturesState: | 523     case FontDescription::NormalLigaturesState: | 
| 524         break; | 524         break; | 
| 525     } | 525     } | 
| 526 | 526 | 
| 527     static hb_feature_t hwid = { HB_TAG('h', 'w', 'i', 'd'), 1, 0, static_cast<u
      nsigned>(-1) }; | 527     static hb_feature_t hwid = { HB_TAG('h', 'w', 'i', 'd'), 1, 0, static_cast<u
      nsigned>(-1) }; | 
| 528     static hb_feature_t twid = { HB_TAG('t', 'w', 'i', 'd'), 1, 0, static_cast<u
      nsigned>(-1) }; | 528     static hb_feature_t twid = { HB_TAG('t', 'w', 'i', 'd'), 1, 0, static_cast<u
      nsigned>(-1) }; | 
| 529     static hb_feature_t qwid = { HB_TAG('d', 'w', 'i', 'd'), 1, 0, static_cast<u
      nsigned>(-1) }; | 529     static hb_feature_t qwid = { HB_TAG('q', 'w', 'i', 'd'), 1, 0, static_cast<u
      nsigned>(-1) }; | 
| 530     switch (description.widthVariant()) { | 530     switch (description.widthVariant()) { | 
| 531     case HalfWidth: | 531     case HalfWidth: | 
| 532         m_features.append(hwid); | 532         m_features.append(hwid); | 
| 533         break; | 533         break; | 
| 534     case ThirdWidth: | 534     case ThirdWidth: | 
| 535         m_features.append(twid); | 535         m_features.append(twid); | 
| 536         break; | 536         break; | 
| 537     case QuarterWidth: | 537     case QuarterWidth: | 
| 538         m_features.append(qwid); | 538         m_features.append(qwid); | 
| 539         break; | 539         break; | 
| (...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1145         fromX = 0; | 1145         fromX = 0; | 
| 1146     if (!foundToX) | 1146     if (!foundToX) | 
| 1147         toX = m_run.rtl() ? 0 : m_totalWidth; | 1147         toX = m_run.rtl() ? 0 : m_totalWidth; | 
| 1148 | 1148 | 
| 1149     if (fromX < toX) | 1149     if (fromX < toX) | 
| 1150         return FloatRect(point.x() + fromX, point.y(), toX - fromX, height); | 1150         return FloatRect(point.x() + fromX, point.y(), toX - fromX, height); | 
| 1151     return FloatRect(point.x() + toX, point.y(), fromX - toX, height); | 1151     return FloatRect(point.x() + toX, point.y(), fromX - toX, height); | 
| 1152 } | 1152 } | 
| 1153 | 1153 | 
| 1154 } // namespace blink | 1154 } // namespace blink | 
| OLD | NEW | 
|---|