[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:43:16 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit b3186b20c70d623f26bef45f68e1e51254f6f8cd
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jun 2 14:42:57 2004 +0000
Reviewed by me
Finish off name change from previous check-in by changing dom_edititerator
file names to dom_positioniterator. Files copied and renamed in repository.
Includes updated as needed.
* ForwardingHeaders/xml/dom_edititerator.h: Removed.
* ForwardingHeaders/xml/dom_positioniterator.h: Added.
* WebCore.pbproj/project.pbxproj:
* khtml/editing/htmlediting_impl.cpp:
* khtml/xml/dom_edititerator.cpp: Removed.
* khtml/xml/dom_edititerator.h: Removed.
* khtml/xml/dom_position.cpp:
* khtml/xml/dom_positioniterator.cpp: Added.
(DOM::PositionIterator::peekPrevious):
(DOM::PositionIterator::peekNext):
(DOM::PositionIterator::atStart):
(DOM::PositionIterator::atEnd):
* khtml/xml/dom_positioniterator.h: Added.
(DOM::PositionIterator::PositionIterator):
(DOM::PositionIterator::current):
(DOM::PositionIterator::previous):
(DOM::PositionIterator::next):
(DOM::PositionIterator::setPosition):
(DOM::PositionIterator::isEmpty):
* khtml/xml/dom_selection.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6744 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 1a2800a..abf90fb 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,34 @@
2004-06-02 Ken Kocienda <kocienda at apple.com>
+ Reviewed by me
+
+ Finish off name change from previous check-in by changing dom_edititerator
+ file names to dom_positioniterator. Files copied and renamed in repository.
+ Includes updated as needed.
+
+ * ForwardingHeaders/xml/dom_edititerator.h: Removed.
+ * ForwardingHeaders/xml/dom_positioniterator.h: Added.
+ * WebCore.pbproj/project.pbxproj:
+ * khtml/editing/htmlediting_impl.cpp:
+ * khtml/xml/dom_edititerator.cpp: Removed.
+ * khtml/xml/dom_edititerator.h: Removed.
+ * khtml/xml/dom_position.cpp:
+ * khtml/xml/dom_positioniterator.cpp: Added.
+ (DOM::PositionIterator::peekPrevious):
+ (DOM::PositionIterator::peekNext):
+ (DOM::PositionIterator::atStart):
+ (DOM::PositionIterator::atEnd):
+ * khtml/xml/dom_positioniterator.h: Added.
+ (DOM::PositionIterator::PositionIterator):
+ (DOM::PositionIterator::current):
+ (DOM::PositionIterator::previous):
+ (DOM::PositionIterator::next):
+ (DOM::PositionIterator::setPosition):
+ (DOM::PositionIterator::isEmpty):
+ * khtml/xml/dom_selection.cpp:
+
+2004-06-02 Ken Kocienda <kocienda at apple.com>
+
Reviewed by Darin
Probable fix for this bug:
diff --git a/WebCore/ForwardingHeaders/xml/dom_edititerator.h b/WebCore/ForwardingHeaders/xml/dom_edititerator.h
deleted file mode 100644
index 3acedfc..0000000
--- a/WebCore/ForwardingHeaders/xml/dom_edititerator.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <dom_edititerator.h>
diff --git a/WebCore/ForwardingHeaders/xml/dom_positioniterator.h b/WebCore/ForwardingHeaders/xml/dom_positioniterator.h
new file mode 100644
index 0000000..1596933
--- /dev/null
+++ b/WebCore/ForwardingHeaders/xml/dom_positioniterator.h
@@ -0,0 +1 @@
+#include <dom_positioniterator.h>
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index fce6f49..d0ae7e9 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -521,7 +521,6 @@
9321275C0606724900B62302,
9321275D0606724900B62302,
BE91FC8D06133666005E3790,
- BE91FC9206133697005E3790,
832556E5061DF155007B8054,
BC86FB8F061F5C23006BB822,
BE8BD8F506359F6000D3F20B,
@@ -533,6 +532,7 @@
51F6A3D80663BF04004D2919,
51F6A3E00663C2EC004D2919,
2D90660D0665D937006B6F1A,
+ BE02F484066E1C550013A9F6,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -805,7 +805,6 @@
BE9CB65A05F9546800514D9C,
BEF7EEA305FF8F0D009717EE,
BE91FC8E06133666005E3790,
- BE91FC9106133697005E3790,
832556E7061DF161007B8054,
BC86FB90061F5C23006BB822,
BE8BD8F406359F6000D3F20B,
@@ -816,6 +815,7 @@
51F6A3D70663BF04004D2919,
51F6A3DF0663C2EC004D2919,
2D90660E0665D937006B6F1A,
+ BE02F485066E1C550013A9F6,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -2847,6 +2847,34 @@
//BE2
//BE3
//BE4
+ BE02F482066E1C550013A9F6 = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ path = dom_positioniterator.h;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ BE02F483066E1C550013A9F6 = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.cpp.cpp;
+ path = dom_positioniterator.cpp;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ BE02F484066E1C550013A9F6 = {
+ fileRef = BE02F482066E1C550013A9F6;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ BE02F485066E1C550013A9F6 = {
+ fileRef = BE02F483066E1C550013A9F6;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
BE16801805EDB91A00B87935 = {
fileEncoding = 30;
isa = PBXFileReference;
@@ -3036,34 +3064,6 @@
settings = {
};
};
- BE91FC8F06133697005E3790 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- lastKnownFileType = sourcecode.cpp.cpp;
- path = dom_edititerator.cpp;
- refType = 4;
- sourceTree = "<group>";
- };
- BE91FC9006133697005E3790 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- lastKnownFileType = sourcecode.c.h;
- path = dom_edititerator.h;
- refType = 4;
- sourceTree = "<group>";
- };
- BE91FC9106133697005E3790 = {
- fileRef = BE91FC8F06133697005E3790;
- isa = PBXBuildFile;
- settings = {
- };
- };
- BE91FC9206133697005E3790 = {
- fileRef = BE91FC9006133697005E3790;
- isa = PBXBuildFile;
- settings = {
- };
- };
BE94EB6305EFFE6B0032DCB5 = {
fileEncoding = 30;
isa = PBXFileReference;
@@ -6562,8 +6562,6 @@
BC3B364705C9D5E200E42902,
F523D2F402DE4476018635CA,
F523D2F502DE4476018635CA,
- BE91FC8F06133697005E3790,
- BE91FC9006133697005E3790,
F523D2F702DE4476018635CA,
F523D2F802DE4476018635CA,
BC7E782005C5EB700088A50F,
@@ -6571,6 +6569,8 @@
F523D2FA02DE4476018635CA,
BE91FC8B06133666005E3790,
BE91FC8C06133666005E3790,
+ BE02F482066E1C550013A9F6,
+ BE02F483066E1C550013A9F6,
BE8BD9080635CC2F00D3F20B,
BE8BD9090635CC2F00D3F20B,
F523D2FB02DE4476018635CA,
diff --git a/WebCore/khtml/editing/SelectionController.cpp b/WebCore/khtml/editing/SelectionController.cpp
index bef0558..98fa08d 100644
--- a/WebCore/khtml/editing/SelectionController.cpp
+++ b/WebCore/khtml/editing/SelectionController.cpp
@@ -38,7 +38,7 @@
#include "rendering/render_style.h"
#include "rendering/render_text.h"
#include "xml/dom_docimpl.h"
-#include "xml/dom_edititerator.h"
+#include "xml/dom_positioniterator.h"
#include "xml/dom_elementimpl.h"
#include "xml/dom_nodeimpl.h"
#include "xml/dom_textimpl.h"
diff --git a/WebCore/khtml/editing/htmlediting_impl.cpp b/WebCore/khtml/editing/htmlediting_impl.cpp
index 1ebb1eb..58335d3 100644
--- a/WebCore/khtml/editing/htmlediting_impl.cpp
+++ b/WebCore/khtml/editing/htmlediting_impl.cpp
@@ -41,7 +41,7 @@
#include "rendering/render_text.h"
#include "xml/dom_docimpl.h"
#include "xml/dom_elementimpl.h"
-#include "xml/dom_edititerator.h"
+#include "xml/dom_positioniterator.h"
#include "xml/dom_nodeimpl.h"
#include "xml/dom_selection.h"
#include "xml/dom_stringimpl.h"
diff --git a/WebCore/khtml/editing/selection.cpp b/WebCore/khtml/editing/selection.cpp
index bef0558..98fa08d 100644
--- a/WebCore/khtml/editing/selection.cpp
+++ b/WebCore/khtml/editing/selection.cpp
@@ -38,7 +38,7 @@
#include "rendering/render_style.h"
#include "rendering/render_text.h"
#include "xml/dom_docimpl.h"
-#include "xml/dom_edititerator.h"
+#include "xml/dom_positioniterator.h"
#include "xml/dom_elementimpl.h"
#include "xml/dom_nodeimpl.h"
#include "xml/dom_textimpl.h"
diff --git a/WebCore/khtml/xml/dom_edititerator.cpp b/WebCore/khtml/xml/dom_edititerator.cpp
deleted file mode 100644
index 87d4698..0000000
--- a/WebCore/khtml/xml/dom_edititerator.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "dom_edititerator.h"
-
-#include "dom_nodeimpl.h"
-
-namespace DOM {
-
-Position PositionIterator::peekPrevious() const
-{
- Position pos = m_current;
-
- if (pos.isEmpty())
- return pos;
-
- if (pos.offset() <= 0) {
- NodeImpl *prevNode = pos.node()->previousLeafNode();
- if (prevNode)
- pos = Position(prevNode, prevNode->maxOffset());
- }
- else {
- pos = Position(pos.node(), pos.offset() - 1);
- }
-
- return pos;
-}
-
-Position PositionIterator::peekNext() const
-{
- Position pos = m_current;
-
- if (pos.isEmpty())
- return pos;
-
- if (pos.offset() >= pos.node()->maxOffset()) {
- NodeImpl *nextNode = pos.node()->nextLeafNode();
- if (nextNode)
- pos = Position(nextNode, 0);
- }
- else {
- pos = Position(pos.node(), pos.offset() + 1);
- }
-
- return pos;
-}
-
-bool PositionIterator::atStart() const
-{
- if (m_current.isEmpty())
- return true;
-
- return m_current.offset() == 0 &&
- m_current.node()->previousLeafNode() == 0;
-}
-
-bool PositionIterator::atEnd() const
-{
- if (m_current.isEmpty())
- return true;
-
- return m_current.offset() == m_current.node()->maxOffset() &&
- m_current.node()->nextLeafNode() == 0;
-}
-
-} // namespace DOM
diff --git a/WebCore/khtml/xml/dom_edititerator.h b/WebCore/khtml/xml/dom_edititerator.h
deleted file mode 100644
index 6650754..0000000
--- a/WebCore/khtml/xml/dom_edititerator.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _PositionIterator_h_
-#define _PositionIterator_h_
-
-#include "dom_position.h"
-
-namespace DOM {
-
-class NodeImpl;
-class Position;
-
-class PositionIterator
-{
-public:
- PositionIterator() : m_current() {}
- PositionIterator(NodeImpl *node, long offset) : m_current(node, offset) {}
- PositionIterator(const Position &o) : m_current(o) {}
-
- Position current() const { return m_current; }
- Position previous() { return m_current = peekPrevious(); }
- Position next() { return m_current = peekNext(); }
- Position peekPrevious() const;
- Position peekNext() const;
-
- void setPosition(const Position &pos) { m_current = pos; }
-
- bool atStart() const;
- bool atEnd() const;
- bool isEmpty() const { return m_current.isEmpty(); }
-
-private:
- Position m_current;
-};
-
-} // namespace DOM
-
-#endif // _PositionIterator_h_
diff --git a/WebCore/khtml/xml/dom_position.cpp b/WebCore/khtml/xml/dom_position.cpp
index 059bd2b..3773284 100644
--- a/WebCore/khtml/xml/dom_position.cpp
+++ b/WebCore/khtml/xml/dom_position.cpp
@@ -33,7 +33,7 @@
#include "rendering/render_object.h"
#include "rendering/render_style.h"
#include "rendering/render_text.h"
-#include "xml/dom_edititerator.h"
+#include "xml/dom_positioniterator.h"
#include "xml/dom_elementimpl.h"
#include "xml/dom_nodeimpl.h"
diff --git a/WebCore/khtml/xml/dom_positioniterator.cpp b/WebCore/khtml/xml/dom_positioniterator.cpp
index 87d4698..5b47f51 100644
--- a/WebCore/khtml/xml/dom_positioniterator.cpp
+++ b/WebCore/khtml/xml/dom_positioniterator.cpp
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "dom_edititerator.h"
+#include "dom_positioniterator.h"
#include "dom_nodeimpl.h"
diff --git a/WebCore/khtml/xml/dom_selection.cpp b/WebCore/khtml/xml/dom_selection.cpp
index bef0558..98fa08d 100644
--- a/WebCore/khtml/xml/dom_selection.cpp
+++ b/WebCore/khtml/xml/dom_selection.cpp
@@ -38,7 +38,7 @@
#include "rendering/render_style.h"
#include "rendering/render_text.h"
#include "xml/dom_docimpl.h"
-#include "xml/dom_edititerator.h"
+#include "xml/dom_positioniterator.h"
#include "xml/dom_elementimpl.h"
#include "xml/dom_nodeimpl.h"
#include "xml/dom_textimpl.h"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list