Title: [167809] trunk/Source/WebCore
- Revision
- 167809
- Author
- [email protected]
- Date
- 2014-04-25 10:53:32 -0700 (Fri, 25 Apr 2014)
Log Message
iOS build fix after http://trac.webkit.org/changeset/167803
Unreviewed.
* page/Frame.cpp:
(WebCore::Frame::checkOverflowScroll):
* rendering/RenderBlock.cpp:
(WebCore::positionForPointRespectingEditingBoundaries):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (167808 => 167809)
--- trunk/Source/WebCore/ChangeLog 2014-04-25 16:21:38 UTC (rev 167808)
+++ trunk/Source/WebCore/ChangeLog 2014-04-25 17:53:32 UTC (rev 167809)
@@ -1,3 +1,13 @@
+2014-04-25 Enrica Casucci <[email protected]>
+
+ iOS build fix after http://trac.webkit.org/changeset/167803
+ Unreviewed.
+
+ * page/Frame.cpp:
+ (WebCore::Frame::checkOverflowScroll):
+ * rendering/RenderBlock.cpp:
+ (WebCore::positionForPointRespectingEditingBoundaries):
+
2014-04-24 David Hyatt <[email protected]>
[New Multicolumn] Add support for offsetLeft and offsetTop.
Modified: trunk/Source/WebCore/page/Frame.cpp (167808 => 167809)
--- trunk/Source/WebCore/page/Frame.cpp 2014-04-25 16:21:38 UTC (rev 167808)
+++ trunk/Source/WebCore/page/Frame.cpp 2014-04-25 17:53:32 UTC (rev 167809)
@@ -625,7 +625,7 @@
layer->scrollToOffset(IntSize(layer->scrollXOffset() + deltaX, layer->scrollYOffset() + deltaY));
// Handle making selection.
- VisiblePosition visiblePosition(renderer->positionForPoint(selectionPosition));
+ VisiblePosition visiblePosition(renderer->positionForPoint(selectionPosition, nullptr));
if (visiblePosition.isNotNull()) {
VisibleSelection visibleSelection = selection().selection();
visibleSelection.setExtent(visiblePosition);
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (167808 => 167809)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-04-25 16:21:38 UTC (rev 167808)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-04-25 17:53:32 UTC (rev 167809)
@@ -3169,11 +3169,11 @@
#if PLATFORM(IOS)
// On iOS we want to constrain VisiblePositions to the editable region closest to the input position, so
- // we will allow descent from non-edtiable to editable content.
+ // we will allow descent from non-editable to editable content.
// FIXME: This constraining must be done at a higher level once we implement contentEditable. For now, if something
// is editable, the whole document will be.
if (childElement->isContentEditable() && !ancestor->element()->isContentEditable())
- return child.positionForPoint(pointInChildCoordinates);
+ return child.positionForPoint(pointInChildCoordinates, nullptr);
#endif
// Otherwise return before or after the child, depending on if the click was to the logical left or logical right of the child
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
