diff options
author | Ben Murdoch <benm@google.com> | 2009-08-11 17:01:47 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2009-08-11 18:21:02 +0100 |
commit | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch) | |
tree | 2943df35f62d885c89d01063cc528dd73b480fea /WebCore/dom/RangeBoundaryPoint.h | |
parent | 7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff) | |
download | external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2 |
Merge in WebKit r47029.
Diffstat (limited to 'WebCore/dom/RangeBoundaryPoint.h')
-rw-r--r-- | WebCore/dom/RangeBoundaryPoint.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/WebCore/dom/RangeBoundaryPoint.h b/WebCore/dom/RangeBoundaryPoint.h index 2fda51f..1bbbe1a 100644 --- a/WebCore/dom/RangeBoundaryPoint.h +++ b/WebCore/dom/RangeBoundaryPoint.h @@ -33,7 +33,6 @@ namespace WebCore { class RangeBoundaryPoint { public: - RangeBoundaryPoint(); explicit RangeBoundaryPoint(PassRefPtr<Node> container); const Position toPosition() const; @@ -63,17 +62,12 @@ private: Node* m_childBeforeBoundary; }; -inline RangeBoundaryPoint::RangeBoundaryPoint() - : m_offsetInContainer(0) - , m_childBeforeBoundary(0) -{ -} - inline RangeBoundaryPoint::RangeBoundaryPoint(PassRefPtr<Node> container) : m_containerNode(container) , m_offsetInContainer(0) , m_childBeforeBoundary(0) { + ASSERT(m_containerNode); } inline Node* RangeBoundaryPoint::container() const @@ -116,6 +110,7 @@ inline void RangeBoundaryPoint::clear() inline void RangeBoundaryPoint::set(PassRefPtr<Node> container, int offset, Node* childBefore) { + ASSERT(container); ASSERT(offset >= 0); ASSERT(childBefore == (offset ? container->childNode(offset - 1) : 0)); m_containerNode = container; |