[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
jianli at chromium.org
jianli at chromium.org
Wed Dec 22 18:32:18 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 8055f5196c81f7e1c78b3411c88101c7b6b90268
Author: jianli at chromium.org <jianli at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Dec 13 20:20:52 2010 +0000
Unreviewed, rolling out r73923.
http://trac.webkit.org/changeset/73923
https://bugs.webkit.org/show_bug.cgi?id=50944
Patch by Sheriff Bot <webkit.review.bot at gmail.com> on 2010-12-13
Broke editing/selection/extend-selection-home-end.html on non-
mac platforms. Looks like a real bug. (Requested by ojan on
WebCore:
* editing/SelectionController.cpp:
(WebCore::SelectionController::positionForPlatform):
(WebCore::SelectionController::modifyExtendingForward):
LayoutTests:
* editing/selection/extend-to-line-boundary-expected.txt: Removed.
* editing/selection/extend-to-line-boundary.html: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73942 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 8c78220..5b392d6 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-13 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r73923.
+ http://trac.webkit.org/changeset/73923
+ https://bugs.webkit.org/show_bug.cgi?id=50944
+
+ Broke editing/selection/extend-selection-home-end.html on non-
+ mac platforms. Looks like a real bug. (Requested by ojan on
+ #webkit).
+
+ * editing/selection/extend-to-line-boundary-expected.txt: Removed.
+ * editing/selection/extend-to-line-boundary.html: Removed.
+
2010-12-13 Yury Semikhatsky <yurys at chromium.org>
Unreviewed. Rollout 73914, 73915, 73917, 73920 and 73921.
diff --git a/LayoutTests/editing/selection/extend-to-line-boundary-expected.txt b/LayoutTests/editing/selection/extend-to-line-boundary-expected.txt
index 884b167..e69de29 100644
--- a/LayoutTests/editing/selection/extend-to-line-boundary-expected.txt
+++ b/LayoutTests/editing/selection/extend-to-line-boundary-expected.txt
@@ -1,4 +0,0 @@
-Tests selecting from the start of a line to the end using lineboundary
-| "
-Lorem ipsum dolor sit amet, <#selection-anchor>consectetur adipisicing elit, sed <#selection-focus>do eiusmod tempor incididunt ut labore et dolore magna aliqua.
-"
diff --git a/LayoutTests/editing/selection/extend-to-line-boundary.html b/LayoutTests/editing/selection/extend-to-line-boundary.html
index 9dc31a7..e69de29 100644
--- a/LayoutTests/editing/selection/extend-to-line-boundary.html
+++ b/LayoutTests/editing/selection/extend-to-line-boundary.html
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-
-<style>
- #textContainer {
- width: 200px;
- }
-</style>
-
-<div contenteditable id="textContainer">
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
-</div>
-
-<script src="../../resources/dump-as-markup.js"></script>
-<script>
- textContainer = document.getElementById("textContainer");
- text = textContainer.childNodes[0];
-
- getSelection().setBaseAndExtent(text, 0);
- getSelection().modify("move", "forward", "line");
- getSelection().modify("extend", "forward", "lineboundary");
-
- Markup.description("Tests selecting from the start of a line to the end using lineboundary");
- Markup.dump(textContainer);
-</script>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 89d885c..c16eeac 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-12-13 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r73923.
+ http://trac.webkit.org/changeset/73923
+ https://bugs.webkit.org/show_bug.cgi?id=50944
+
+ Broke editing/selection/extend-selection-home-end.html on non-
+ mac platforms. Looks like a real bug. (Requested by ojan on
+ #webkit).
+
+ * editing/SelectionController.cpp:
+ (WebCore::SelectionController::positionForPlatform):
+ (WebCore::SelectionController::modifyExtendingForward):
+
2010-12-13 David Hyatt <hyatt at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebCore/editing/SelectionController.cpp b/WebCore/editing/SelectionController.cpp
index 3cc8859..bc00442 100644
--- a/WebCore/editing/SelectionController.cpp
+++ b/WebCore/editing/SelectionController.cpp
@@ -302,17 +302,19 @@ TextDirection SelectionController::directionOfEnclosingBlock()
VisiblePosition SelectionController::positionForPlatform(bool isGetStart) const
{
+ Position pos;
Settings* settings = m_frame ? m_frame->settings() : 0;
if (settings && settings->editingBehaviorType() == EditingMacBehavior)
- return isGetStart ? m_selection.visibleStart() : m_selection.visibleEnd();
+ pos = isGetStart ? m_selection.start() : m_selection.end();
else {
// Linux and Windows always extend selections from the extent endpoint.
// FIXME: VisibleSelection should be fixed to ensure as an invariant that
// base/extent always point to the same nodes as start/end, but which points
// to which depends on the value of isBaseFirst. Then this can be changed
// to just return m_sel.extent().
- return m_selection.isBaseFirst() ? m_selection.visibleEnd() : m_selection.visibleStart();
+ pos = m_selection.isBaseFirst() ? m_selection.end() : m_selection.start();
}
+ return VisiblePosition(pos, m_selection.affinity());
}
VisiblePosition SelectionController::startForPlatform() const
@@ -383,7 +385,9 @@ VisiblePosition SelectionController::modifyExtendingForward(TextGranularity gran
pos = endOfSentence(endForPlatform());
break;
case LineBoundary:
- pos = logicalEndOfLine(endForPlatform());
+ pos = endForPlatform();
+ pos.setAffinity(UPSTREAM);
+ pos = logicalEndOfLine(pos);
break;
case ParagraphBoundary:
pos = endOfParagraph(endForPlatform());
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list