| 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 13 matching lines...) Expand all Loading... |
| 24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 30 */ | 30 */ |
| 31 | 31 |
| 32 #include "platform/fonts/shaping/ShapeResult.h" | 32 #include "platform/fonts/shaping/ShapeResult.h" |
| 33 | 33 |
| 34 #include <hb.h> |
| 35 #include <memory> |
| 34 #include "platform/fonts/Font.h" | 36 #include "platform/fonts/Font.h" |
| 35 #include "platform/fonts/shaping/ShapeResultInlineHeaders.h" | 37 #include "platform/fonts/shaping/ShapeResultInlineHeaders.h" |
| 36 #include "platform/fonts/shaping/ShapeResultSpacing.h" | 38 #include "platform/fonts/shaping/ShapeResultSpacing.h" |
| 37 #include "wtf/PtrUtil.h" | 39 #include "wtf/PtrUtil.h" |
| 38 #include <hb.h> | |
| 39 #include <memory> | |
| 40 | 40 |
| 41 namespace blink { | 41 namespace blink { |
| 42 | 42 |
| 43 float ShapeResult::RunInfo::xPositionForVisualOffset( | 43 float ShapeResult::RunInfo::xPositionForVisualOffset( |
| 44 unsigned offset, | 44 unsigned offset, |
| 45 AdjustMidCluster adjustMidCluster) const { | 45 AdjustMidCluster adjustMidCluster) const { |
| 46 ASSERT(offset < m_numCharacters); | 46 ASSERT(offset < m_numCharacters); |
| 47 if (rtl()) | 47 if (rtl()) |
| 48 offset = m_numCharacters - offset - 1; | 48 offset = m_numCharacters - offset - 1; |
| 49 return xPositionForOffset(offset, adjustMidCluster); | 49 return xPositionForOffset(offset, adjustMidCluster); |
| (...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 401 result->m_width = run->m_width; | 401 result->m_width = run->m_width; |
| 402 result->m_numGlyphs = count; | 402 result->m_numGlyphs = count; |
| 403 DCHECK_EQ(result->m_numGlyphs, count); // no overflow | 403 DCHECK_EQ(result->m_numGlyphs, count); // no overflow |
| 404 result->m_hasVerticalOffsets = | 404 result->m_hasVerticalOffsets = |
| 405 fontData->platformData().isVerticalAnyUpright(); | 405 fontData->platformData().isVerticalAnyUpright(); |
| 406 result->m_runs.push_back(std::move(run)); | 406 result->m_runs.push_back(std::move(run)); |
| 407 return result.release(); | 407 return result.release(); |
| 408 } | 408 } |
| 409 | 409 |
| 410 } // namespace blink | 410 } // namespace blink |
| OLD | NEW |