Merge 88456

Source/WebCore/rendering/RenderTextControl.h

 /*
  * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
  *           (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/) 
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 32 matching lines @@
     int selectionStart() const;
     int selectionEnd() const;
     PassRefPtr<Range> selection(int start, int end) const;
 
     virtual void subtreeHasChanged();
     String text();
     String textWithHardLineBreaks();
     void selectionChanged(bool userTriggered);
 
     VisiblePosition visiblePositionForIndex(int index) const;
-    int indexForVisiblePosition(const VisiblePosition&) const;
+    static int indexForVisiblePosition(HTMLElement*, const VisiblePosition&);
 
     void updatePlaceholderVisibility(bool, bool);
 
 protected:
     RenderTextControl(Node*, bool);
 
     int scrollbarThickness() const;
     void adjustInnerTextStyle(const RenderStyle* startStyle, RenderStyle* textBlockStyle) const;
     void setInnerTextValue(const String&);
 
@@ skipping 31 matching lines @@
     virtual void addFocusRingRects(Vector<IntRect>&, const IntPoint&);
 
     virtual bool canBeProgramaticallyScrolled(bool) const { return true; }
 
     virtual bool requiresForcedStyleRecalcPropagation() const { return true; }
 
     String finishText(Vector<UChar>&) const;
 
     bool hasVisibleTextArea() const;
     friend void setSelectionRange(Node*, int start, int end);
-    bool isSelectableElement(Node*) const;
+    static bool isSelectableElement(HTMLElement*, Node*);
     
     virtual int textBlockInsetLeft() const = 0;
     virtual int textBlockInsetRight() const = 0;
     virtual int textBlockInsetTop() const = 0;
 
     void paintPlaceholder(PaintInfo&, int tx, int ty);
 
     bool m_lastChangeWasUserEdit;
 };
 
@@ skipping 10 matching lines @@
     ASSERT(!object || object->isTextControl());
     return static_cast<const RenderTextControl*>(object);
 }
 
 // This will catch anyone doing an unnecessary cast.
 void toRenderTextControl(const RenderTextControl*);
 
 } // namespace WebCore
 
 #endif // RenderTextControl_h