Merge 72807 - 2010-11-24 Dimitri Glazkov <dglazkov@chromium.org>...

WebCore/rendering/TextControlInnerElements.cpp

 /*
  * Copyright (C) 2006, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google 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
@@ skipping 34 matching lines @@
 
 namespace WebCore {
 
 using namespace HTMLNames;
 
 class RenderTextControlInnerBlock : public RenderBlock {
 public:
     RenderTextControlInnerBlock(Node* node, bool isMultiLine) : RenderBlock(node), m_multiLine(isMultiLine) { }
 
 private:
+    virtual bool hasLineIfEmpty() const { return true; }
     virtual VisiblePosition positionForPoint(const IntPoint&);
 
     bool m_multiLine;
 };
 
 VisiblePosition RenderTextControlInnerBlock::positionForPoint(const IntPoint& point)
 {
     IntPoint contentsPoint(point);
 
     // Multiline text controls have the scroll on shadowAncestorNode, so we need to take that
@@ skipping 422 matching lines @@
 
     if (m_state != Idle)
       speechInput()->cancelRecognition(m_listenerId);
 
     TextControlInnerElement::detach();
 }
 
 #endif // ENABLE(INPUT_SPEECH)
 
 }