Title: [177968] trunk/Source/WebCore
- Revision
- 177968
- Author
- mmaxfi...@apple.com
- Date
- 2015-01-06 11:00:30 -0800 (Tue, 06 Jan 2015)
Log Message
Fix iOS build after r177955 and r177952.
Unreviewed.
* html/parser/HTMLTreeBuilder.cpp:
(WebCore::HTMLTreeBuilder::insertPhoneNumberLink):
* platform/graphics/mac/ComplexTextController.cpp:
(WebCore::ComplexTextController::adjustGlyphsAndAdvances):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (177967 => 177968)
--- trunk/Source/WebCore/ChangeLog 2015-01-06 18:46:15 UTC (rev 177967)
+++ trunk/Source/WebCore/ChangeLog 2015-01-06 19:00:30 UTC (rev 177968)
@@ -1,3 +1,14 @@
+2015-01-06 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Fix iOS build after r177955 and r177952.
+
+ Unreviewed.
+
+ * html/parser/HTMLTreeBuilder.cpp:
+ (WebCore::HTMLTreeBuilder::insertPhoneNumberLink):
+ * platform/graphics/mac/ComplexTextController.cpp:
+ (WebCore::ComplexTextController::adjustGlyphsAndAdvances):
+
2015-01-06 Anders Carlsson <ander...@apple.com>
Remove now unused IndexedDB code
Modified: trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp (177967 => 177968)
--- trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2015-01-06 18:46:15 UTC (rev 177967)
+++ trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2015-01-06 19:00:30 UTC (rev 177968)
@@ -2283,7 +2283,7 @@
attributes.append(Attribute(HTMLNames::hrefAttr, ASCIILiteral("tel:") + string));
const AtomicString& aTagLocalName = aTag.localName();
- AtomicHTMLToken aStartToken(HTMLToken::StartTag, aTagLocalName, attributes);
+ AtomicHTMLToken aStartToken(HTMLToken::StartTag, aTagLocalName, WTF::move(attributes));
AtomicHTMLToken aEndToken(HTMLToken::EndTag, aTagLocalName);
processStartTag(aStartToken);
Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp (177967 => 177968)
--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp 2015-01-06 18:46:15 UTC (rev 177967)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp 2015-01-06 19:00:30 UTC (rev 177968)
@@ -620,7 +620,7 @@
CGSize advance = treatAsSpace ? CGSizeMake(spaceWidth, advances[i].height) : advances[i];
#if PLATFORM(IOS)
if (isEmoji && advance.width)
- advance.width = fontData->widthForGlyph(glyph);
+ advance.width = fontData.widthForGlyph(glyph);
#endif
if (ch == '\t' && m_run.allowTabs())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
