--- a/webengine/osswebengine/WebCore/html/HTMLInputElement.cpp Thu Aug 19 10:58:56 2010 +0300
+++ b/webengine/osswebengine/WebCore/html/HTMLInputElement.cpp Tue Aug 31 16:17:46 2010 +0300
@@ -492,40 +492,40 @@
return static_cast<RenderTextControl*>(renderer())->selectionEnd();
}
-static bool isTextFieldWithRenderer(HTMLInputElement* element)
-{
- if (!element->isTextField())
- return false;
-
- element->document()->updateLayoutIgnorePendingStylesheets();
- if (!element->renderer())
- return false;
-
- return true;
-}
-
void HTMLInputElement::setSelectionStart(int start)
{
- if (isTextFieldWithRenderer(this))
- static_cast<RenderTextControl*>(renderer())->setSelectionStart(start);
+ if (!isTextField())
+ return;
+ if (!renderer())
+ return;
+ static_cast<RenderTextControl*>(renderer())->setSelectionStart(start);
}
void HTMLInputElement::setSelectionEnd(int end)
{
- if (isTextFieldWithRenderer(this))
- static_cast<RenderTextControl*>(renderer())->setSelectionEnd(end);
+ if (!isTextField())
+ return;
+ if (!renderer())
+ return;
+ static_cast<RenderTextControl*>(renderer())->setSelectionEnd(end);
}
void HTMLInputElement::select()
{
- if (isTextFieldWithRenderer(this))
- static_cast<RenderTextControl*>(renderer())->select();
+ if (!isTextField())
+ return;
+ if (!renderer())
+ return;
+ static_cast<RenderTextControl*>(renderer())->select();
}
void HTMLInputElement::setSelectionRange(int start, int end)
{
- if (isTextFieldWithRenderer(this))
- static_cast<RenderTextControl*>(renderer())->setSelectionRange(start, end);
+ if (!isTextField())
+ return;
+ if (!renderer())
+ return;
+ static_cast<RenderTextControl*>(renderer())->setSelectionRange(start, end);
}
void HTMLInputElement::accessKeyAction(bool sendToAnyElement)