Title: [157426] trunk/Source/WebCore
- Revision
- 157426
- Author
- [email protected]
- Date
- 2013-10-14 16:17:59 -0700 (Mon, 14 Oct 2013)
Log Message
Build fix after r157366
http://bugs.webkit.org/show_bug.cgi?id=122783
When TOUCH_AJUSTMENT is enabled build fails due to some
refactors in TextRender functions.
Patch by Nick Diego Yamane <[email protected]> on 2013-10-14
Reviewed by Anders Carlsson.
* page/TouchAdjustment.cpp:
(WebCore::TouchAdjustment::appendContextSubtargetsForNode):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (157425 => 157426)
--- trunk/Source/WebCore/ChangeLog 2013-10-14 23:08:37 UTC (rev 157425)
+++ trunk/Source/WebCore/ChangeLog 2013-10-14 23:17:59 UTC (rev 157426)
@@ -1,3 +1,16 @@
+2013-10-14 Nick Diego Yamane <[email protected]>
+
+ Build fix after r157366
+ http://bugs.webkit.org/show_bug.cgi?id=122783
+
+ When TOUCH_AJUSTMENT is enabled build fails due to some
+ refactors in TextRender functions.
+
+ Reviewed by Anders Carlsson.
+
+ * page/TouchAdjustment.cpp:
+ (WebCore::TouchAdjustment::appendContextSubtargetsForNode):
+
2013-10-14 Alexandru Chiculita <[email protected]>
The content of the DOM panel for iframes is not updated until the "onload" event
Modified: trunk/Source/WebCore/page/TouchAdjustment.cpp (157425 => 157426)
--- trunk/Source/WebCore/page/TouchAdjustment.cpp 2013-10-14 23:08:37 UTC (rev 157425)
+++ trunk/Source/WebCore/page/TouchAdjustment.cpp 2013-10-14 23:17:59 UTC (rev 157426)
@@ -157,7 +157,7 @@
return appendBasicSubtargetsForNode(node, subtargets);
Text* textNode = static_cast<WebCore::Text*>(node);
- RenderText* textRenderer = static_cast<RenderText*>(textNode->renderer());
+ RenderText* textRenderer = textNode->renderer();
if (textRenderer->frame().editor().behavior().shouldSelectOnContextualMenuClick()) {
// Make subtargets out of every word.
@@ -169,8 +169,7 @@
int offset;
while ((offset = textBreakNext(wordIterator)) != -1) {
if (isWordTextBreak(wordIterator)) {
- Vector<FloatQuad> quads;
- textRenderer->absoluteQuadsForRange(quads, lastOffset, offset);
+ Vector<FloatQuad> quads = textRenderer->absoluteQuadsForRange(lastOffset, offset);
appendQuadsToSubtargetList(quads, textNode, subtargets);
}
lastOffset = offset;
@@ -200,8 +199,7 @@
ASSERT_NOT_REACHED();
return;
}
- Vector<FloatQuad> quads;
- textRenderer->absoluteQuadsForRange(quads, startPos, endPos);
+ Vector<FloatQuad> quads = textRenderer->absoluteQuadsForRange(startPos, endPos);
appendQuadsToSubtargetList(quads, textNode, subtargets);
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
