Merge 145954 "TextIterator emits LF for a br element inside an e..."

Source/WebCore/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 242 matching lines @@
     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 {
 public:
     CharacterIterator();
     explicit CharacterIterator(const Range*, TextIteratorBehavior = TextIteratorDefaultBehavior);
     
     void advance(int numCharacters);
@@ skipping 64 matching lines @@
     bool m_didLookAhead;
 
     RefPtr<Range> m_range;
 
     TextIterator m_textIterator;
 };
 
 }
 
 #endif