[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 18:19:19 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 7a1e73d445809da9cef2e95a081fc0c3a89d104c
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 9 21:10:26 2010 +0000
2010-12-09 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r73635.
http://trac.webkit.org/changeset/73635
https://bugs.webkit.org/show_bug.cgi?id=50778
'Side-effects on 3 css tests needs closer review' (Requested
by mwenge on #webkit).
* platform/qt/Skipped:
2010-12-09 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r73635.
http://trac.webkit.org/changeset/73635
https://bugs.webkit.org/show_bug.cgi?id=50778
'Side-effects on 3 css tests needs closer review' (Requested
by mwenge on #webkit).
* platform/graphics/qt/ImageQt.cpp:
(loadResourcePixmap):
* platform/qt/RenderThemeQt.cpp:
(WebCore::RenderThemeQt::computeSizeBasedOnStyle):
(WebCore::RenderThemeQt::paintSearchField):
(WebCore::RenderThemeQt::adjustSearchFieldStyle):
(WebCore::RenderThemeQt::adjustSearchFieldCancelButtonStyle):
(WebCore::RenderThemeQt::paintSearchFieldCancelButton):
* platform/qt/RenderThemeQt.h:
2010-12-09 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r73635.
http://trac.webkit.org/changeset/73635
https://bugs.webkit.org/show_bug.cgi?id=50778
'Side-effects on 3 css tests needs closer review' (Requested
by mwenge on #webkit).
* Api/qwebsettings.cpp:
(graphics):
* Api/qwebsettings.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73642 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2d3ed53..4d56c38 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-09 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r73635.
+ http://trac.webkit.org/changeset/73635
+ https://bugs.webkit.org/show_bug.cgi?id=50778
+
+ 'Side-effects on 3 css tests needs closer review' (Requested
+ by mwenge on #webkit).
+
+ * platform/qt/Skipped:
+
2010-12-09 Michael Saboff <msaboff at apple.com>
Reviewed by Gavin Barraclough.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 27541e2..5145283 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -509,6 +509,7 @@ fast/dom/open-and-close-by-DOM.html
fast/dom/Window/new-window-opener.html
fast/forms/001.html
fast/forms/focus2.html
+fast/forms/search-cancel-button-mouseup.html
fast/frames/001.html
fast/text/monospace-width-cache.html
@@ -2339,6 +2340,7 @@ fast/forms/listbox-onchange.html
fast/forms/listbox-selection-2.html
fast/forms/listbox-selection.html
fast/forms/onselect-textarea.html
+fast/forms/search-rtl.html
fast/forms/select-writing-direction-natural.html
fast/forms/tabbing-input-iframe.html
fast/forms/textAreaLineHeight.html
@@ -2398,6 +2400,7 @@ fast/encoding/hebrew/8859-8-i.html
fast/encoding/hebrew/logical.html
fast/events/crash-on-mutate-during-drop.html
fast/forms/option-mouseevents.html
+fast/forms/search-abs-pos-cancel-button.html
fast/forms/text-control-intrinsic-widths.html
fast/forms/textarea-metrics.html
fast/history/window-open.html
@@ -2455,6 +2458,9 @@ fast/forms/listbox-deselect-scroll.html
fast/forms/listbox-hit-test-zoomed.html
fast/forms/negativeLineHeight.html
fast/forms/placeholder-pseudo-style.html
+fast/forms/search-styled.html
+fast/forms/search-transformed.html
+fast/forms/search-zoomed.html
fast/forms/textarea-align.html
fast/forms/textarea-setinnerhtml.html
fast/forms/textarea-width.html
@@ -3228,6 +3234,9 @@ fast/forms/radio-nested-labels.html
fast/forms/radio_checked.html
fast/forms/radio_checked_dynamic.html
fast/forms/range-thumb-height-percentage.html
+fast/forms/search-cancel-button-style-sharing.html
+fast/forms/search-display-none-cancel-button.html
+fast/forms/search-placeholder-value-changed.html
fast/forms/searchfield-heights.html
fast/forms/select-accesskey.html
fast/forms/select-align.html
@@ -3565,6 +3574,7 @@ fast/repaint/reflection-redraw.html
fast/repaint/reflection-repaint-test.html
fast/repaint/renderer-destruction-by-invalidateSelection-crash.html
fast/repaint/repaint-resized-overflow.html
+fast/repaint/search-field-cancel.html
fast/repaint/selected-replaced.html
fast/repaint/selection-clear.html
fast/repaint/static-to-positioned.html
@@ -5226,6 +5236,10 @@ animations/suspend-resume-animation.html
animations/suspend-resume-animation-events.html
animations/stop-animation-on-suspend.html
+# [Qt] Search input field doesn't have cancel button
+# https://bugs.webkit.org/show_bug.cgi?id=42887
+fast/forms/search-cancel-button-events.html
+
# [Qt] DRT sideeffect revealed by r63657
# https://bugs.webkit.org/show_bug.cgi?id=42578
http/tests/security/mixedContent/insecure-css-in-main-frame.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 78919ea..69cd659 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-12-09 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r73635.
+ http://trac.webkit.org/changeset/73635
+ https://bugs.webkit.org/show_bug.cgi?id=50778
+
+ 'Side-effects on 3 css tests needs closer review' (Requested
+ by mwenge on #webkit).
+
+ * platform/graphics/qt/ImageQt.cpp:
+ (loadResourcePixmap):
+ * platform/qt/RenderThemeQt.cpp:
+ (WebCore::RenderThemeQt::computeSizeBasedOnStyle):
+ (WebCore::RenderThemeQt::paintSearchField):
+ (WebCore::RenderThemeQt::adjustSearchFieldStyle):
+ (WebCore::RenderThemeQt::adjustSearchFieldCancelButtonStyle):
+ (WebCore::RenderThemeQt::paintSearchFieldCancelButton):
+ * platform/qt/RenderThemeQt.h:
+
2010-12-09 Robert Hogan <robert at webkit.org>
Reviewed by Andreas Kling.
diff --git a/WebCore/platform/graphics/qt/ImageQt.cpp b/WebCore/platform/graphics/qt/ImageQt.cpp
index 6ce725e..3611308 100644
--- a/WebCore/platform/graphics/qt/ImageQt.cpp
+++ b/WebCore/platform/graphics/qt/ImageQt.cpp
@@ -68,10 +68,6 @@ static QPixmap loadResourcePixmap(const char *name)
pixmap = QWebSettings::webGraphic(QWebSettings::DeleteButtonGraphic);
else if (!qstrcmp(name, "inputSpeech"))
pixmap = QWebSettings::webGraphic(QWebSettings::InputSpeechButtonGraphic);
- else if (!qstrcmp(name, "searchCancelButton"))
- pixmap = QWebSettings::webGraphic(QWebSettings::SearchCancelButtonGraphic);
- else if (!qstrcmp(name, "searchCancelButtonPressed"))
- pixmap = QWebSettings::webGraphic(QWebSettings::SearchCancelButtonPressedGraphic);
return pixmap;
}
diff --git a/WebCore/platform/qt/RenderThemeQt.cpp b/WebCore/platform/qt/RenderThemeQt.cpp
index 7fd0412..789abb6 100644
--- a/WebCore/platform/qt/RenderThemeQt.cpp
+++ b/WebCore/platform/qt/RenderThemeQt.cpp
@@ -49,7 +49,6 @@
#include "Page.h"
#include "QWebPageClient.h"
#include "QtStyleOptionWebComboBox.h"
-#include "qwebsettings.h"
#include "RenderBox.h"
#if ENABLE(PROGRESS_TAG)
#include "RenderProgress.h"
@@ -76,16 +75,6 @@
#include <QStyleOptionSlider>
#include <QWidget>
-// These values all match Safari/Win/Chromium
-static const float defaultControlFontPixelSize = 13;
-static const float defaultCancelButtonSize = 9;
-static const float minCancelButtonSize = 5;
-static const float maxCancelButtonSize = 21;
-static const float defaultSearchFieldResultsDecorationSize = 13;
-static const float minSearchFieldResultsDecorationSize = 9;
-static const float maxSearchFieldResultsDecorationSize = 30;
-static const float defaultSearchFieldResultsButtonWidth = 18;
-
namespace WebCore {
@@ -405,7 +394,6 @@ void RenderThemeQt::computeSizeBasedOnStyle(RenderStyle* renderStyle) const
switch (renderStyle->appearance()) {
case TextAreaPart:
- case SearchFieldPart:
case TextFieldPart: {
int padding = findFrameLineWidth(style);
@@ -879,69 +867,28 @@ void RenderThemeQt::adjustSliderThumbStyle(CSSStyleSelector*, RenderStyle* style
bool RenderThemeQt::paintSearchField(RenderObject* o, const PaintInfo& pi,
const IntRect& r)
{
- return paintTextField(o, pi, r);
+ return true;
}
void RenderThemeQt::adjustSearchFieldStyle(CSSStyleSelector* selector, RenderStyle* style,
Element* e) const
{
- style->setBackgroundColor(Color::transparent);
- style->resetBorder();
- style->resetPadding();
- computeSizeBasedOnStyle(style);
+ notImplemented();
+ RenderTheme::adjustSearchFieldStyle(selector, style, e);
}
void RenderThemeQt::adjustSearchFieldCancelButtonStyle(CSSStyleSelector* selector, RenderStyle* style,
Element* e) const
{
- // Taken from RenderThemeChromium.cpp
-
- // Scale the button size based on the font size
- float fontScale = style->fontSize() / defaultControlFontPixelSize;
- int cancelButtonSize = lroundf(qMin(qMax(minCancelButtonSize, defaultCancelButtonSize * fontScale), maxCancelButtonSize));
- style->setWidth(Length(cancelButtonSize, Fixed));
- style->setHeight(Length(cancelButtonSize, Fixed));
-}
-
-// Taken from RenderThemeChromium.cpp
-IntRect RenderThemeQt::convertToPaintingRect(RenderObject* inputRenderer, const RenderObject* partRenderer, IntRect partRect, const IntRect& localOffset) const
-{
- // Compute an offset between the part renderer and the input renderer.
- IntSize offsetFromInputRenderer = -(partRenderer->offsetFromAncestorContainer(inputRenderer));
- // Move the rect into partRenderer's coords.
- partRect.move(offsetFromInputRenderer);
- // Account for the local drawing offset.
- partRect.move(localOffset.x(), localOffset.y());
-
- return partRect;
+ notImplemented();
+ RenderTheme::adjustSearchFieldCancelButtonStyle(selector, style, e);
}
bool RenderThemeQt::paintSearchFieldCancelButton(RenderObject* o, const PaintInfo& pi,
const IntRect& r)
{
- // Adapted from RenderThemeChromium.cpp
-
- // Get the renderer of <input> element.
- Node* input = o->node()->shadowAncestorNode();
- if (!input->renderer()->isBox())
- return false;
- RenderBox* inputRenderBox = toRenderBox(input->renderer());
- IntRect inputContentBox = inputRenderBox->contentBoxRect();
-
- // Make sure the scaled button stays square and will fit in its parent's box.
- int cancelButtonSize = qMin(inputContentBox.width(), qMin(inputContentBox.height(), r.height()));
- // Calculate cancel button's coordinates relative to the input element.
- // Center the button vertically. Round up though, so if it has to be one pixel off-center, it will
- // be one pixel closer to the bottom of the field. This tends to look better with the text.
- IntRect cancelButtonRect(o->offsetFromAncestorContainer(inputRenderBox).width(),
- inputContentBox.y() + (inputContentBox.height() - cancelButtonSize + 1) / 2,
- cancelButtonSize, cancelButtonSize);
- IntRect paintingRect = convertToPaintingRect(inputRenderBox, o, cancelButtonRect, r);
- static Image* cancelImage = Image::loadPlatformResource("searchCancelButton").releaseRef();
- static Image* cancelPressedImage = Image::loadPlatformResource("searchCancelButtonPressed").releaseRef();
- pi.context->drawImage(isPressed(o) ? cancelPressedImage : cancelImage,
- o->style()->colorSpace(), paintingRect);
- return false;
+ notImplemented();
+ return RenderTheme::paintSearchFieldCancelButton(o, pi, r);
}
void RenderThemeQt::adjustSearchFieldDecorationStyle(CSSStyleSelector* selector, RenderStyle* style,
diff --git a/WebCore/platform/qt/RenderThemeQt.h b/WebCore/platform/qt/RenderThemeQt.h
index 059308a..7ab6769 100644
--- a/WebCore/platform/qt/RenderThemeQt.h
+++ b/WebCore/platform/qt/RenderThemeQt.h
@@ -177,8 +177,6 @@ private:
QStyle* fallbackStyle() const;
- IntRect convertToPaintingRect(RenderObject* inputRenderer, const RenderObject* partRenderer, IntRect partRect, const IntRect& localOffset) const;
-
Page* m_page;
#ifdef Q_WS_MAC
diff --git a/WebKit/qt/Api/qwebsettings.cpp b/WebKit/qt/Api/qwebsettings.cpp
index 6c59d73..ed425c2 100644
--- a/WebKit/qt/Api/qwebsettings.cpp
+++ b/WebKit/qt/Api/qwebsettings.cpp
@@ -48,7 +48,6 @@
#include <QSharedData>
#include <QUrl>
#include <QFileInfo>
-#include <QStyle>
#include "NetworkStateNotifier.h"
@@ -102,8 +101,6 @@ static WebGraphicHash* graphics()
hash->insert(QWebSettings::TextAreaSizeGripCornerGraphic, QPixmap(QLatin1String(":webkit/resources/textAreaResizeCorner.png")));
hash->insert(QWebSettings::DeleteButtonGraphic, QPixmap(QLatin1String(":webkit/resources/deleteButton.png")));
hash->insert(QWebSettings::InputSpeechButtonGraphic, QPixmap(QLatin1String(":webkit/resources/inputSpeech.png")));
- hash->insert(QWebSettings::SearchCancelButtonGraphic, QApplication::style()->standardPixmap(QStyle::SP_DialogCloseButton));
- hash->insert(QWebSettings::SearchCancelButtonPressedGraphic, QApplication::style()->standardPixmap(QStyle::SP_DialogCloseButton));
}
return hash;
@@ -375,9 +372,6 @@ QWebSettings* QWebSettings::globalSettings()
\value DefaultFrameIconGraphic The default icon for QWebFrame::icon().
\value TextAreaSizeGripCornerGraphic The graphic shown for the size grip of text areas.
\value DeleteButtonGraphic The graphic shown for the WebKit-Editing-Delete-Button in Deletion UI.
- \value InputSpeechButtonGraphic The graphic shown in input fields that support speech recognition.
- \value SearchCancelButtonGraphic The graphic shown for clearing the text in a search field.
- \value SearchCancelButtonPressedGraphic The graphic shown when SearchCancelButtonGraphic is pressed.
*/
/*!
diff --git a/WebKit/qt/Api/qwebsettings.h b/WebKit/qt/Api/qwebsettings.h
index 008035b..0569ab0 100644
--- a/WebKit/qt/Api/qwebsettings.h
+++ b/WebKit/qt/Api/qwebsettings.h
@@ -85,9 +85,7 @@ public:
DefaultFrameIconGraphic,
TextAreaSizeGripCornerGraphic,
DeleteButtonGraphic,
- InputSpeechButtonGraphic,
- SearchCancelButtonGraphic,
- SearchCancelButtonPressedGraphic
+ InputSpeechButtonGraphic
};
enum FontSize {
MinimumFontSize,
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 90dbfbf..128940c 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-09 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r73635.
+ http://trac.webkit.org/changeset/73635
+ https://bugs.webkit.org/show_bug.cgi?id=50778
+
+ 'Side-effects on 3 css tests needs closer review' (Requested
+ by mwenge on #webkit).
+
+ * Api/qwebsettings.cpp:
+ (graphics):
+ * Api/qwebsettings.h:
+
2010-12-09 Robert Hogan <robert at webkit.org>
Reviewed by Andreas Kling.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list