Unreviewed, rolling out r120565.
http://trac.webkit.org/changeset/120565
https://bugs.webkit.org/show_bug.cgi?id=89155
Bad commit message
* rendering/RenderSearchField.cpp: Removed.
* rendering/RenderSearchField.h: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@120566 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 6732a49..0b07521 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,5 +1,16 @@
2012-06-17 Yoshifumi Inoue <yosin@chromium.org>
+ Unreviewed, rolling out r120565.
+ http://trac.webkit.org/changeset/120565
+ https://bugs.webkit.org/show_bug.cgi?id=89155
+
+ Bad commit message
+
+ * rendering/RenderSearchField.cpp: Removed.
+ * rendering/RenderSearchField.h: Removed.
+
+2012-06-17 Yoshifumi Inoue <yosin@chromium.org>
+
[Forms] Copy RenderTextControlSingleLine.{cpp,h} to RenderSearchFiled.{cpp,h}
https://bugs.webkit.org/show_bug.cgi?id=89155
diff --git a/Source/WebCore/rendering/RenderSearchField.cpp b/Source/WebCore/rendering/RenderSearchField.cpp
deleted file mode 100644
index 848fc21..0000000
--- a/Source/WebCore/rendering/RenderSearchField.cpp
+++ /dev/null
@@ -1,760 +0,0 @@
-/**
- * Copyright (C) 2006, 2007, 2010 Apple Inc. All rights reserved.
- * (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
- * Copyright (C) 2010 Google Inc. All rights reserved.
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- *
- * 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,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#include "config.h"
-#include "RenderTextControlSingleLine.h"
-
-#include "CSSFontSelector.h"
-#include "CSSValueKeywords.h"
-#include "Chrome.h"
-#include "Frame.h"
-#include "FrameSelection.h"
-#include "FrameView.h"
-#include "HTMLInputElement.h"
-#include "HTMLNames.h"
-#include "HitTestResult.h"
-#include "LocalizedStrings.h"
-#include "Page.h"
-#include "PlatformKeyboardEvent.h"
-#include "RenderLayer.h"
-#include "RenderScrollbar.h"
-#include "RenderTheme.h"
-#include "SearchPopupMenu.h"
-#include "Settings.h"
-#include "SimpleFontData.h"
-#include "StyleResolver.h"
-#include "TextControlInnerElements.h"
-
-using namespace std;
-
-namespace WebCore {
-
-using namespace HTMLNames;
-
-VisiblePosition RenderTextControlInnerBlock::positionForPoint(const LayoutPoint& point)
-{
- LayoutPoint contentsPoint(point);
-
- // Multiline text controls have the scroll on shadowAncestorNode, so we need to take that
- // into account here.
- if (m_multiLine) {
- RenderTextControl* renderer = toRenderTextControl(node()->shadowAncestorNode()->renderer());
- if (renderer->hasOverflowClip())
- contentsPoint += renderer->scrolledContentOffset();
- }
-
- return RenderBlock::positionForPoint(contentsPoint);
-}
-
-// ----------------------------
-
-RenderTextControlSingleLine::RenderTextControlSingleLine(Node* node)
- : RenderTextControl(node)
- , m_searchPopupIsVisible(false)
- , m_shouldDrawCapsLockIndicator(false)
- , m_desiredInnerTextHeight(-1)
- , m_searchPopup(0)
-{
- ASSERT(node->isHTMLElement());
- ASSERT(node->toInputElement());
-}
-
-RenderTextControlSingleLine::~RenderTextControlSingleLine()
-{
- if (m_searchPopup) {
- m_searchPopup->popupMenu()->disconnectClient();
- m_searchPopup = 0;
- }
-}
-
-inline HTMLElement* RenderTextControlSingleLine::containerElement() const
-{
- return inputElement()->containerElement();
-}
-
-inline HTMLElement* RenderTextControlSingleLine::innerBlockElement() const
-{
- return inputElement()->innerBlockElement();
-}
-
-inline HTMLElement* RenderTextControlSingleLine::innerSpinButtonElement() const
-{
- return inputElement()->innerSpinButtonElement();
-}
-
-inline HTMLElement* RenderTextControlSingleLine::resultsButtonElement() const
-{
- return inputElement()->resultsButtonElement();
-}
-
-inline HTMLElement* RenderTextControlSingleLine::cancelButtonElement() const
-{
- return inputElement()->cancelButtonElement();
-}
-
-RenderStyle* RenderTextControlSingleLine::textBaseStyle() const
-{
- HTMLElement* innerBlock = innerBlockElement();
- return innerBlock ? innerBlock->renderer()->style() : style();
-}
-
-void RenderTextControlSingleLine::addSearchResult()
-{
- HTMLInputElement* input = inputElement();
- if (input->maxResults() <= 0)
- return;
-
- String value = input->value();
- if (value.isEmpty())
- return;
-
- Settings* settings = document()->settings();
- if (!settings || settings->privateBrowsingEnabled())
- return;
-
- int size = static_cast<int>(m_recentSearches.size());
- for (int i = size - 1; i >= 0; --i) {
- if (m_recentSearches[i] == value)
- m_recentSearches.remove(i);
- }
-
- m_recentSearches.insert(0, value);
- while (static_cast<int>(m_recentSearches.size()) > input->maxResults())
- m_recentSearches.removeLast();
-
- const AtomicString& name = autosaveName();
- if (!m_searchPopup)
- m_searchPopup = document()->page()->chrome()->createSearchPopupMenu(this);
-
- m_searchPopup->saveRecentSearches(name, m_recentSearches);
-}
-
-void RenderTextControlSingleLine::showPopup()
-{
- if (m_searchPopupIsVisible)
- return;
-
- if (!m_searchPopup)
- m_searchPopup = document()->page()->chrome()->createSearchPopupMenu(this);
-
- if (!m_searchPopup->enabled())
- return;
-
- m_searchPopupIsVisible = true;
-
- const AtomicString& name = autosaveName();
- m_searchPopup->loadRecentSearches(name, m_recentSearches);
-
- // Trim the recent searches list if the maximum size has changed since we last saved.
- HTMLInputElement* input = inputElement();
- if (static_cast<int>(m_recentSearches.size()) > input->maxResults()) {
- do {
- m_recentSearches.removeLast();
- } while (static_cast<int>(m_recentSearches.size()) > input->maxResults());
-
- m_searchPopup->saveRecentSearches(name, m_recentSearches);
- }
-
- m_searchPopup->popupMenu()->show(pixelSnappedIntRect(absoluteBoundingBoxRect()), document()->view(), -1);
-}
-
-void RenderTextControlSingleLine::hidePopup()
-{
- if (m_searchPopup)
- m_searchPopup->popupMenu()->hide();
-}
-
-void RenderTextControlSingleLine::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
-{
- RenderTextControl::paint(paintInfo, paintOffset);
-
- if (paintInfo.phase == PaintPhaseBlockBackground && m_shouldDrawCapsLockIndicator) {
- LayoutRect contentsRect = contentBoxRect();
-
- // Center vertically like the text.
- contentsRect.setY((height() - contentsRect.height()) / 2);
-
- // Convert the rect into the coords used for painting the content
- contentsRect.moveBy(paintOffset + location());
- theme()->paintCapsLockIndicator(this, paintInfo, pixelSnappedIntRect(contentsRect));
- }
-}
-
-void RenderTextControlSingleLine::layout()
-{
- // FIXME: We should remove the height-related hacks in layout() and
- // styleDidChange(). We need them because
- // - Center the inner elements vertically if the input height is taller than
- // the intrinsic height of the inner elements.
- // - Shrink the inner elment heights if the input height is samller than the
- // intrinsic heights of the inner elements.
-
- // We don't honor paddings and borders for textfields without decorations
- // and type=search if the text height is taller than the contentHeight()
- // because of compability.
-
- RenderBlock::layoutBlock(false);
-
- RenderBox* innerTextRenderer = innerTextElement()->renderBox();
- ASSERT(innerTextRenderer);
- RenderBox* innerBlockRenderer = innerBlockElement() ? innerBlockElement()->renderBox() : 0;
- HTMLElement* container = containerElement();
- RenderBox* containerRenderer = container ? container->renderBox() : 0;
-
- // Set the text block height
- LayoutUnit desiredHeight = textBlockHeight();
- LayoutUnit currentHeight = innerTextRenderer->height();
-
- LayoutUnit heightLimit = (inputElement()->isSearchField() || !container) ? height() : contentHeight();
- if (currentHeight > heightLimit) {
- if (desiredHeight != currentHeight)
- setNeedsLayout(true, MarkOnlyThis);
-
- innerTextRenderer->style()->setHeight(Length(desiredHeight, Fixed));
- m_desiredInnerTextHeight = desiredHeight;
- if (innerBlockRenderer)
- innerBlockRenderer->style()->setHeight(Length(desiredHeight, Fixed));
- }
- // The container might be taller because of decoration elements.
- if (containerRenderer) {
- containerRenderer->layoutIfNeeded();
- LayoutUnit containerHeight = containerRenderer->height();
- if (containerHeight > heightLimit) {
- containerRenderer->style()->setHeight(Length(heightLimit, Fixed));
- setNeedsLayout(true, MarkOnlyThis);
- } else if (containerRenderer->height() < contentHeight()) {
- containerRenderer->style()->setHeight(Length(contentHeight(), Fixed));
- setNeedsLayout(true, MarkOnlyThis);
- } else
- containerRenderer->style()->setHeight(Length(containerHeight, Fixed));
- }
-
- // If we need another layout pass, we have changed one of children's height so we need to relayout them.
- if (needsLayout())
- RenderBlock::layoutBlock(true);
-
- // Center the child block vertically
- currentHeight = innerTextRenderer->height();
- if (!container && currentHeight != contentHeight()) {
- LayoutUnit heightDiff = currentHeight - contentHeight();
- innerTextRenderer->setY(innerTextRenderer->y() - (heightDiff / 2 + layoutMod(heightDiff, 2)));
- } else if (inputElement()->isSearchField() && containerRenderer && containerRenderer->height() > contentHeight()) {
- // A quirk for find-in-page box on Safari Windows.
- // http://webkit.org/b/63157
- LayoutUnit heightDiff = containerRenderer->height() - contentHeight();
- containerRenderer->setY(containerRenderer->y() - (heightDiff / 2 + layoutMod(heightDiff, 2)));
- }
-
- // Ignores the paddings for the inner spin button.
- if (RenderBox* innerSpinBox = innerSpinButtonElement() ? innerSpinButtonElement()->renderBox() : 0) {
- RenderBox* parentBox = innerSpinBox->parentBox();
- if (containerRenderer && !containerRenderer->style()->isLeftToRightDirection())
- innerSpinBox->setLocation(LayoutPoint(-paddingLeft(), -paddingTop()));
- else
- innerSpinBox->setLocation(LayoutPoint(parentBox->width() - innerSpinBox->width() + paddingRight(), -paddingTop()));
- innerSpinBox->setHeight(height() - borderTop() - borderBottom());
- }
-
- HTMLElement* placeholderElement = inputElement()->placeholderElement();
- if (RenderBox* placeholderBox = placeholderElement ? placeholderElement->renderBox() : 0) {
- placeholderBox->style()->setWidth(Length(innerTextRenderer->width() - placeholderBox->borderAndPaddingWidth(), Fixed));
- placeholderBox->style()->setHeight(Length(innerTextRenderer->height() - placeholderBox->borderAndPaddingHeight(), Fixed));
- bool placeholderBoxHadLayout = placeholderBox->everHadLayout();
- placeholderBox->layoutIfNeeded();
- LayoutPoint textOffset = innerTextRenderer->location();
- if (innerBlockElement() && innerBlockElement()->renderBox())
- textOffset += toLayoutSize(innerBlockElement()->renderBox()->location());
- if (containerRenderer)
- textOffset += toLayoutSize(containerRenderer->location());
- placeholderBox->setLocation(textOffset);
-
- if (!placeholderBoxHadLayout && placeholderBox->checkForRepaintDuringLayout()) {
- // This assumes a shadow tree without floats. If floats are added, the
- // logic should be shared with RenderBlock::layoutBlockChild.
- placeholderBox->repaint();
- }
- }
-}
-
-bool RenderTextControlSingleLine::nodeAtPoint(const HitTestRequest& request, HitTestResult& result, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset, HitTestAction hitTestAction)
-{
- if (!RenderTextControl::nodeAtPoint(request, result, pointInContainer, accumulatedOffset, hitTestAction))
- return false;
-
- // Say that we hit the inner text element if
- // - we hit a node inside the inner text element,
- // - we hit the <input> element (e.g. we're over the border or padding), or
- // - we hit regions not in any decoration buttons.
- HTMLElement* container = containerElement();
- if (result.innerNode()->isDescendantOf(innerTextElement()) || result.innerNode() == node() || (container && container == result.innerNode())) {
- LayoutPoint pointInParent = pointInContainer;
- if (container && innerBlockElement()) {
- if (innerBlockElement()->renderBox())
- pointInParent -= toLayoutSize(innerBlockElement()->renderBox()->location());
- if (container->renderBox())
- pointInParent -= toLayoutSize(container->renderBox()->location());
- }
- hitInnerTextElement(result, pointInParent, accumulatedOffset);
- }
- return true;
-}
-
-void RenderTextControlSingleLine::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
-{
- m_desiredInnerTextHeight = -1;
- RenderTextControl::styleDidChange(diff, oldStyle);
-
- // We may have set the width and the height in the old style in layout().
- // Reset them now to avoid getting a spurious layout hint.
- HTMLElement* innerBlock = innerBlockElement();
- if (RenderObject* innerBlockRenderer = innerBlock ? innerBlock->renderer() : 0) {
- innerBlockRenderer->style()->setHeight(Length());
- innerBlockRenderer->style()->setWidth(Length());
- }
- HTMLElement* container = containerElement();
- if (RenderObject* containerRenderer = container ? container->renderer() : 0) {
- containerRenderer->style()->setHeight(Length());
- containerRenderer->style()->setWidth(Length());
- }
- if (HTMLElement* placeholder = inputElement()->placeholderElement())
- placeholder->setInlineStyleProperty(CSSPropertyTextOverflow, textShouldBeTruncated() ? CSSValueEllipsis : CSSValueClip);
- setHasOverflowClip(false);
-}
-
-void RenderTextControlSingleLine::capsLockStateMayHaveChanged()
-{
- if (!node() || !document())
- return;
-
- // Only draw the caps lock indicator if these things are true:
- // 1) The field is a password field
- // 2) The frame is active
- // 3) The element is focused
- // 4) The caps lock is on
- bool shouldDrawCapsLockIndicator = false;
-
- if (Frame* frame = document()->frame())
- shouldDrawCapsLockIndicator = inputElement()->isPasswordField()
- && frame->selection()->isFocusedAndActive()
- && document()->focusedNode() == node()
- && PlatformKeyboardEvent::currentCapsLockState();
-
- if (shouldDrawCapsLockIndicator != m_shouldDrawCapsLockIndicator) {
- m_shouldDrawCapsLockIndicator = shouldDrawCapsLockIndicator;
- repaint();
- }
-}
-
-bool RenderTextControlSingleLine::hasControlClip() const
-{
- // Apply control clip for text fields with decorations.
- return !!containerElement();
-}
-
-LayoutRect RenderTextControlSingleLine::controlClipRect(const LayoutPoint& additionalOffset) const
-{
- ASSERT(hasControlClip());
- LayoutRect clipRect = unionRect(contentBoxRect(), containerElement()->renderBox()->frameRect());
- clipRect.moveBy(additionalOffset);
- return clipRect;
-}
-
-float RenderTextControlSingleLine::getAvgCharWidth(AtomicString family)
-{
- // Since Lucida Grande is the default font, we want this to match the width
- // of MS Shell Dlg, the default font for textareas in Firefox, Safari Win and
- // IE for some encodings (in IE, the default font is encoding specific).
- // 901 is the avgCharWidth value in the OS/2 table for MS Shell Dlg.
- if (family == AtomicString("Lucida Grande"))
- return scaleEmToUnits(901);
-
- return RenderTextControl::getAvgCharWidth(family);
-}
-
-LayoutUnit RenderTextControlSingleLine::preferredContentWidth(float charWidth) const
-{
- int factor;
- bool includesDecoration = inputElement()->sizeShouldIncludeDecoration(factor);
- if (factor <= 0)
- factor = 20;
-
- LayoutUnit result = static_cast<LayoutUnit>(ceiledLayoutUnit(charWidth * factor));
-
- float maxCharWidth = 0.f;
- AtomicString family = style()->font().family().family();
- // Since Lucida Grande is the default font, we want this to match the width
- // of MS Shell Dlg, the default font for textareas in Firefox, Safari Win and
- // IE for some encodings (in IE, the default font is encoding specific).
- // 4027 is the (xMax - xMin) value in the "head" font table for MS Shell Dlg.
- if (family == AtomicString("Lucida Grande"))
- maxCharWidth = scaleEmToUnits(4027);
- else if (hasValidAvgCharWidth(family))
- maxCharWidth = roundf(style()->font().primaryFont()->maxCharWidth());
-
- // For text inputs, IE adds some extra width.
- if (maxCharWidth > 0.f)
- result += maxCharWidth - charWidth;
-
- if (includesDecoration) {
- HTMLElement* spinButton = innerSpinButtonElement();
- if (RenderBox* spinRenderer = spinButton ? spinButton->renderBox() : 0) {
- result += spinRenderer->borderLeft() + spinRenderer->borderRight() +
- spinRenderer->paddingLeft() + spinRenderer->paddingRight();
- // Since the width of spinRenderer is not calculated yet, spinRenderer->width() returns 0.
- // So computedStyle()->width() is used instead.
- result += spinButton->computedStyle()->width().value();
- }
- }
-
- return result;
-}
-
-LayoutUnit RenderTextControlSingleLine::computeControlHeight(LayoutUnit lineHeight, LayoutUnit nonContentHeight) const
-{
- HTMLElement* resultsButton = resultsButtonElement();
- if (RenderBox* resultsRenderer = resultsButton ? resultsButton->renderBox() : 0) {
- resultsRenderer->computeLogicalHeight();
- nonContentHeight = max(nonContentHeight, resultsRenderer->borderAndPaddingHeight() + resultsRenderer->marginHeight());
- lineHeight = max(lineHeight, resultsRenderer->height());
- }
- HTMLElement* cancelButton = cancelButtonElement();
- if (RenderBox* cancelRenderer = cancelButton ? cancelButton->renderBox() : 0) {
- cancelRenderer->computeLogicalHeight();
- nonContentHeight = max(nonContentHeight, cancelRenderer->borderAndPaddingHeight() + cancelRenderer->marginHeight());
- lineHeight = max(lineHeight, cancelRenderer->height());
- }
-
- return lineHeight + nonContentHeight;
-}
-
-void RenderTextControlSingleLine::updateFromElement()
-{
- RenderTextControl::updateFromElement();
-
- if (cancelButtonElement())
- updateCancelButtonVisibility();
-
- if (m_searchPopupIsVisible)
- m_searchPopup->popupMenu()->updateFromElement();
-}
-
-PassRefPtr<RenderStyle> RenderTextControlSingleLine::createInnerTextStyle(const RenderStyle* startStyle) const
-{
- RefPtr<RenderStyle> textBlockStyle = RenderStyle::create();
- textBlockStyle->inheritFrom(startStyle);
- adjustInnerTextStyle(startStyle, textBlockStyle.get());
-
- textBlockStyle->setWhiteSpace(PRE);
- textBlockStyle->setWordWrap(NormalWordWrap);
- textBlockStyle->setOverflowX(OHIDDEN);
- textBlockStyle->setOverflowY(OHIDDEN);
- textBlockStyle->setTextOverflow(textShouldBeTruncated() ? TextOverflowEllipsis : TextOverflowClip);
-
- if (m_desiredInnerTextHeight >= 0)
- textBlockStyle->setHeight(Length(m_desiredInnerTextHeight, Fixed));
- // Do not allow line-height to be smaller than our default.
- if (textBlockStyle->fontMetrics().lineSpacing() > lineHeight(true, HorizontalLine, PositionOfInteriorLineBoxes))
- textBlockStyle->setLineHeight(Length(-100.0f, Percent));
-
- textBlockStyle->setDisplay(BLOCK);
-
- return textBlockStyle.release();
-}
-
-PassRefPtr<RenderStyle> RenderTextControlSingleLine::createInnerBlockStyle(const RenderStyle* startStyle) const
-{
- RefPtr<RenderStyle> innerBlockStyle = RenderStyle::create();
- innerBlockStyle->inheritFrom(startStyle);
-
- innerBlockStyle->setBoxFlex(1);
- innerBlockStyle->setDisplay(BLOCK);
- innerBlockStyle->setDirection(LTR);
-
- // We don't want the shadow dom to be editable, so we set this block to read-only in case the input itself is editable.
- innerBlockStyle->setUserModify(READ_ONLY);
-
- return innerBlockStyle.release();
-}
-
-void RenderTextControlSingleLine::updateCancelButtonVisibility() const
-{
- RenderObject* cancelButtonRenderer = cancelButtonElement()->renderer();
- if (!cancelButtonRenderer)
- return;
-
- const RenderStyle* curStyle = cancelButtonRenderer->style();
- EVisibility buttonVisibility = visibilityForCancelButton();
- if (curStyle->visibility() == buttonVisibility)
- return;
-
- RefPtr<RenderStyle> cancelButtonStyle = RenderStyle::clone(curStyle);
- cancelButtonStyle->setVisibility(buttonVisibility);
- cancelButtonRenderer->setStyle(cancelButtonStyle);
-}
-
-EVisibility RenderTextControlSingleLine::visibilityForCancelButton() const
-{
- return (style()->visibility() == HIDDEN || inputElement()->value().isEmpty()) ? HIDDEN : VISIBLE;
-}
-
-bool RenderTextControlSingleLine::textShouldBeTruncated() const
-{
- return document()->focusedNode() != node()
- && style()->textOverflow() == TextOverflowEllipsis;
-}
-
-const AtomicString& RenderTextControlSingleLine::autosaveName() const
-{
- return static_cast<Element*>(node())->getAttribute(autosaveAttr);
-}
-
-// PopupMenuClient methods
-void RenderTextControlSingleLine::valueChanged(unsigned listIndex, bool fireEvents)
-{
- ASSERT(static_cast<int>(listIndex) < listSize());
- HTMLInputElement* input = inputElement();
- if (static_cast<int>(listIndex) == (listSize() - 1)) {
- if (fireEvents) {
- m_recentSearches.clear();
- const AtomicString& name = autosaveName();
- if (!name.isEmpty()) {
- if (!m_searchPopup)
- m_searchPopup = document()->page()->chrome()->createSearchPopupMenu(this);
- m_searchPopup->saveRecentSearches(name, m_recentSearches);
- }
- }
- } else {
- input->setValue(itemText(listIndex));
- if (fireEvents)
- input->onSearch();
- input->select();
- }
-}
-
-String RenderTextControlSingleLine::itemText(unsigned listIndex) const
-{
- int size = listSize();
- if (size == 1) {
- ASSERT(!listIndex);
- return searchMenuNoRecentSearchesText();
- }
- if (!listIndex)
- return searchMenuRecentSearchesText();
- if (itemIsSeparator(listIndex))
- return String();
- if (static_cast<int>(listIndex) == (size - 1))
- return searchMenuClearRecentSearchesText();
- return m_recentSearches[listIndex - 1];
-}
-
-String RenderTextControlSingleLine::itemLabel(unsigned) const
-{
- return String();
-}
-
-String RenderTextControlSingleLine::itemIcon(unsigned) const
-{
- return String();
-}
-
-bool RenderTextControlSingleLine::itemIsEnabled(unsigned listIndex) const
-{
- if (!listIndex || itemIsSeparator(listIndex))
- return false;
- return true;
-}
-
-PopupMenuStyle RenderTextControlSingleLine::itemStyle(unsigned) const
-{
- return menuStyle();
-}
-
-PopupMenuStyle RenderTextControlSingleLine::menuStyle() const
-{
- return PopupMenuStyle(style()->visitedDependentColor(CSSPropertyColor), style()->visitedDependentColor(CSSPropertyBackgroundColor), style()->font(), style()->visibility() == VISIBLE,
- style()->display() == NONE, style()->textIndent(), style()->direction(), isOverride(style()->unicodeBidi()));
-}
-
-int RenderTextControlSingleLine::clientInsetLeft() const
-{
- // Inset the menu by the radius of the cap on the left so that
- // it only runs along the straight part of the bezel.
- return height() / 2;
-}
-
-int RenderTextControlSingleLine::clientInsetRight() const
-{
- // Inset the menu by the radius of the cap on the right so that
- // it only runs along the straight part of the bezel (unless it needs
- // to be wider).
- return height() / 2;
-}
-
-LayoutUnit RenderTextControlSingleLine::clientPaddingLeft() const
-{
- LayoutUnit padding = paddingLeft();
- if (RenderBox* box = innerBlockElement() ? innerBlockElement()->renderBox() : 0)
- padding += box->x();
- return padding;
-}
-
-LayoutUnit RenderTextControlSingleLine::clientPaddingRight() const
-{
- LayoutUnit padding = paddingRight();
- if (RenderBox* containerBox = containerElement() ? containerElement()->renderBox() : 0) {
- if (RenderBox* innerBlockBox = innerBlockElement() ? innerBlockElement()->renderBox() : 0)
- padding += containerBox->width() - (innerBlockBox->x() + innerBlockBox->width());
- }
- return padding;
-}
-
-int RenderTextControlSingleLine::listSize() const
-{
- // If there are no recent searches, then our menu will have 1 "No recent searches" item.
- if (!m_recentSearches.size())
- return 1;
- // Otherwise, leave room in the menu for a header, a separator, and the "Clear recent searches" item.
- return m_recentSearches.size() + 3;
-}
-
-int RenderTextControlSingleLine::selectedIndex() const
-{
- return -1;
-}
-
-void RenderTextControlSingleLine::popupDidHide()
-{
- m_searchPopupIsVisible = false;
-}
-
-bool RenderTextControlSingleLine::itemIsSeparator(unsigned listIndex) const
-{
- // The separator will be the second to last item in our list.
- return static_cast<int>(listIndex) == (listSize() - 2);
-}
-
-bool RenderTextControlSingleLine::itemIsLabel(unsigned listIndex) const
-{
- return listIndex == 0;
-}
-
-bool RenderTextControlSingleLine::itemIsSelected(unsigned) const
-{
- return false;
-}
-
-void RenderTextControlSingleLine::setTextFromItem(unsigned listIndex)
-{
- inputElement()->setValue(itemText(listIndex));
-}
-
-FontSelector* RenderTextControlSingleLine::fontSelector() const
-{
- return document()->styleResolver()->fontSelector();
-}
-
-HostWindow* RenderTextControlSingleLine::hostWindow() const
-{
- return document()->view()->hostWindow();
-}
-
-void RenderTextControlSingleLine::autoscroll()
-{
- RenderLayer* layer = innerTextElement()->renderBox()->layer();
- if (layer)
- layer->autoscroll();
-}
-
-int RenderTextControlSingleLine::scrollWidth() const
-{
- if (innerTextElement())
- return innerTextElement()->scrollWidth();
- return RenderBlock::scrollWidth();
-}
-
-int RenderTextControlSingleLine::scrollHeight() const
-{
- if (innerTextElement())
- return innerTextElement()->scrollHeight();
- return RenderBlock::scrollHeight();
-}
-
-int RenderTextControlSingleLine::scrollLeft() const
-{
- if (innerTextElement())
- return innerTextElement()->scrollLeft();
- return RenderBlock::scrollLeft();
-}
-
-int RenderTextControlSingleLine::scrollTop() const
-{
- if (innerTextElement())
- return innerTextElement()->scrollTop();
- return RenderBlock::scrollTop();
-}
-
-void RenderTextControlSingleLine::setScrollLeft(int newLeft)
-{
- if (innerTextElement())
- innerTextElement()->setScrollLeft(newLeft);
-}
-
-void RenderTextControlSingleLine::setScrollTop(int newTop)
-{
- if (innerTextElement())
- innerTextElement()->setScrollTop(newTop);
-}
-
-bool RenderTextControlSingleLine::scroll(ScrollDirection direction, ScrollGranularity granularity, float multiplier, Node** stopNode)
-{
- RenderLayer* layer = innerTextElement()->renderBox()->layer();
- if (layer && layer->scroll(direction, granularity, multiplier))
- return true;
- return RenderBlock::scroll(direction, granularity, multiplier, stopNode);
-}
-
-bool RenderTextControlSingleLine::logicalScroll(ScrollLogicalDirection direction, ScrollGranularity granularity, float multiplier, Node** stopNode)
-{
- RenderLayer* layer = innerTextElement()->renderBox()->layer();
- if (layer && layer->scroll(logicalToPhysical(direction, style()->isHorizontalWritingMode(), style()->isFlippedBlocksWritingMode()), granularity, multiplier))
- return true;
- return RenderBlock::logicalScroll(direction, granularity, multiplier, stopNode);
-}
-
-PassRefPtr<Scrollbar> RenderTextControlSingleLine::createScrollbar(ScrollableArea* scrollableArea, ScrollbarOrientation orientation, ScrollbarControlSize controlSize)
-{
- RefPtr<Scrollbar> widget;
- bool hasCustomScrollbarStyle = style()->hasPseudoStyle(SCROLLBAR);
- if (hasCustomScrollbarStyle)
- widget = RenderScrollbar::createCustomScrollbar(scrollableArea, orientation, this->node());
- else
- widget = Scrollbar::createNativeScrollbar(scrollableArea, orientation, controlSize);
- return widget.release();
-}
-
-HTMLInputElement* RenderTextControlSingleLine::inputElement() const
-{
- return node()->toInputElement();
-}
-
-}
diff --git a/Source/WebCore/rendering/RenderSearchField.h b/Source/WebCore/rendering/RenderSearchField.h
deleted file mode 100644
index 6e21c85..0000000
--- a/Source/WebCore/rendering/RenderSearchField.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved.
- * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- *
- * 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,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef RenderTextControlSingleLine_h
-#define RenderTextControlSingleLine_h
-
-#include "PopupMenuClient.h"
-#include "RenderTextControl.h"
-
-namespace WebCore {
-
-class HTMLInputElement;
-class SearchPopupMenu;
-
-class RenderTextControlSingleLine : public RenderTextControl, private PopupMenuClient {
-public:
- RenderTextControlSingleLine(Node*);
- virtual ~RenderTextControlSingleLine();
- // FIXME: Move create*Style() to their classes.
- virtual PassRefPtr<RenderStyle> createInnerTextStyle(const RenderStyle* startStyle) const;
- PassRefPtr<RenderStyle> createInnerBlockStyle(const RenderStyle* startStyle) const;
- void updateCancelButtonVisibility() const;
-
- void addSearchResult();
- void stopSearchEventTimer();
-
- bool popupIsVisible() const { return m_searchPopupIsVisible; }
- void showPopup();
- void hidePopup();
-
- void capsLockStateMayHaveChanged();
-
-private:
- virtual bool hasControlClip() const;
- virtual LayoutRect controlClipRect(const LayoutPoint&) const;
- virtual bool isTextField() const { return true; }
-
- virtual void paint(PaintInfo&, const LayoutPoint&);
- virtual void layout();
-
- virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset, HitTestAction);
-
- virtual void autoscroll();
-
- // Subclassed to forward to our inner div.
- virtual int scrollLeft() const;
- virtual int scrollTop() const;
- virtual int scrollWidth() const;
- virtual int scrollHeight() const;
- virtual void setScrollLeft(int);
- virtual void setScrollTop(int);
- virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Node** stopNode = 0);
- virtual bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier = 1, Node** stopNode = 0);
-
- int textBlockWidth() const;
- virtual float getAvgCharWidth(AtomicString family);
- virtual LayoutUnit preferredContentWidth(float charWidth) const;
- virtual LayoutUnit computeControlHeight(LayoutUnit lineHeight, LayoutUnit nonContentHeight) const OVERRIDE;
-
- virtual void updateFromElement();
- virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
-
- virtual RenderStyle* textBaseStyle() const;
-
- EVisibility visibilityForCancelButton() const;
- bool textShouldBeTruncated() const;
- const AtomicString& autosaveName() const;
-
- // PopupMenuClient methods
- virtual void valueChanged(unsigned listIndex, bool fireEvents = true) OVERRIDE;
- virtual void selectionChanged(unsigned, bool) OVERRIDE { }
- virtual void selectionCleared() OVERRIDE { }
- virtual String itemText(unsigned listIndex) const OVERRIDE;
- virtual String itemLabel(unsigned listIndex) const OVERRIDE;
- virtual String itemIcon(unsigned listIndex) const OVERRIDE;
- virtual String itemToolTip(unsigned) const OVERRIDE { return String(); }
- virtual String itemAccessibilityText(unsigned) const OVERRIDE { return String(); }
- virtual bool itemIsEnabled(unsigned listIndex) const OVERRIDE;
- virtual PopupMenuStyle itemStyle(unsigned listIndex) const OVERRIDE;
- virtual PopupMenuStyle menuStyle() const OVERRIDE;
- virtual int clientInsetLeft() const OVERRIDE;
- virtual int clientInsetRight() const OVERRIDE;
- virtual LayoutUnit clientPaddingLeft() const OVERRIDE;
- virtual LayoutUnit clientPaddingRight() const OVERRIDE;
- virtual int listSize() const OVERRIDE;
- virtual int selectedIndex() const OVERRIDE;
- virtual void popupDidHide() OVERRIDE;
- virtual bool itemIsSeparator(unsigned listIndex) const OVERRIDE;
- virtual bool itemIsLabel(unsigned listIndex) const OVERRIDE;
- virtual bool itemIsSelected(unsigned listIndex) const OVERRIDE;
- virtual bool shouldPopOver() const OVERRIDE { return false; }
- virtual bool valueShouldChangeOnHotTrack() const OVERRIDE { return false; }
- virtual void setTextFromItem(unsigned listIndex) OVERRIDE;
- virtual FontSelector* fontSelector() const OVERRIDE;
- virtual HostWindow* hostWindow() const OVERRIDE;
- virtual PassRefPtr<Scrollbar> createScrollbar(ScrollableArea*, ScrollbarOrientation, ScrollbarControlSize) OVERRIDE;
-
- HTMLInputElement* inputElement() const;
-
- HTMLElement* containerElement() const;
- HTMLElement* innerBlockElement() const;
- HTMLElement* innerSpinButtonElement() const;
- HTMLElement* resultsButtonElement() const;
- HTMLElement* cancelButtonElement() const;
-
- bool m_searchPopupIsVisible;
- bool m_shouldDrawCapsLockIndicator;
- LayoutUnit m_desiredInnerTextHeight;
- RefPtr<SearchPopupMenu> m_searchPopup;
- Vector<String> m_recentSearches;
-};
-
-inline RenderTextControlSingleLine* toRenderTextControlSingleLine(RenderObject* object)
-{
- ASSERT(!object || object->isTextField());
- return static_cast<RenderTextControlSingleLine*>(object);
-}
-
-// This will catch anyone doing an unnecessary cast.
-void toRenderTextControlSingleLine(const RenderTextControlSingleLine*);
-
-// ----------------------------
-
-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 LayoutPoint&);
-
- bool m_multiLine;
-};
-
-}
-
-#endif
