| Index: third_party/WebKit/Source/platform/fonts/opentype/OpenTypeVerticalData.cpp
|
| diff --git a/third_party/WebKit/Source/platform/fonts/opentype/OpenTypeVerticalData.cpp b/third_party/WebKit/Source/platform/fonts/opentype/OpenTypeVerticalData.cpp
|
| index 974b56eae7700f2d39428da154f126c857f11a19..89ebaa5148db19e2ca4f3e1754f94b9d032d7b9e 100644
|
| --- a/third_party/WebKit/Source/platform/fonts/opentype/OpenTypeVerticalData.cpp
|
| +++ b/third_party/WebKit/Source/platform/fonts/opentype/OpenTypeVerticalData.cpp
|
| @@ -10,16 +10,16 @@
|
| * notice, this list of conditions and the following disclaimer in the
|
| * documentation and/or other materials provided with the distribution.
|
| *
|
| - * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
|
| - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
| + * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
|
| + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
| * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
| - * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
|
| - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
| - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
| - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
| - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
| - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| + * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
|
| + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
| + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
| + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
| + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
| + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| #include "platform/fonts/opentype/OpenTypeVerticalData.h"
|
| @@ -154,7 +154,8 @@ void OpenTypeVerticalData::loadMetrics(const FontPlatformData& platformData) {
|
| for (uint16_t i = 0; i < countHmtxEntries; ++i)
|
| m_advanceWidths[i] = hmtx->entries[i].advanceWidth;
|
|
|
| - // Load vhea first. This table is required for fonts that support vertical flow.
|
| + // Load vhea first. This table is required for fonts that support vertical
|
| + // flow.
|
| buffer = platformData.openTypeTable(OpenType::VheaTag);
|
| const OpenType::VheaTable* vhea =
|
| OpenType::validateTable<OpenType::VheaTable>(buffer);
|
| @@ -185,7 +186,8 @@ void OpenTypeVerticalData::loadMetrics(const FontPlatformData& platformData) {
|
| }
|
| }
|
|
|
| - // Load vmtx then. This table is required for fonts that support vertical flow.
|
| + // Load vmtx then. This table is required for fonts that support vertical
|
| + // flow.
|
| buffer = platformData.openTypeTable(OpenType::VmtxTag);
|
| const OpenType::VmtxTable* vmtx =
|
| OpenType::validateTable<OpenType::VmtxTable>(buffer, countVmtxEntries);
|
|
|