Title: [260290] trunk/Source
- Revision
- 260290
- Author
- [email protected]
- Date
- 2020-04-17 15:08:31 -0700 (Fri, 17 Apr 2020)
Log Message
REGRESSION (r234105): [iOS] WKColorButton leaks a UIColor
<https://webkit.org/b/210658>
<rdar://problem/61938137>
Reviewed by Darin Adler.
Source/WebCore:
* html/ColorInputType.cpp:
(WebCore::ColorInputType::isKeyboardFocusable const):
* page/Chrome.cpp:
(WebCore::Chrome::createColorChooser):
- Drive-by fix of unreachable code on PLATFORM(IOS_FAMILY).
Source/WebKit:
* UIProcess/ios/forms/WKFormColorPicker.mm:
(-[WKColorButton dealloc]): Add.
- Release _color instance variable to fix leak.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (260289 => 260290)
--- trunk/Source/WebCore/ChangeLog 2020-04-17 21:48:21 UTC (rev 260289)
+++ trunk/Source/WebCore/ChangeLog 2020-04-17 22:08:31 UTC (rev 260290)
@@ -1,3 +1,17 @@
+2020-04-17 David Kilzer <[email protected]>
+
+ REGRESSION (r234105): [iOS] WKColorButton leaks a UIColor
+ <https://webkit.org/b/210658>
+ <rdar://problem/61938137>
+
+ Reviewed by Darin Adler.
+
+ * html/ColorInputType.cpp:
+ (WebCore::ColorInputType::isKeyboardFocusable const):
+ * page/Chrome.cpp:
+ (WebCore::Chrome::createColorChooser):
+ - Drive-by fix of unreachable code on PLATFORM(IOS_FAMILY).
+
2020-04-17 Don Olmstead <[email protected]>
[CMake] Add WebKit::WebCore target
Modified: trunk/Source/WebCore/html/ColorInputType.cpp (260289 => 260290)
--- trunk/Source/WebCore/html/ColorInputType.cpp 2020-04-17 21:48:21 UTC (rev 260289)
+++ trunk/Source/WebCore/html/ColorInputType.cpp 2020-04-17 22:08:31 UTC (rev 260290)
@@ -94,8 +94,9 @@
return false;
return element()->isTextFormControlFocusable();
+#else
+ return false;
#endif
- return false;
}
bool ColorInputType::isColorControl() const
Modified: trunk/Source/WebCore/page/Chrome.cpp (260289 => 260290)
--- trunk/Source/WebCore/page/Chrome.cpp 2020-04-17 21:48:21 UTC (rev 260289)
+++ trunk/Source/WebCore/page/Chrome.cpp 2020-04-17 22:08:31 UTC (rev 260290)
@@ -421,10 +421,13 @@
std::unique_ptr<ColorChooser> Chrome::createColorChooser(ColorChooserClient& client, const Color& initialColor)
{
#if PLATFORM(IOS_FAMILY)
+ UNUSED_PARAM(client);
+ UNUSED_PARAM(initialColor);
return nullptr;
-#endif
+#else
notifyPopupOpeningObservers();
return m_client.createColorChooser(client, initialColor);
+#endif
}
#endif
Modified: trunk/Source/WebKit/ChangeLog (260289 => 260290)
--- trunk/Source/WebKit/ChangeLog 2020-04-17 21:48:21 UTC (rev 260289)
+++ trunk/Source/WebKit/ChangeLog 2020-04-17 22:08:31 UTC (rev 260290)
@@ -1,3 +1,15 @@
+2020-04-17 David Kilzer <[email protected]>
+
+ REGRESSION (r234105): [iOS] WKColorButton leaks a UIColor
+ <https://webkit.org/b/210658>
+ <rdar://problem/61938137>
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/ios/forms/WKFormColorPicker.mm:
+ (-[WKColorButton dealloc]): Add.
+ - Release _color instance variable to fix leak.
+
2020-04-17 Per Arne Vollan <[email protected]>
[iOS] Deny iokit open access of unused class in the WebContent sandbox
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKFormColorPicker.mm (260289 => 260290)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKFormColorPicker.mm 2020-04-17 21:48:21 UTC (rev 260289)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKFormColorPicker.mm 2020-04-17 22:08:31 UTC (rev 260290)
@@ -75,6 +75,14 @@
return colorButton;
}
+- (void)dealloc
+{
+ [_color release];
+ _color = nil;
+
+ [super dealloc];
+}
+
@end
#pragma mark - WKColorMatrixView
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
