Title: [94270] trunk/Source/WebCore
- Revision
- 94270
- Author
- [email protected]
- Date
- 2011-08-31 22:33:34 -0700 (Wed, 31 Aug 2011)
Log Message
Rename closeColorChooser to cleanupColorChooser
https://bugs.webkit.org/show_bug.cgi?id=67270
Reviewed by Kent Tamura.
* html/ColorInputType.cpp:
(WebCore::ColorInputType::~ColorInputType):
(WebCore::ColorInputType::detach):
(WebCore::ColorInputType::cleanupColorChooserIfCurrentClient): NSColorPanel shouldn't be closed but the color
chooser listeners need to be taken care of. Therefore closeColorChooser will be renamed to cleanupColorChooser.
This will close the color chooser on platforms where appropriate.
* html/ColorInputType.h:
* loader/EmptyClients.h:
(WebCore::EmptyChromeClient::cleanupColorChooser): Rename.
* page/Chrome.cpp:
(WebCore::Chrome::cleanupColorChooser): Rename.
* page/Chrome.h:
* page/ChromeClient.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (94269 => 94270)
--- trunk/Source/WebCore/ChangeLog 2011-09-01 03:23:12 UTC (rev 94269)
+++ trunk/Source/WebCore/ChangeLog 2011-09-01 05:33:34 UTC (rev 94270)
@@ -1,3 +1,24 @@
+2011-08-31 Keishi Hattori <[email protected]>
+
+ Rename closeColorChooser to cleanupColorChooser
+ https://bugs.webkit.org/show_bug.cgi?id=67270
+
+ Reviewed by Kent Tamura.
+
+ * html/ColorInputType.cpp:
+ (WebCore::ColorInputType::~ColorInputType):
+ (WebCore::ColorInputType::detach):
+ (WebCore::ColorInputType::cleanupColorChooserIfCurrentClient): NSColorPanel shouldn't be closed but the color
+ chooser listeners need to be taken care of. Therefore closeColorChooser will be renamed to cleanupColorChooser.
+ This will close the color chooser on platforms where appropriate.
+ * html/ColorInputType.h:
+ * loader/EmptyClients.h:
+ (WebCore::EmptyChromeClient::cleanupColorChooser): Rename.
+ * page/Chrome.cpp:
+ (WebCore::Chrome::cleanupColorChooser): Rename.
+ * page/Chrome.h:
+ * page/ChromeClient.h:
+
2011-08-31 Kent Tamura <[email protected]>
REGRESSION(r88115): "Choose File" button doesn't respect font-size property for the <input>
Modified: trunk/Source/WebCore/html/ColorInputType.cpp (94269 => 94270)
--- trunk/Source/WebCore/html/ColorInputType.cpp 2011-09-01 03:23:12 UTC (rev 94269)
+++ trunk/Source/WebCore/html/ColorInputType.cpp 2011-09-01 05:33:34 UTC (rev 94270)
@@ -66,8 +66,8 @@
ColorInputType::~ColorInputType()
{
- closeColorChooserIfCurrentClient();
-}
+ cleanupColorChooserIfCurrentClient();
+}
bool ColorInputType::isColorControl() const
{
@@ -162,7 +162,7 @@
void ColorInputType::detach()
{
- closeColorChooserIfCurrentClient();
+ cleanupColorChooserIfCurrentClient();
}
void ColorInputType::colorSelected(const Color& color)
@@ -179,12 +179,12 @@
return true;
}
-void ColorInputType::closeColorChooserIfCurrentClient() const
+void ColorInputType::cleanupColorChooserIfCurrentClient() const
{
if (ColorChooser::chooser()->client() != this)
return;
if (Chrome* chrome = this->chrome())
- chrome->closeColorChooser();
+ chrome->cleanupColorChooser();
}
void ColorInputType::updateColorSwatch()
Modified: trunk/Source/WebCore/html/ColorInputType.h (94269 => 94270)
--- trunk/Source/WebCore/html/ColorInputType.h 2011-09-01 03:23:12 UTC (rev 94269)
+++ trunk/Source/WebCore/html/ColorInputType.h 2011-09-01 05:33:34 UTC (rev 94270)
@@ -61,7 +61,7 @@
virtual void colorSelected(const Color&);
virtual bool isColorInputType() const;
- void closeColorChooserIfCurrentClient() const;
+ void cleanupColorChooserIfCurrentClient() const;
void updateColorSwatch();
HTMLElement* shadowColorSwatch() const;
};
Modified: trunk/Source/WebCore/loader/EmptyClients.h (94269 => 94270)
--- trunk/Source/WebCore/loader/EmptyClients.h 2011-09-01 03:23:12 UTC (rev 94269)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2011-09-01 05:33:34 UTC (rev 94270)
@@ -199,7 +199,7 @@
#if ENABLE(INPUT_COLOR)
void openColorChooser(ColorChooser*, const Color&) { }
- void closeColorChooser() { }
+ void cleanupColorChooser() { }
void setSelectedColorInColorChooser(const Color&) { }
#endif
Modified: trunk/Source/WebCore/page/Chrome.cpp (94269 => 94270)
--- trunk/Source/WebCore/page/Chrome.cpp 2011-09-01 03:23:12 UTC (rev 94269)
+++ trunk/Source/WebCore/page/Chrome.cpp 2011-09-01 05:33:34 UTC (rev 94270)
@@ -474,9 +474,9 @@
m_client->openColorChooser(colorChooser, initialColor);
}
-void Chrome::closeColorChooser()
+void Chrome::cleanupColorChooser()
{
- m_client->closeColorChooser();
+ m_client->cleanupColorChooser();
}
void Chrome::setSelectedColorInColorChooser(const Color& color)
Modified: trunk/Source/WebCore/page/Chrome.h (94269 => 94270)
--- trunk/Source/WebCore/page/Chrome.h 2011-09-01 03:23:12 UTC (rev 94269)
+++ trunk/Source/WebCore/page/Chrome.h 2011-09-01 05:33:34 UTC (rev 94270)
@@ -157,7 +157,7 @@
#if ENABLE(INPUT_COLOR)
void openColorChooser(ColorChooser*, const Color&);
- void closeColorChooser();
+ void cleanupColorChooser();
void setSelectedColorInColorChooser(const Color&);
#endif
Modified: trunk/Source/WebCore/page/ChromeClient.h (94269 => 94270)
--- trunk/Source/WebCore/page/ChromeClient.h 2011-09-01 03:23:12 UTC (rev 94269)
+++ trunk/Source/WebCore/page/ChromeClient.h 2011-09-01 05:33:34 UTC (rev 94270)
@@ -235,7 +235,7 @@
#if ENABLE(INPUT_COLOR)
virtual void openColorChooser(ColorChooser*, const Color&) = 0;
- virtual void closeColorChooser() = 0;
+ virtual void cleanupColorChooser() = 0;
virtual void setSelectedColorInColorChooser(const Color&) = 0;
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
