Title: [101848] trunk/Source/WebCore
- Revision
- 101848
- Author
- [email protected]
- Date
- 2011-12-02 13:55:41 -0800 (Fri, 02 Dec 2011)
Log Message
[Chromium] Show placeholder even if the element is focused
https://bugs.webkit.org/show_bug.cgi?id=73629
Reviewed by Hajime Morita.
No new tests. Need to update some existing placeholder tests.
* rendering/RenderThemeChromiumMac.h: Add shouldShowPlaceholderWhenFocused().
* rendering/RenderThemeChromiumMac.mm:
(WebCore::RenderThemeChromiumMac::shouldShowPlaceholderWhenFocused):
Returns true.
* rendering/RenderThemeChromiumSkia.cpp:
(WebCore::RenderThemeChromiumSkia::shouldShowPlaceholderWhenFocused): ditto.
* rendering/RenderThemeChromiumSkia.h: Add shouldShowPlaceholderWhenFocused().
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (101847 => 101848)
--- trunk/Source/WebCore/ChangeLog 2011-12-02 21:49:30 UTC (rev 101847)
+++ trunk/Source/WebCore/ChangeLog 2011-12-02 21:55:41 UTC (rev 101848)
@@ -1,5 +1,22 @@
2011-12-02 Kent Tamura <[email protected]>
+ [Chromium] Show placeholder even if the element is focused
+ https://bugs.webkit.org/show_bug.cgi?id=73629
+
+ Reviewed by Hajime Morita.
+
+ No new tests. Need to update some existing placeholder tests.
+
+ * rendering/RenderThemeChromiumMac.h: Add shouldShowPlaceholderWhenFocused().
+ * rendering/RenderThemeChromiumMac.mm:
+ (WebCore::RenderThemeChromiumMac::shouldShowPlaceholderWhenFocused):
+ Returns true.
+ * rendering/RenderThemeChromiumSkia.cpp:
+ (WebCore::RenderThemeChromiumSkia::shouldShowPlaceholderWhenFocused): ditto.
+ * rendering/RenderThemeChromiumSkia.h: Add shouldShowPlaceholderWhenFocused().
+
+2011-12-02 Kent Tamura <[email protected]>
+
[Lion][Windows] Both of placeholder and input text are shown in <input type=number>
https://bugs.webkit.org/show_bug.cgi?id=73615
Modified: trunk/Source/WebCore/rendering/RenderThemeChromiumMac.h (101847 => 101848)
--- trunk/Source/WebCore/rendering/RenderThemeChromiumMac.h 2011-12-02 21:49:30 UTC (rev 101847)
+++ trunk/Source/WebCore/rendering/RenderThemeChromiumMac.h 2011-12-02 21:55:41 UTC (rev 101848)
@@ -57,9 +57,11 @@
virtual int popupInternalPaddingLeft(RenderStyle*) const;
virtual int popupInternalPaddingRight(RenderStyle*) const;
+
private:
virtual void updateActiveState(NSCell*, const RenderObject*);
virtual String extraDefaultStyleSheet();
+ virtual bool shouldShowPlaceholderWhenFocused() const OVERRIDE;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/rendering/RenderThemeChromiumMac.mm (101847 => 101848)
--- trunk/Source/WebCore/rendering/RenderThemeChromiumMac.mm 2011-12-02 21:49:30 UTC (rev 101847)
+++ trunk/Source/WebCore/rendering/RenderThemeChromiumMac.mm 2011-12-02 21:55:41 UTC (rev 101848)
@@ -120,6 +120,11 @@
[cell setControlTint:tint];
}
+bool RenderThemeChromiumMac::shouldShowPlaceholderWhenFocused() const
+{
+ return true;
+}
+
#if ENABLE(VIDEO)
void RenderThemeChromiumMac::adjustMediaSliderThumbSize(RenderStyle* style) const
Modified: trunk/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp (101847 => 101848)
--- trunk/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp 2011-12-02 21:49:30 UTC (rev 101847)
+++ trunk/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp 2011-12-02 21:55:41 UTC (rev 101848)
@@ -540,6 +540,11 @@
return padding;
}
+bool RenderThemeChromiumSkia::shouldShowPlaceholderWhenFocused() const
+{
+ return true;
+}
+
#if ENABLE(PROGRESS_TAG)
//
Modified: trunk/Source/WebCore/rendering/RenderThemeChromiumSkia.h (101847 => 101848)
--- trunk/Source/WebCore/rendering/RenderThemeChromiumSkia.h 2011-12-02 21:49:30 UTC (rev 101847)
+++ trunk/Source/WebCore/rendering/RenderThemeChromiumSkia.h 2011-12-02 21:55:41 UTC (rev 101848)
@@ -151,12 +151,14 @@
IntRect progressValueRectFor(RenderProgress*, const IntRect&) const;
#endif
- private:
- int menuListInternalPadding(RenderStyle*, int paddingType) const;
- bool paintMediaButtonInternal(GraphicsContext*, const IntRect&, Image*);
- IntRect convertToPaintingRect(RenderObject* inputRenderer, const RenderObject* partRenderer, IntRect partRect, const IntRect& localOffset) const;
- };
+private:
+ virtual bool shouldShowPlaceholderWhenFocused() const OVERRIDE;
+ int menuListInternalPadding(RenderStyle*, int paddingType) const;
+ bool paintMediaButtonInternal(GraphicsContext*, const IntRect&, Image*);
+ IntRect convertToPaintingRect(RenderObject* inputRenderer, const RenderObject* partRenderer, IntRect partRect, const IntRect& localOffset) const;
+};
+
} // namespace WebCore
#endif // RenderThemeChromiumSkia_h
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
