Oilpan: add Element/Node Member fields to stack allocated objects.

Source/core/editing/TextIterator.h

 /*
  * Copyright (C) 2004, 2006, 2009 Apple 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
@@ skipping 56 matching lines @@
 private:
     unsigned m_size;
     Vector<unsigned, 1> m_words;
 };
 
 // Iterates through the DOM range, returning all the text, and 0-length boundaries
 // at points where replaced elements break up the text flow.  The text comes back in
 // chunks so as to optimize for performance of the iteration.
 
 class TextIterator {
+    STACK_ALLOCATED();
 public:
     explicit TextIterator(const Range*, TextIteratorBehaviorFlags = TextIteratorDefaultBehavior);
     // [start, end] indicates the document range that the iteration should take place within (both ends inclusive).
     TextIterator(const Position& start, const Position& end, TextIteratorBehaviorFlags = TextIteratorDefaultBehavior);
     ~TextIterator();
 
     bool atEnd() const { return !m_positionNode || m_shouldStop; }
     void advance();
 
     int length() const { return m_textLength; }
@@ skipping 45 matching lines @@
     bool handleNonTextNode();
     void handleTextBox();
     void handleTextNodeFirstLetter(RenderTextFragment*);
     bool hasVisibleTextNode(RenderText*);
     void emitCharacter(UChar, Node* textNode, Node* offsetBaseNode, int textStartOffset, int textEndOffset);
     void emitText(Node* textNode, RenderObject* renderObject, int textStartOffset, int textEndOffset);
     void emitText(Node* textNode, int textStartOffset, int textEndOffset);
 
     // Current position, not necessarily of the text being returned, but position
     // as we walk through the DOM tree.
-    Node* m_node;
+    RawPtrWillBeMember<Node> m_node;
     int m_offset;
     IterationProgress m_iterationProgress;
     BitStack m_fullyClippedStack;
     int m_shadowDepth;
 
     // The range.
-    Node* m_startContainer;
+    RawPtrWillBeMember<Node> m_startContainer;
     int m_startOffset;
-    Node* m_endContainer;
+    RawPtrWillBeMember<Node> m_endContainer;
     int m_endOffset;
-    Node* m_pastEndNode;
+    RawPtrWillBeMember<Node> m_pastEndNode;
 
     // The current text and its position, in the form to be returned from the iterator.
-    Node* m_positionNode;
-    mutable Node* m_positionOffsetBaseNode;
+    RawPtrWillBeMember<Node> m_positionNode;
+    mutable RawPtrWillBeMember<Node> m_positionOffsetBaseNode;
     mutable int m_positionStartOffset;
     mutable int m_positionEndOffset;
     int m_textLength;
     String m_text;
 
     // Used when there is still some pending text from the current node; when these
     // are false and 0, we go back to normal iterating.
     bool m_needsAnotherNewline;
     InlineTextBox* m_textBox;
     // Used when iteration over :first-letter text to save pointer to
     // remaining text box.
     InlineTextBox* m_remainingTextBox;
     // Used to point to RenderText object for :first-letter.
     RenderText *m_firstLetterText;
 
     // Used to do the whitespace collapsing logic.
-    Node* m_lastTextNode;
+    RawPtrWillBeMember<Node> m_lastTextNode;
     bool m_lastTextNodeEndedWithCollapsedSpace;
     UChar m_lastCharacter;
 
     // Used for whitespace characters that aren't in the DOM, so we can point at them.
     // If non-zero, overrides m_text.
     UChar m_singleCharacterBuffer;
 
     // Used when text boxes are out of order (Hebrew/Arabic w/ embeded LTR text)
     Vector<InlineTextBox*> m_sortedTextBoxes;
     size_t m_sortedTextBoxesPosition;
@@ skipping 21 matching lines @@
 
     bool m_emitsImageAltText;
 
     bool m_entersAuthorShadowRoots;
 };
 
 // Iterates through the DOM range, returning all the text, and 0-length boundaries
 // at points where replaced elements break up the text flow. The text comes back in
 // chunks so as to optimize for performance of the iteration.
 class SimplifiedBackwardsTextIterator {
+    STACK_ALLOCATED();
 public:
     explicit SimplifiedBackwardsTextIterator(const Range*, TextIteratorBehaviorFlags = TextIteratorDefaultBehavior);
 
     bool atEnd() const { return !m_positionNode || m_shouldStop; }
     void advance();
 
     int length() const { return m_textLength; }
 
     Node* node() const { return m_node; }
 
@@ skipping 14 matching lines @@
     void exitNode();
     bool handleTextNode();
     RenderText* handleFirstLetter(int& startOffset, int& offsetInNode);
     bool handleReplacedElement();
     bool handleNonTextNode();
     void emitCharacter(UChar, Node*, int startOffset, int endOffset);
     bool advanceRespectingRange(Node*);
 
     // Current position, not necessarily of the text being returned, but position
     // as we walk through the DOM tree.
-    Node* m_node;
+    RawPtrWillBeMember<Node> m_node;
     int m_offset;
     bool m_handledNode;
     bool m_handledChildren;
     BitStack m_fullyClippedStack;
 
     // End of the range.
-    Node* m_startNode;
+    RawPtrWillBeMember<Node> m_startNode;
     int m_startOffset;
     // Start of the range.
-    Node* m_endNode;
+    RawPtrWillBeMember<Node> m_endNode;
     int m_endOffset;
 
     // The current text and its position, in the form to be returned from the iterator.
-    Node* m_positionNode;
+    RawPtrWillBeMember<Node> m_positionNode;
     int m_positionStartOffset;
     int m_positionEndOffset;
 
     String m_textContainer; // We're interested in the range [m_textOffset, m_textOffset + m_textLength) of m_textContainer.
     int m_textOffset;
     int m_textLength;
 
     // Used to do the whitespace logic.
-    Node* m_lastTextNode;
+    RawPtrWillBeMember<Node> m_lastTextNode;
     UChar m_lastCharacter;
 
     // Used for whitespace characters that aren't in the DOM, so we can point at them.
     UChar m_singleCharacterBuffer;
 
     // Whether m_node has advanced beyond the iteration range (i.e. m_startNode).
     bool m_havePassedStartNode;
 
     // Should handle first-letter renderer in the next call to handleTextNode.
     bool m_shouldHandleFirstLetter;
 
     // Used when the iteration should stop if form controls are reached.
     bool m_stopsOnFormControls;
 
     // Used when m_stopsOnFormControls is set to determine if the iterator should keep advancing.
     bool m_shouldStop;
 
     // Used in pasting inside password field.
     bool m_emitsOriginalText;
 };
 
 // Builds on the text iterator, adding a character position so we can walk one
 // character at a time, or faster, as needed. Useful for searching.
 class CharacterIterator {
+    STACK_ALLOCATED();
 public:
     explicit CharacterIterator(const Range*, TextIteratorBehaviorFlags = TextIteratorDefaultBehavior);
     CharacterIterator(const Position& start, const Position& end, TextIteratorBehaviorFlags = TextIteratorDefaultBehavior);
 
     void advance(int numCharacters);
 
     bool atBreak() const { return m_atBreak; }
     bool atEnd() const { return m_textIterator.atEnd(); }
 
     int length() const { return m_textIterator.length() - m_runOffset; }
     UChar characterAt(unsigned index) const { return m_textIterator.characterAt(m_runOffset + index); }
 
     template<typename BufferType>
     void appendTextTo(BufferType& output) { m_textIterator.appendTextTo(output, m_runOffset); }
 
     int characterOffset() const { return m_offset; }
     PassRefPtrWillBeRawPtr<Range> range() const;
 
 private:
     void initialize();
 
     int m_offset;
     int m_runOffset;
     bool m_atBreak;
 
     TextIterator m_textIterator;
 };
 
 class BackwardsCharacterIterator {
+    STACK_ALLOCATED();
 public:
     explicit BackwardsCharacterIterator(const Range*, TextIteratorBehaviorFlags = TextIteratorDefaultBehavior);
 
     void advance(int);
 
     bool atEnd() const { return m_textIterator.atEnd(); }
 
     PassRefPtrWillBeRawPtr<Range> range() const;
 
 private:
@@ skipping 23 matching lines @@
     Vector<UChar> m_buffer;
     // Did we have to look ahead in the textIterator to confirm the current chunk?
     bool m_didLookAhead;
     RefPtrWillBeMember<Range> m_range;
     TextIterator m_textIterator;
 };
 
 }
 
 #endif