Rename closeColorChooser to cleanupColorChooser
authorkeishi@webkit.org <keishi@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 1 Sep 2011 05:33:34 +0000 (05:33 +0000)
committerkeishi@webkit.org <keishi@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 1 Sep 2011 05:33:34 +0000 (05:33 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@94270 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/html/ColorInputType.cpp
Source/WebCore/html/ColorInputType.h
Source/WebCore/loader/EmptyClients.h
Source/WebCore/page/Chrome.cpp
Source/WebCore/page/Chrome.h
Source/WebCore/page/ChromeClient.h

index 67deb8e..2572935 100644 (file)
@@ -1,3 +1,24 @@
+2011-08-31  Keishi Hattori  <keishi@webkit.org>
+
+        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  <tkent@chromium.org>
 
         REGRESSION(r88115): "Choose File" button doesn't respect font-size property for the <input>
index 55939ab..2a20c0e 100644 (file)
@@ -66,8 +66,8 @@ PassOwnPtr<InputType> ColorInputType::create(HTMLInputElement* element)
 
 ColorInputType::~ColorInputType()
 {
-    closeColorChooserIfCurrentClient();
-}    
+    cleanupColorChooserIfCurrentClient();
+}
 
 bool ColorInputType::isColorControl() const
 {
@@ -162,7 +162,7 @@ void ColorInputType::handleDOMActivateEvent(Event* event)
 
 void ColorInputType::detach()
 {
-    closeColorChooserIfCurrentClient();
+    cleanupColorChooserIfCurrentClient();
 }
 
 void ColorInputType::colorSelected(const Color& color)
@@ -179,12 +179,12 @@ bool ColorInputType::isColorInputType() const
     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()
index 16f0bae..e98457f 100644 (file)
@@ -61,7 +61,7 @@ private:
     virtual void colorSelected(const Color&);
     virtual bool isColorInputType() const;
 
-    void closeColorChooserIfCurrentClient() const;
+    void cleanupColorChooserIfCurrentClient() const;
     void updateColorSwatch();
     HTMLElement* shadowColorSwatch() const;
 };
index 9365b8e..cedb333 100644 (file)
@@ -199,7 +199,7 @@ public:
 
 #if ENABLE(INPUT_COLOR)
     void openColorChooser(ColorChooser*, const Color&) { }
-    void closeColorChooser() { }
+    void cleanupColorChooser() { }
     void setSelectedColorInColorChooser(const Color&) { }
 #endif
 
index 5c4a40d..495e880 100644 (file)
@@ -474,9 +474,9 @@ void Chrome::openColorChooser(ColorChooser* colorChooser, const Color& initialCo
     m_client->openColorChooser(colorChooser, initialColor);
 }
 
-void Chrome::closeColorChooser()
+void Chrome::cleanupColorChooser()
 {
-    m_client->closeColorChooser();
+    m_client->cleanupColorChooser();
 }
 
 void Chrome::setSelectedColorInColorChooser(const Color& color)
index aee23fd..3b77105 100644 (file)
@@ -157,7 +157,7 @@ namespace WebCore {
 
 #if ENABLE(INPUT_COLOR)
         void openColorChooser(ColorChooser*, const Color&);
-        void closeColorChooser();
+        void cleanupColorChooser();
         void setSelectedColorInColorChooser(const Color&);
 #endif
 
index 7dd2239..3c9a75a 100644 (file)
@@ -235,7 +235,7 @@ namespace WebCore {
 
 #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