Title: [187102] branches/safari-601.1-branch/Source/WebKit2
- Revision
- 187102
- Author
- bshaf...@apple.com
- Date
- 2015-07-21 08:50:57 -0700 (Tue, 21 Jul 2015)
Log Message
Merged r186897. rdar://problem/21692212
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (187101 => 187102)
--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-21 06:18:24 UTC (rev 187101)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-21 15:50:57 UTC (rev 187102)
@@ -1,3 +1,18 @@
+2015-07-21 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r186897.
+
+ 2015-07-16 Brady Eidson <beid...@apple.com>
+
+ Review feedback followup for:
+ REGRESSION(r186088): Crash under WebKit::WebPageProxy::didFailLoadForFrame
+ <rdar://problem/21692212> and https://bugs.webkit.org/show_bug.cgi?id=146988
+
+ * UIProcess/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::refView): CFRetain instead of Obj-C retain.
+ (WebKit::PageClientImpl::derefView): CFRelease instead of Obj-C release.
+
+
2015-07-20 Matthew Hanson <matthew_han...@apple.com>
Merge r187072. rdar://problem/21582858
Modified: branches/safari-601.1-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (187101 => 187102)
--- branches/safari-601.1-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-07-21 06:18:24 UTC (rev 187101)
+++ branches/safari-601.1-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-07-21 15:50:57 UTC (rev 187102)
@@ -838,12 +838,12 @@
void PageClientImpl::refView()
{
- [m_wkView retain];
+ CFRetain(m_wkView);
}
void PageClientImpl::derefView()
{
- [m_wkView release];
+ CFRelease(m_wkView);
}
} // namespace WebKit
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
