Title: [184280] branches/safari-601.1.32-branch/Source/WebKit2
- Revision
- 184280
- Author
- [email protected]
- Date
- 2015-05-13 00:10:03 -0700 (Wed, 13 May 2015)
Log Message
Merged r184241. rdar://problem/20172315
Modified Paths
Diff
Modified: branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog (184279 => 184280)
--- branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-13 07:09:00 UTC (rev 184279)
+++ branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-13 07:10:03 UTC (rev 184280)
@@ -1,5 +1,22 @@
2015-05-13 Babak Shafiei <[email protected]>
+ Merge r184241.
+
+ 2015-05-12 Jon Honeycutt <[email protected]>
+
+ Crash when using <input type=file>
+
+ <https://bugs.webkit.org/show_bug.cgi?id=144939>
+ <rdar://problem/20172315>
+
+ Reviewed by Andy Estes.
+
+ * UIProcess/ios/forms/WKFileUploadPanel.mm:
+ Use a RefPtr to hold the WebOpenPanelResultListenerProxy, because the
+ WKFileUploadPanel can outlive it.
+
+2015-05-13 Babak Shafiei <[email protected]>
+
Merge r184231.
2015-05-12 Simon Fraser <[email protected]>
Modified: branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm (184279 => 184280)
--- branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm 2015-05-13 07:09:00 UTC (rev 184279)
+++ branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm 2015-05-13 07:10:03 UTC (rev 184280)
@@ -283,7 +283,7 @@
@implementation WKFileUploadPanel {
WKContentView *_view;
- WebKit::WebOpenPanelResultListenerProxy* _listener;
+ RefPtr<WebKit::WebOpenPanelResultListenerProxy> _listener;
RetainPtr<NSArray> _mimeTypes;
CGPoint _interactionPoint;
BOOL _allowMultipleFiles;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
