Title: [153670] trunk/Source/WebKit2
- Revision
- 153670
- Author
- [email protected]
- Date
- 2013-08-02 14:35:36 -0700 (Fri, 02 Aug 2013)
Log Message
[Forms: color] WebColorPickerMac deconstructor shouldn't assert a variable
<rdar://problem/14627633> and https://bugs.webkit.org/show_bug.cgi?id=119419
Patch by Ruth Fong <[email protected]> on 2013-08-02
Reviewed by Tim Horton.
* UIProcess/mac/WebColorPickerMac.mm:
(WebKit::WebColorPickerMac::~WebColorPickerMac): If the m_colorPickerUI variable
is not null, then properly destroy it first before destroying WebColorPickerMac object.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (153669 => 153670)
--- trunk/Source/WebKit2/ChangeLog 2013-08-02 21:32:20 UTC (rev 153669)
+++ trunk/Source/WebKit2/ChangeLog 2013-08-02 21:35:36 UTC (rev 153670)
@@ -1,5 +1,16 @@
2013-08-02 Ruth Fong <[email protected]>
+ [Forms: color] WebColorPickerMac deconstructor shouldn't assert a variable
+ <rdar://problem/14627633> and https://bugs.webkit.org/show_bug.cgi?id=119419
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/mac/WebColorPickerMac.mm:
+ (WebKit::WebColorPickerMac::~WebColorPickerMac): If the m_colorPickerUI variable
+ is not null, then properly destroy it first before destroying WebColorPickerMac object.
+
+2013-08-02 Ruth Fong <[email protected]>
+
[Forms: color] The positioning of the popover color well is inverted
<rdar://problem/14635621> and https://bugs.webkit.org/show_bug.cgi?id=119455
Modified: trunk/Source/WebKit2/UIProcess/mac/WebColorPickerMac.mm (153669 => 153670)
--- trunk/Source/WebKit2/UIProcess/mac/WebColorPickerMac.mm 2013-08-02 21:32:20 UTC (rev 153669)
+++ trunk/Source/WebKit2/UIProcess/mac/WebColorPickerMac.mm 2013-08-02 21:35:36 UTC (rev 153670)
@@ -82,12 +82,8 @@
WebColorPickerMac::~WebColorPickerMac()
{
-#if ENABLE(INPUT_TYPE_COLOR_POPOVER)
if (m_colorPickerUI)
endPicker();
-#else
- ASSERT(!m_colorPickerUI);
-#endif
}
WebColorPickerMac::WebColorPickerMac(WebColorPicker::Client* client, const WebCore::Color& initialColor, const WebCore::IntRect& rect, WKView* view)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
