[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andreas.kling at nokia.com
andreas.kling at nokia.com
Wed Dec 22 12:56:25 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit d394d8bed210e67f37a3cabc903443a3186cc7e7
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 2 11:45:15 2010 +0000
2010-09-02 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r66655.
http://trac.webkit.org/changeset/66655
https://bugs.webkit.org/show_bug.cgi?id=45104
broke some editing tests (Requested by kling on #webkit).
* page/DOMSelection.cpp:
(WebCore::DOMSelection::collapse):
(WebCore::DOMSelection::selectAllChildren):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66661 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index dc0fe31..99a1f03 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,17 @@
2010-09-02 Sheriff Bot <webkit.review.bot at gmail.com>
+ Unreviewed, rolling out r66655.
+ http://trac.webkit.org/changeset/66655
+ https://bugs.webkit.org/show_bug.cgi?id=45104
+
+ broke some editing tests (Requested by kling on #webkit).
+
+ * page/DOMSelection.cpp:
+ (WebCore::DOMSelection::collapse):
+ (WebCore::DOMSelection::selectAllChildren):
+
+2010-09-02 Sheriff Bot <webkit.review.bot at gmail.com>
+
Unreviewed, rolling out r66649.
http://trac.webkit.org/changeset/66649
https://bugs.webkit.org/show_bug.cgi?id=45103
diff --git a/WebCore/page/DOMSelection.cpp b/WebCore/page/DOMSelection.cpp
index 0412be7..6c25103 100644
--- a/WebCore/page/DOMSelection.cpp
+++ b/WebCore/page/DOMSelection.cpp
@@ -200,22 +200,14 @@ int DOMSelection::rangeCount() const
void DOMSelection::collapse(Node* node, int offset, ExceptionCode& ec)
{
- Document* selectionDocument = m_frame ? m_frame->document() : 0;
- Document* nodeDocument = node ? node->document() : 0;
-
- if (selectionDocument != nodeDocument) {
- ec = WRONG_DOCUMENT_ERR;
+ if (!m_frame)
return;
- }
if (offset < 0) {
ec = INDEX_SIZE_ERR;
return;
}
- if (!m_frame)
- return;
-
if (!isValidForPosition(node))
return;
@@ -496,13 +488,6 @@ void DOMSelection::selectAllChildren(Node* n, ExceptionCode& ec)
if (!n)
return;
- Document* selectionDocument = m_frame ? m_frame->document() : 0;
-
- if (selectionDocument != n->document()) {
- ec = WRONG_DOCUMENT_ERR;
- return;
- }
-
// This doesn't (and shouldn't) select text node characters.
setBaseAndExtent(n, 0, n, n->childNodeCount(), ec);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list