Title: [94279] trunk/Source/WebCore
- Revision
- 94279
- Author
- [email protected]
- Date
- 2011-09-01 00:40:02 -0700 (Thu, 01 Sep 2011)
Log Message
Rename colorSelected to didChooseColor
https://bugs.webkit.org/show_bug.cgi?id=67271
Reviewed by Kent Tamura.
* WebCore.exp.in:
* html/ColorInputType.cpp:
(WebCore::ColorInputType::didChooseColor): Renamed colorSelected to didChooseColor so it follows common naming practice.
* html/ColorInputType.h:
* platform/ColorChooser.cpp:
(WebCore::ColorChooser::didChooseColor): Renamed.
* platform/ColorChooser.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (94278 => 94279)
--- trunk/Source/WebCore/ChangeLog 2011-09-01 07:27:22 UTC (rev 94278)
+++ trunk/Source/WebCore/ChangeLog 2011-09-01 07:40:02 UTC (rev 94279)
@@ -1,3 +1,18 @@
+2011-09-01 Keishi Hattori <[email protected]>
+
+ Rename colorSelected to didChooseColor
+ https://bugs.webkit.org/show_bug.cgi?id=67271
+
+ Reviewed by Kent Tamura.
+
+ * WebCore.exp.in:
+ * html/ColorInputType.cpp:
+ (WebCore::ColorInputType::didChooseColor): Renamed colorSelected to didChooseColor so it follows common naming practice.
+ * html/ColorInputType.h:
+ * platform/ColorChooser.cpp:
+ (WebCore::ColorChooser::didChooseColor): Renamed.
+ * platform/ColorChooser.h:
+
2011-09-01 Adam Barth <[email protected]>
Attempt to fix Windows build.
Modified: trunk/Source/WebCore/WebCore.exp.in (94278 => 94279)
--- trunk/Source/WebCore/WebCore.exp.in 2011-09-01 07:27:22 UTC (rev 94278)
+++ trunk/Source/WebCore/WebCore.exp.in 2011-09-01 07:40:02 UTC (rev 94279)
@@ -1921,7 +1921,7 @@
#if ENABLE(INPUT_COLOR)
__ZN7WebCore12ColorChooser7chooserEv
-__ZNK7WebCore12ColorChooser13colorSelectedERKNS_5ColorE
+__ZNK7WebCore12ColorChooser13didChooseColorERKNS_5ColorE
__ZN7WebCore5ColorC1ERKN3WTF6StringE
__ZN7WebCore16HTMLInputElement21connectToColorChooserEv
#endif
Modified: trunk/Source/WebCore/html/ColorInputType.cpp (94278 => 94279)
--- trunk/Source/WebCore/html/ColorInputType.cpp 2011-09-01 07:27:22 UTC (rev 94278)
+++ trunk/Source/WebCore/html/ColorInputType.cpp 2011-09-01 07:40:02 UTC (rev 94279)
@@ -165,7 +165,7 @@
cleanupColorChooserIfCurrentClient();
}
-void ColorInputType::colorSelected(const Color& color)
+void ColorInputType::didChooseColor(const Color& color)
{
if (element()->disabled() || element()->readOnly() || color == valueAsColor())
return;
Modified: trunk/Source/WebCore/html/ColorInputType.h (94278 => 94279)
--- trunk/Source/WebCore/html/ColorInputType.h 2011-09-01 07:27:22 UTC (rev 94278)
+++ trunk/Source/WebCore/html/ColorInputType.h 2011-09-01 07:40:02 UTC (rev 94279)
@@ -58,7 +58,7 @@
virtual void detach();
// ColorChooserClient implementation.
- virtual void colorSelected(const Color&);
+ virtual void didChooseColor(const Color&);
virtual bool isColorInputType() const;
void cleanupColorChooserIfCurrentClient() const;
Modified: trunk/Source/WebCore/platform/ColorChooser.cpp (94278 => 94279)
--- trunk/Source/WebCore/platform/ColorChooser.cpp 2011-09-01 07:27:22 UTC (rev 94278)
+++ trunk/Source/WebCore/platform/ColorChooser.cpp 2011-09-01 07:40:02 UTC (rev 94279)
@@ -62,10 +62,10 @@
m_client = 0;
}
-void ColorChooser::colorSelected(const Color& color) const
+void ColorChooser::didChooseColor(const Color& color) const
{
if (m_client)
- m_client->colorSelected(color);
+ m_client->didChooseColor(color);
}
}
Modified: trunk/Source/WebCore/platform/ColorChooser.h (94278 => 94279)
--- trunk/Source/WebCore/platform/ColorChooser.h 2011-09-01 07:27:22 UTC (rev 94278)
+++ trunk/Source/WebCore/platform/ColorChooser.h 2011-09-01 07:40:02 UTC (rev 94279)
@@ -41,7 +41,7 @@
class ColorChooserClient {
public:
virtual ~ColorChooserClient();
- virtual void colorSelected(const Color&) = 0;
+ virtual void didChooseColor(const Color&) = 0;
virtual bool isColorInputType() const { return false; }
};
@@ -53,7 +53,7 @@
void connectClient(ColorChooserClient*);
void disconnectClient(ColorChooserClient*);
- void colorSelected(const Color&) const;
+ void didChooseColor(const Color&) const;
private:
ColorChooser()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
