Title: [94264] trunk/Source/WebCore
- Revision
- 94264
- Author
- kei...@webkit.org
- Date
- 2011-08-31 18:56:36 -0700 (Wed, 31 Aug 2011)
Log Message
Remove closeColorChooser call from FrameLoader::transitionToCommitted
https://bugs.webkit.org/show_bug.cgi?id=67267
Reviewed by Darin Adler.
* html/ColorInputType.cpp:
(WebCore::ColorInputType::closeColorChooserIfCurrentClient): Moved order to match header.
* html/ColorInputType.h:
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::transitionToCommitted): Remove ColorInputType::closeColorChooserIfCurrentClient call.
It wasn't the right place to directly manipulate the UI.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (94263 => 94264)
--- trunk/Source/WebCore/ChangeLog 2011-09-01 01:46:24 UTC (rev 94263)
+++ trunk/Source/WebCore/ChangeLog 2011-09-01 01:56:36 UTC (rev 94264)
@@ -1,3 +1,17 @@
+2011-08-31 Keishi Hattori <kei...@webkit.org>
+
+ Remove closeColorChooser call from FrameLoader::transitionToCommitted
+ https://bugs.webkit.org/show_bug.cgi?id=67267
+
+ Reviewed by Darin Adler.
+
+ * html/ColorInputType.cpp:
+ (WebCore::ColorInputType::closeColorChooserIfCurrentClient): Moved order to match header.
+ * html/ColorInputType.h:
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::transitionToCommitted): Remove ColorInputType::closeColorChooserIfCurrentClient call.
+ It wasn't the right place to directly manipulate the UI.
+
2011-08-31 Chris Rogers <crog...@google.com>
Add defensive bounds checking for AudioNode methods
Modified: trunk/Source/WebCore/html/ColorInputType.cpp (94263 => 94264)
--- trunk/Source/WebCore/html/ColorInputType.cpp 2011-09-01 01:46:24 UTC (rev 94263)
+++ trunk/Source/WebCore/html/ColorInputType.cpp 2011-09-01 01:56:36 UTC (rev 94264)
@@ -179,6 +179,14 @@
return true;
}
+void ColorInputType::closeColorChooserIfCurrentClient() const
+{
+ if (ColorChooser::chooser()->client() != this)
+ return;
+ if (Chrome* chrome = this->chrome())
+ chrome->closeColorChooser();
+}
+
void ColorInputType::updateColorSwatch()
{
HTMLElement* colorSwatch = shadowColorSwatch();
@@ -195,14 +203,6 @@
return shadow ? toHTMLElement(shadow->firstChild()->firstChild()) : 0;
}
-void ColorInputType::closeColorChooserIfCurrentClient() const
-{
- if (ColorChooser::chooser()->client() != this)
- return;
- if (Chrome* chrome = this->chrome())
- chrome->closeColorChooser();
-}
-
} // namespace WebCore
#endif // ENABLE(INPUT_COLOR)
Modified: trunk/Source/WebCore/html/ColorInputType.h (94263 => 94264)
--- trunk/Source/WebCore/html/ColorInputType.h 2011-09-01 01:46:24 UTC (rev 94263)
+++ trunk/Source/WebCore/html/ColorInputType.h 2011-09-01 01:56:36 UTC (rev 94264)
@@ -43,8 +43,6 @@
static PassOwnPtr<InputType> create(HTMLInputElement*);
virtual ~ColorInputType();
- void closeColorChooserIfCurrentClient() const;
-
private:
ColorInputType(HTMLInputElement* element) : InputType(element) { }
virtual bool isColorControl() const;
@@ -63,6 +61,7 @@
virtual void colorSelected(const Color&);
virtual bool isColorInputType() const;
+ void closeColorChooserIfCurrentClient() const;
void updateColorSwatch();
HTMLElement* shadowColorSwatch() const;
};
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (94263 => 94264)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2011-09-01 01:46:24 UTC (rev 94263)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2011-09-01 01:56:36 UTC (rev 94264)
@@ -1854,12 +1854,6 @@
if (m_frame->view())
m_frame->view()->scrollAnimator()->cancelAnimations();
-#if ENABLE(INPUT_COLOR)
- ColorChooserClient* colorChooserClient = ColorChooser::chooser()->client();
- if (colorChooserClient && colorChooserClient->isColorInputType())
- static_cast<ColorInputType*>(colorChooserClient)->closeColorChooserIfCurrentClient();
-#endif
-
m_client->setCopiesOnScroll();
history()->updateForCommit();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
