Changeset 195237 in webkit

Timestamp:

Jan 18, 2016 1:27:53 PM (8 years ago)

Author:

Simon Fraser

Message:

Add TextStream-based logging for Position and VisiblePosition
​https://bugs.webkit.org/show_bug.cgi?id=153195

Reviewed by Ryosuke Niwa.

Make it easy to dump Positions and VisiblePositions with a TextStream.

• dom/Position.cpp:

(WebCore::operator<<):

• dom/Position.h:
• editing/VisiblePosition.cpp:

(WebCore::operator<<):

• editing/VisiblePosition.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Position.cpp (modified) (2 diffs)
• dom/Position.h (modified) (2 diffs)
• editing/VisiblePosition.cpp (modified) (2 diffs)
• editing/VisiblePosition.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-18  Simon Fraser  <simon.fraser@apple.com>
+
+        Add TextStream-based logging for Position and VisiblePosition
+        https://bugs.webkit.org/show_bug.cgi?id=153195
+
+        Reviewed by Ryosuke Niwa.
+
+        Make it easy to dump Positions and VisiblePositions with a TextStream.
+
+        * dom/Position.cpp:
+        (WebCore::operator<<):
+        * dom/Position.h:
+        * editing/VisiblePosition.cpp:
+        (WebCore::operator<<):
+        * editing/VisiblePosition.h:
+
 2016-01-18  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/dom/Position.cpp

@@ -45 +45 @@
 #include "Text.h"
 #include "TextIterator.h"
+#include "TextStream.h"
 #include "VisiblePosition.h"
 #include "VisibleUnits.h"
@@ -1550 +1551 @@
 }
 
+static TextStream& operator<<(TextStream& stream, Position::AnchorType anchorType)
+{
+    switch (anchorType) {
+    case Position::PositionIsOffsetInAnchor:
+        stream << "offset in anchor";
+        break;
+    case Position::PositionIsBeforeAnchor:
+        stream << "before anchor";
+        break;
+    case Position::PositionIsAfterAnchor:
+        stream << "after anchor";
+        break;
+    case Position::PositionIsBeforeChildren:
+        stream << "before children";
+        break;
+    case Position::PositionIsAfterChildren:
+        stream << "after children";
+        break;
+    }
+    return stream;
+}
+
+TextStream& operator<<(TextStream& stream, const Position& position)
+{
+    TextStream::GroupScope scope(stream);
+    stream << "Position " << &position;
+
+    stream.dumpProperty("anchor node", position.anchorNode());
+    stream.dumpProperty("offset", position.offsetInContainerNode());
+    stream.dumpProperty("anchor type", position.anchorType());
+
+    return stream;
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/dom/Position.h

@@ -45 +45 @@
 class RenderObject;
 class Text;
+class TextStream;
 
 enum PositionMoveType {
@@ -344 +345 @@
 }
 
+TextStream& operator<<(TextStream&, const Position&);
+
 } // namespace WebCore
 

trunk/Source/WebCore/editing/VisiblePosition.cpp

@@ -38 +38 @@
 #include "RootInlineBox.h"
 #include "Text.h"
+#include "TextStream.h"
 #include "VisibleUnits.h"
 #include "htmlediting.h"
@@ -749 +750 @@
 }
 
+TextStream& operator<<(TextStream& stream, EAffinity affinity)
+{
+    switch (affinity) {
+    case UPSTREAM:
+        stream << "upstream";
+        break;
+    case DOWNSTREAM:
+        stream << "downstream";
+        break;
+    }
+    return stream;
+}
+
+TextStream& operator<<(TextStream& stream, const VisiblePosition& visiblePosition)
+{
+    TextStream::GroupScope scope(stream);
+    stream << "VisiblePosition " << &visiblePosition;
+
+    stream.dumpProperty("position", visiblePosition.deepEquivalent());
+    stream.dumpProperty("affinity", visiblePosition.affinity());
+
+    return stream;
+}
+
 }  // namespace WebCore
 

trunk/Source/WebCore/editing/VisiblePosition.h

@@ -48 +48 @@
 class InlineBox;
 class Node;
+class TextStream;
 
 class VisiblePosition {
@@ -164 +165 @@
 bool isLastVisiblePositionInNode(const VisiblePosition&, const Node*);
 
+TextStream& operator<<(TextStream&, EAffinity);
+TextStream& operator<<(TextStream&, const VisiblePosition&);
+
 } // namespace WebCore