<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[162505] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/162505">162505</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-01-21 22:18:19 -0800 (Tue, 21 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[wk2] De-.get()ify receivers of Objective-C messages
https://bugs.webkit.org/show_bug.cgi?id=127398
Reviewed by Sam Weinig.
RetainPtr does the right thing when you use it as the
receiver of an Obj-C message, so we don't need .get().
Long and useless file list elided.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedDownloadsmacDownloadMacmm">trunk/Source/WebKit2/Shared/Downloads/mac/DownloadMac.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkCustomProtocolsmacCustomProtocolManagerMacmm">trunk/Source/WebKit2/Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedmacArgumentCodersMacmm">trunk/Source/WebKit2/Shared/mac/ArgumentCodersMac.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedmacObjCObjectGraphCodersmm">trunk/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIiosWKGeolocationProviderIOSmm">trunk/Source/WebKit2/UIProcess/API/ios/WKGeolocationProviderIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIiosWKInteractionViewmm">trunk/Source/WebKit2/UIProcess/API/ios/WKInteractionView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacFindIndicatorWindowmm">trunk/Source/WebKit2/UIProcess/API/mac/FindIndicatorWindow.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKPrintingViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsmacPluginProcessProxyMacmm">trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacCorrectionPanelmm">trunk/Source/WebKit2/UIProcess/mac/CorrectionPanel.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacTextCheckerMacmm">trunk/Source/WebKit2/UIProcess/mac/TextCheckerMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKFullScreenWindowControllermm">trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMacmm">trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebInspectorProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebPopupMenuProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessEntryPointmacLegacyProcessWebContentProcessMainmm">trunk/Source/WebKit2/WebProcess/EntryPoint/mac/LegacyProcess/WebContentProcessMain.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapemacPluginProxyMacmm">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFPDFPluginmm">trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebDragClientMacmm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacPageBannerMacmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/PageBannerMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (162504 => 162505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-22 06:08:09 UTC (rev 162504)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-22 06:18:19 UTC (rev 162505)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-01-21 Tim Horton <timothy_horton@apple.com>
+
+ [wk2] De-.get()ify receivers of Objective-C messages
+ https://bugs.webkit.org/show_bug.cgi?id=127398
+
+ Reviewed by Sam Weinig.
+
+ RetainPtr does the right thing when you use it as the
+ receiver of an Obj-C message, so we don't need .get().
+
+ Long and useless file list elided.
+
</ins><span class="cx"> 2014-01-21 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> The IDB backing store put() method shouldn't call IDB callbacks directly
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedDownloadsmacDownloadMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Downloads/mac/DownloadMac.mm (162504 => 162505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Downloads/mac/DownloadMac.mm 2014-01-22 06:08:09 UTC (rev 162504)
+++ trunk/Source/WebKit2/Shared/Downloads/mac/DownloadMac.mm 2014-01-22 06:18:19 UTC (rev 162505)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> m_nsURLDownload = adoptNS([[NSURLDownload alloc] initWithRequest:m_request.nsURLRequest(UpdateHTTPBody) delegate:m_delegate.get()]);
</span><span class="cx">
</span><span class="cx"> // FIXME: Allow this to be changed by the client.
</span><del>- [m_nsURLDownload.get() setDeletesFileUponFailure:NO];
</del><ins>+ [m_nsURLDownload setDeletesFileUponFailure:NO];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Download::startWithHandle(ResourceHandle* handle, const ResourceResponse& response)
</span><span class="lines">@@ -79,15 +79,15 @@
</span><span class="cx"> proxy:nil];
</span><span class="cx">
</span><span class="cx"> // FIXME: Allow this to be changed by the client.
</span><del>- [m_nsURLDownload.get() setDeletesFileUponFailure:NO];
</del><ins>+ [m_nsURLDownload setDeletesFileUponFailure:NO];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Download::cancel()
</span><span class="cx"> {
</span><del>- [m_nsURLDownload.get() cancel];
</del><ins>+ [m_nsURLDownload cancel];
</ins><span class="cx">
</span><del>- RetainPtr<NSData> resumeData = [m_nsURLDownload.get() resumeData];
- didCancel(IPC::DataReference(reinterpret_cast<const uint8_t*>([resumeData.get() bytes]), [resumeData.get() length]));
</del><ins>+ RetainPtr<NSData> resumeData = [m_nsURLDownload resumeData];
+ didCancel(IPC::DataReference(reinterpret_cast<const uint8_t*>([resumeData bytes]), [resumeData length]));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Download::platformInvalidate()
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> ASSERT(m_nsURLDownload);
</span><span class="cx"> ASSERT(m_delegate);
</span><span class="cx">
</span><del>- [m_delegate.get() invalidate];
</del><ins>+ [m_delegate invalidate];
</ins><span class="cx"> m_delegate = nullptr;
</span><span class="cx"> m_nsURLDownload = nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSData> resumeData = [download resumeData];
</span><del>- IPC::DataReference dataReference(reinterpret_cast<const uint8_t*>([resumeData.get() bytes]), [resumeData.get() length]);
</del><ins>+ IPC::DataReference dataReference(reinterpret_cast<const uint8_t*>([resumeData bytes]), [resumeData length]);
</ins><span class="cx">
</span><span class="cx"> _download->didFail(error, dataReference);
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkCustomProtocolsmacCustomProtocolManagerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm (162504 => 162505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm 2014-01-22 06:08:09 UTC (rev 162504)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm 2014-01-22 06:18:19 UTC (rev 162505)
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> RetainPtr<NSError> nsError = error.nsError();
</span><span class="cx">
</span><span class="cx"> dispatchOnResourceLoaderRunLoop(^ {
</span><del>- [[protocol.get() client] URLProtocol:protocol.get() didFailWithError:nsError.get()];
</del><ins>+ [[protocol client] URLProtocol:protocol.get() didFailWithError:nsError.get()];
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> removeCustomProtocol(protocol.get());
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> RetainPtr<NSData> nsData = adoptNS([[NSData alloc] initWithBytes:data.data() length:data.size()]);
</span><span class="cx">
</span><span class="cx"> dispatchOnResourceLoaderRunLoop(^ {
</span><del>- [[protocol.get() client] URLProtocol:protocol.get() didLoadData:nsData.get()];
</del><ins>+ [[protocol client] URLProtocol:protocol.get() didLoadData:nsData.get()];
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -244,7 +244,7 @@
</span><span class="cx"> RetainPtr<NSURLResponse> nsResponse = response.nsURLResponse();
</span><span class="cx">
</span><span class="cx"> dispatchOnResourceLoaderRunLoop(^ {
</span><del>- [[protocol.get() client] URLProtocol:protocol.get() didReceiveResponse:nsResponse.get() cacheStoragePolicy:static_cast<NSURLCacheStoragePolicy>(cacheStoragePolicy)];
</del><ins>+ [[protocol client] URLProtocol:protocol.get() didReceiveResponse:nsResponse.get() cacheStoragePolicy:static_cast<NSURLCacheStoragePolicy>(cacheStoragePolicy)];
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> dispatchOnResourceLoaderRunLoop(^ {
</span><del>- [[protocol.get() client] URLProtocolDidFinishLoading:protocol.get()];
</del><ins>+ [[protocol client] URLProtocolDidFinishLoading:protocol.get()];
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> removeCustomProtocol(protocol.get());
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacArgumentCodersMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/ArgumentCodersMac.mm (162504 => 162505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/ArgumentCodersMac.mm 2014-01-22 06:08:09 UTC (rev 162504)
+++ trunk/Source/WebKit2/Shared/mac/ArgumentCodersMac.mm 2014-01-22 06:18:19 UTC (rev 162505)
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx"> if (!IPC::decode(decoder, plainString))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- NSUInteger stringLength = [plainString.get() length];
</del><ins>+ NSUInteger stringLength = [plainString length];
</ins><span class="cx">
</span><span class="cx"> RetainPtr<NSMutableAttributedString> resultString = adoptNS([[NSMutableAttributedString alloc] initWithString:plainString.get()]);
</span><span class="cx">
</span><span class="lines">@@ -273,7 +273,7 @@
</span><span class="cx">
</span><span class="cx"> if (!IPC::decode(decoder, attributes))
</span><span class="cx"> return false;
</span><del>- [resultString.get() addAttributes:attributes.get() range:NSMakeRange(rangeLocation, rangeLength)];
</del><ins>+ [resultString addAttributes:attributes.get() range:NSMakeRange(rangeLocation, rangeLength)];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> result = adoptNS(resultString.leakRef());
</span><span class="lines">@@ -340,7 +340,7 @@
</span><span class="cx"> if (!decode(decoder, value))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- [dictionary.get() setObject:value.get() forKey:key.get()];
</del><ins>+ [dictionary setObject:value.get() forKey:key.get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> result = adoptNS(dictionary.leakRef());
</span><span class="lines">@@ -425,7 +425,7 @@
</span><span class="cx"> if (!decode(decoder, value))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- [array.get() addObject:value.get()];
</del><ins>+ [array addObject:value.get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> result = adoptNS(array.leakRef());
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacObjCObjectGraphCodersmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm (162504 => 162505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm 2014-01-22 06:08:09 UTC (rev 162504)
+++ trunk/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm 2014-01-22 06:18:19 UTC (rev 162505)
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> if (!decoder.decode(messageCoder))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- [array.get() addObject:value.get()];
</del><ins>+ [array addObject:value.get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> coder.m_root = array;
</span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx"> if (!decoder.decode(valueMessageCoder))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- [dictionary.get() setObject:value.get() forKey:key.get()];
</del><ins>+ [dictionary setObject:value.get() forKey:key.get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> coder.m_root = dictionary;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIiosWKGeolocationProviderIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/ios/WKGeolocationProviderIOS.mm (162504 => 162505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/ios/WKGeolocationProviderIOS.mm 2014-01-22 06:08:09 UTC (rev 162504)
+++ trunk/Source/WebKit2/UIProcess/API/ios/WKGeolocationProviderIOS.mm 2014-01-22 06:18:19 UTC (rev 162505)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (_requestsWaitingForCoreLocationStart.isEmpty() && _requestsInWarmUp.isEmpty()) {
</span><del>- [_coreLocationProvider.get() stop];
</del><ins>+ [_coreLocationProvider stop];
</ins><span class="cx"> _lastActivePosition.clear();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> -(void)_startUpdating
</span><span class="cx"> {
</span><span class="cx"> _isWebCoreGeolocationActive = YES;
</span><del>- [_coreLocationProvider.get() start];
</del><ins>+ [_coreLocationProvider start];
</ins><span class="cx">
</span><span class="cx"> // If we have the last position, it is from the initialization or warm up. It is the last known
</span><span class="cx"> // good position so we can return it directly.
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx">
</span><span class="cx"> -(void)_setEnableHighAccuracy:(BOOL)enableHighAccuracy
</span><span class="cx"> {
</span><del>- [_coreLocationProvider.get() setEnableHighAccuracy:enableHighAccuracy];
</del><ins>+ [_coreLocationProvider setEnableHighAccuracy:enableHighAccuracy];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark - Public API implementation.
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx"> geolocationRequestData.permissionRequest = toImpl(permissionRequest);
</span><span class="cx"> geolocationRequestData.window = window;
</span><span class="cx"> _requestsWaitingForCoreLocationStart.append(geolocationRequestData);
</span><del>- [_coreLocationProvider.get() start];
</del><ins>+ [_coreLocationProvider start];
</ins><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)deny
</span><span class="cx"> {
</span><del>- [_provider.get() permissionDenied:_permissionRequestProxy.get()];
</del><ins>+ [_provider permissionDenied:_permissionRequestProxy.get()];
</ins><span class="cx"> _permissionRequestProxy->deny();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIiosWKInteractionViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/ios/WKInteractionView.mm (162504 => 162505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/ios/WKInteractionView.mm 2014-01-22 06:08:09 UTC (rev 162504)
+++ trunk/Source/WebKit2/UIProcess/API/ios/WKInteractionView.mm 2014-01-22 06:18:19 UTC (rev 162505)
</span><span class="lines">@@ -307,13 +307,13 @@
</span><span class="cx"> const CGFloat UIWebViewMinimumHighlightRadius = 2.0;
</span><span class="cx"> if (!_highlightView) {
</span><span class="cx"> _highlightView = adoptNS([[_UIHighlightView alloc] initWithFrame:CGRectZero]);
</span><del>- [_highlightView.get() setOpaque:NO];
- [_highlightView.get() setCornerRadius:UIWebViewMinimumHighlightRadius];
</del><ins>+ [_highlightView setOpaque:NO];
+ [_highlightView setCornerRadius:UIWebViewMinimumHighlightRadius];
</ins><span class="cx"> }
</span><span class="cx"> [self addSubview:_highlightView.get()];
</span><span class="cx">
</span><span class="cx"> RetainPtr<UIColor> highlightUIKitColor = adoptNS([[UIColor alloc] initWithRed:(color.red() / 255.0) green:(color.green() / 255.0) blue:(color.blue() / 255.0) alpha:(color.alpha() / 255.0)]);
</span><del>- [_highlightView.get() setColor:highlightUIKitColor.get()];
</del><ins>+ [_highlightView setColor:highlightUIKitColor.get()];
</ins><span class="cx">
</span><span class="cx"> bool allHighlightRectsAreRectilinear = true;
</span><span class="cx"> const size_t quadCount = highlightedQuads.size();
</span><span class="lines">@@ -333,31 +333,31 @@
</span><span class="cx"> // FIXME: WebKit1 uses the visibleRect. Using the whole frame from the page seems overkill.
</span><span class="cx"> CGRect boundaryRect = [self frame];
</span><span class="cx"> if (allHighlightRectsAreRectilinear)
</span><del>- [_highlightView.get() setFrames:rects.get() boundaryRect:boundaryRect];
</del><ins>+ [_highlightView setFrames:rects.get() boundaryRect:boundaryRect];
</ins><span class="cx"> else {
</span><span class="cx"> RetainPtr<NSMutableArray> quads = adoptNS([[NSMutableArray alloc] initWithCapacity:static_cast<const NSUInteger>(quadCount)]);
</span><span class="cx"> for (size_t i = 0; i < quadCount; ++i) {
</span><span class="cx"> const FloatQuad& quad = highlightedQuads[i];
</span><span class="cx"> FloatQuad extendedQuad = inflateQuad(quad, UIWebViewMinimumHighlightRadius);
</span><del>- [quads.get() addObject:[NSValue valueWithCGPoint:extendedQuad.p1()]];
- [quads.get() addObject:[NSValue valueWithCGPoint:extendedQuad.p2()]];
- [quads.get() addObject:[NSValue valueWithCGPoint:extendedQuad.p3()]];
- [quads.get() addObject:[NSValue valueWithCGPoint:extendedQuad.p4()]];
</del><ins>+ [quads addObject:[NSValue valueWithCGPoint:extendedQuad.p1()]];
+ [quads addObject:[NSValue valueWithCGPoint:extendedQuad.p2()]];
+ [quads addObject:[NSValue valueWithCGPoint:extendedQuad.p3()]];
+ [quads addObject:[NSValue valueWithCGPoint:extendedQuad.p4()]];
</ins><span class="cx"> }
</span><del>- [_highlightView.get() setQuads:quads.get() boundaryRect:boundaryRect];
</del><ins>+ [_highlightView setQuads:quads.get() boundaryRect:boundaryRect];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSMutableArray> borderRadii = adoptNS([[NSMutableArray alloc] initWithCapacity:4]);
</span><del>- [borderRadii.get() addObject:[NSValue valueWithCGSize:CGSizeMake(topLeftRadius.width() + UIWebViewMinimumHighlightRadius, topLeftRadius.height() + UIWebViewMinimumHighlightRadius)]];
- [borderRadii.get() addObject:[NSValue valueWithCGSize:CGSizeMake(topRightRadius.width() + UIWebViewMinimumHighlightRadius, topRightRadius.height() + UIWebViewMinimumHighlightRadius)]];
- [borderRadii.get() addObject:[NSValue valueWithCGSize:CGSizeMake(bottomLeftRadius.width() + UIWebViewMinimumHighlightRadius, bottomLeftRadius.height() + UIWebViewMinimumHighlightRadius)]];
- [borderRadii.get() addObject:[NSValue valueWithCGSize:CGSizeMake(bottomRightRadius.width() + UIWebViewMinimumHighlightRadius, bottomRightRadius.height() + UIWebViewMinimumHighlightRadius)]];
- [_highlightView.get() setCornerRadii:borderRadii.get()];
</del><ins>+ [borderRadii addObject:[NSValue valueWithCGSize:CGSizeMake(topLeftRadius.width() + UIWebViewMinimumHighlightRadius, topLeftRadius.height() + UIWebViewMinimumHighlightRadius)]];
+ [borderRadii addObject:[NSValue valueWithCGSize:CGSizeMake(topRightRadius.width() + UIWebViewMinimumHighlightRadius, topRightRadius.height() + UIWebViewMinimumHighlightRadius)]];
+ [borderRadii addObject:[NSValue valueWithCGSize:CGSizeMake(bottomLeftRadius.width() + UIWebViewMinimumHighlightRadius, bottomLeftRadius.height() + UIWebViewMinimumHighlightRadius)]];
+ [borderRadii addObject:[NSValue valueWithCGSize:CGSizeMake(bottomRightRadius.width() + UIWebViewMinimumHighlightRadius, bottomRightRadius.height() + UIWebViewMinimumHighlightRadius)]];
+ [_highlightView setCornerRadii:borderRadii.get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_cancelLongPressGestureRecognizer
</span><span class="cx"> {
</span><del>- [_highlightLongPressGestureRecognizer.get() cancel];
</del><ins>+ [_highlightLongPressGestureRecognizer cancel];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_didScroll
</span><span class="lines">@@ -499,7 +499,7 @@
</span><span class="cx"> - (void)_cancelInteraction
</span><span class="cx"> {
</span><span class="cx"> _isTapHighlightIDValid = NO;
</span><del>- [_highlightView.get() removeFromSuperview];
</del><ins>+ [_highlightView removeFromSuperview];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)hasSelectablePositionAtPoint:(CGPoint)point
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacFindIndicatorWindowmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/FindIndicatorWindow.mm (162504 => 162505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/FindIndicatorWindow.mm 2014-01-22 06:08:09 UTC (rev 162504)
+++ trunk/Source/WebKit2/UIProcess/API/mac/FindIndicatorWindow.mm 2014-01-22 06:18:19 UTC (rev 162505)
</span><span class="lines">@@ -150,15 +150,15 @@
</span><span class="cx"> backing:NSBackingStoreBuffered
</span><span class="cx"> defer:NO]);
</span><span class="cx">
</span><del>- [m_findIndicatorWindow.get() setBackgroundColor:[NSColor clearColor]];
- [m_findIndicatorWindow.get() setOpaque:NO];
- [m_findIndicatorWindow.get() setIgnoresMouseEvents:YES];
</del><ins>+ [m_findIndicatorWindow setBackgroundColor:[NSColor clearColor]];
+ [m_findIndicatorWindow setOpaque:NO];
+ [m_findIndicatorWindow setIgnoresMouseEvents:YES];
</ins><span class="cx">
</span><span class="cx"> RetainPtr<WKFindIndicatorView> findIndicatorView = adoptNS([[WKFindIndicatorView alloc] _initWithFindIndicator:m_findIndicator]);
</span><del>- [m_findIndicatorWindow.get() setContentView:findIndicatorView.get()];
</del><ins>+ [m_findIndicatorWindow setContentView:findIndicatorView.get()];
</ins><span class="cx">
</span><span class="cx"> [[m_wkView window] addChildWindow:m_findIndicatorWindow.get() ordered:NSWindowAbove];
</span><del>- [m_findIndicatorWindow.get() setReleasedWhenClosed:NO];
</del><ins>+ [m_findIndicatorWindow setReleasedWhenClosed:NO];
</ins><span class="cx">
</span><span class="cx"> if (animate) {
</span><span class="cx"> // Start the bounce animation.
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> animationDuration:bounceAnimationDuration
</span><span class="cx"> animationProgressCallback:&FindIndicatorWindow::bounceAnimationCallback
</span><span class="cx"> animationDidEndCallback:&FindIndicatorWindow::bounceAnimationDidEnd]);
</span><del>- [m_bounceAnimation.get() startAnimation];
</del><ins>+ [m_bounceAnimation startAnimation];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (fadeOut)
</span><span class="lines">@@ -182,20 +182,20 @@
</span><span class="cx"> m_startFadeOutTimer.stop();
</span><span class="cx">
</span><span class="cx"> if (m_fadeOutAnimation) {
</span><del>- [m_fadeOutAnimation.get() stopAnimation];
</del><ins>+ [m_fadeOutAnimation stopAnimation];
</ins><span class="cx"> m_fadeOutAnimation = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_bounceAnimation) {
</span><del>- [m_bounceAnimation.get() stopAnimation];
</del><ins>+ [m_bounceAnimation stopAnimation];
</ins><span class="cx"> m_bounceAnimation = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_bounceAnimationContext)
</span><span class="cx"> WKWindowBounceAnimationContextDestroy(m_bounceAnimationContext);
</span><span class="cx">
</span><del>- [[m_findIndicatorWindow.get() parentWindow] removeChildWindow:m_findIndicatorWindow.get()];
- [m_findIndicatorWindow.get() close];
</del><ins>+ [[m_findIndicatorWindow parentWindow] removeChildWindow:m_findIndicatorWindow.get()];
+ [m_findIndicatorWindow close];
</ins><span class="cx"> m_findIndicatorWindow = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -207,14 +207,14 @@
</span><span class="cx"> animationDuration:fadeOutAnimationDuration
</span><span class="cx"> animationProgressCallback:&FindIndicatorWindow::fadeOutAnimationCallback
</span><span class="cx"> animationDidEndCallback:&FindIndicatorWindow::fadeOutAnimationDidEnd]);
</span><del>- [m_fadeOutAnimation.get() startAnimation];
</del><ins>+ [m_fadeOutAnimation startAnimation];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FindIndicatorWindow::fadeOutAnimationCallback(double progress)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_fadeOutAnimation);
</span><span class="cx">
</span><del>- [m_findIndicatorWindow.get() setAlphaValue:1.0 - progress];
</del><ins>+ [m_findIndicatorWindow setAlphaValue:1.0 - progress];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FindIndicatorWindow::fadeOutAnimationDidEnd()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKPrintingViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm (162504 => 162505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm 2014-01-22 06:08:09 UTC (rev 162504)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm 2014-01-22 06:18:19 UTC (rev 162505)
</span><span class="lines">@@ -76,14 +76,14 @@
</span><span class="cx">
</span><span class="cx"> - (void)_setAutodisplay:(BOOL)newState
</span><span class="cx"> {
</span><del>- if (!newState && [[_wkView.get() window] isAutodisplay])
- [_wkView.get() displayIfNeeded];
</del><ins>+ if (!newState && [[_wkView window] isAutodisplay])
+ [_wkView displayIfNeeded];
</ins><span class="cx">
</span><del>- [[_wkView.get() window] setAutodisplay:newState];
</del><ins>+ [[_wkView window] setAutodisplay:newState];
</ins><span class="cx">
</span><span class="cx"> // For some reason, painting doesn't happen for a long time without this call, <rdar://problem/8975229>.
</span><span class="cx"> if (newState)
</span><del>- [_wkView.get() displayIfNeeded];
</del><ins>+ [_wkView displayIfNeeded];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (162504 => 162505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-01-22 06:08:09 UTC (rev 162504)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-01-22 06:18:19 UTC (rev 162505)
</span><span class="lines">@@ -1605,11 +1605,11 @@
</span><span class="cx">
</span><span class="cx"> if (actualRange) {
</span><span class="cx"> *actualRange = nsRange;
</span><del>- actualRange->length = [result.string.get() length];
</del><ins>+ actualRange->length = [result.string length];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- LOG(TextInput, "attributedSubstringFromRange:(%u, %u) -> \"%@\"", nsRange.location, nsRange.length, [result.string.get() string]);
- return [[result.string.get() retain] autorelease];
</del><ins>+ LOG(TextInput, "attributedSubstringFromRange:(%u, %u) -> \"%@\"", nsRange.location, nsRange.length, [result.string string]);
+ return [[result.string retain] autorelease];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSUInteger)characterIndexForPoint:(NSPoint)thePoint
</span><span class="lines">@@ -2202,7 +2202,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ColorSpaceData colorSpaceData;
</span><del>- colorSpaceData.cgColorSpace = [_data->_colorSpace.get() CGColorSpace];
</del><ins>+ colorSpaceData.cgColorSpace = [_data->_colorSpace CGColorSpace];
</ins><span class="cx">
</span><span class="cx"> return colorSpaceData;
</span><span class="cx"> }
</span><span class="lines">@@ -2585,7 +2585,7 @@
</span><span class="cx"> NSPasteboard *pasteboard = [NSPasteboard pasteboardWithName:pasteboardName];
</span><span class="cx"> RetainPtr<NSMutableArray> types = adoptNS([[NSMutableArray alloc] initWithObjects:NSFilesPromisePboardType, nil]);
</span><span class="cx">
</span><del>- [types.get() addObjectsFromArray:archiveBuffer ? PasteboardTypes::forImagesWithArchive() : PasteboardTypes::forImages()];
</del><ins>+ [types addObjectsFromArray:archiveBuffer ? PasteboardTypes::forImagesWithArchive() : PasteboardTypes::forImages()];
</ins><span class="cx"> [pasteboard declareTypes:types.get() owner:self];
</span><span class="cx"> if (!matchesExtensionOrEquivalent(filename, extension))
</span><span class="cx"> filename = [[filename stringByAppendingString:@"."] stringByAppendingString:extension];
</span><span class="lines">@@ -2676,7 +2676,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: Report an error if we fail to create a file.
</span><del>- NSString *path = [[dropDestination path] stringByAppendingPathComponent:[wrapper.get() preferredFilename]];
</del><ins>+ NSString *path = [[dropDestination path] stringByAppendingPathComponent:[wrapper preferredFilename]];
</ins><span class="cx"> path = pathWithUniqueFilenameForPath(path);
</span><span class="cx"> if (![wrapper writeToURL:[NSURL fileURLWithPath:path] options:NSFileWrapperWritingWithNameUpdating originalContentsURL:nil error:nullptr])
</span><span class="cx"> LOG_ERROR("Failed to create image file via -[NSFileWrapper writeToURL:options:originalContentsURL:error:]");
</span><span class="lines">@@ -2765,8 +2765,8 @@
</span><span class="cx"> // 2) prevents any NSBeep; we don't ever want to beep here.
</span><span class="cx"> RetainPtr<WKResponderChainSink> sink = adoptNS([[WKResponderChainSink alloc] initWithResponderChain:self]);
</span><span class="cx"> [super doCommandBySelector:selector];
</span><del>- [sink.get() detach];
- return ![sink.get() didReceiveUnhandledCommand];
</del><ins>+ [sink detach];
+ return ![sink didReceiveUnhandledCommand];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_setIntrinsicContentSize:(NSSize)intrinsicContentSize
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsmacPluginProcessProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm (162504 => 162505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2014-01-22 06:08:09 UTC (rev 162504)
+++ trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2014-01-22 06:18:19 UTC (rev 162505)
</span><span class="lines">@@ -271,7 +271,7 @@
</span><span class="cx"> ASSERT(!m_activationObserver);
</span><span class="cx">
</span><span class="cx"> m_placeholderWindow = adoptNS([[WKPlaceholderModalWindow alloc] initWithContentRect:NSMakeRect(0, 0, 1, 1) styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES]);
</span><del>- [m_placeholderWindow.get() setReleasedWhenClosed:NO];
</del><ins>+ [m_placeholderWindow setReleasedWhenClosed:NO];
</ins><span class="cx">
</span><span class="cx"> m_activationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationWillBecomeActiveNotification object:NSApp queue:nil
</span><span class="cx"> usingBlock:^(NSNotification *){ applicationDidBecomeActive(); }];
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx">
</span><span class="cx"> [NSApp runModalForWindow:m_placeholderWindow.get()];
</span><span class="cx">
</span><del>- [m_placeholderWindow.get() orderOut:nil];
</del><ins>+ [m_placeholderWindow orderOut:nil];
</ins><span class="cx"> m_placeholderWindow = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacCorrectionPanelmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/CorrectionPanel.mm (162504 => 162505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/CorrectionPanel.mm 2014-01-22 06:08:09 UTC (rev 162504)
+++ trunk/Source/WebKit2/UIProcess/mac/CorrectionPanel.mm 2014-01-22 06:18:19 UTC (rev 162505)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> NSSpellChecker* spellChecker = [NSSpellChecker sharedSpellChecker];
</span><del>- NSInteger documentTag = [m_view.get() spellCheckerDocumentTag];
</del><ins>+ NSInteger documentTag = [m_view spellCheckerDocumentTag];
</ins><span class="cx">
</span><span class="cx"> switch (correctionIndicatorType) {
</span><span class="cx"> case NSCorrectionIndicatorTypeDefault:
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- [m_view.get() handleAcceptedAlternativeText:acceptedReplacement];
</del><ins>+ [m_view handleAcceptedAlternativeText:acceptedReplacement];
</ins><span class="cx"> m_view.clear();
</span><span class="cx"> if (acceptedReplacement)
</span><span class="cx"> m_resultForDismissal = adoptNS([acceptedReplacement copy]);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacTextCheckerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/TextCheckerMac.mm (162504 => 162505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/TextCheckerMac.mm 2014-01-22 06:08:09 UTC (rev 162504)
+++ trunk/Source/WebKit2/UIProcess/mac/TextCheckerMac.mm 2014-01-22 06:18:19 UTC (rev 162505)
</span><span class="lines">@@ -418,7 +418,7 @@
</span><span class="cx"> RetainPtr<NSMutableArray> corrections = adoptNS([[NSMutableArray alloc] init]);
</span><span class="cx"> for (size_t i = 0; i < grammarDetail.guesses.size(); ++i) {
</span><span class="cx"> NSString *guess = grammarDetail.guesses[i];
</span><del>- [corrections.get() addObject:guess];
</del><ins>+ [corrections addObject:guess];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NSRange grammarRange = NSMakeRange(grammarDetail.location, grammarDetail.length);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKFullScreenWindowControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm (162504 => 162505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2014-01-22 06:08:09 UTC (rev 162504)
+++ trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2014-01-22 06:18:19 UTC (rev 162505)
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> NSWindow* window = [self window];
</span><span class="cx"> NSRect screenFrame = [[window screen] frame];
</span><span class="cx"> [window setFrame:screenFrame display:YES];
</span><del>- [_backgroundWindow.get() setFrame:screenFrame display:YES];
</del><ins>+ [_backgroundWindow setFrame:screenFrame display:YES];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark -
</span><span class="lines">@@ -235,10 +235,10 @@
</span><span class="cx"> // Swap the webView placeholder into place.
</span><span class="cx"> if (!_webViewPlaceholder) {
</span><span class="cx"> _webViewPlaceholder = adoptNS([[WebCoreFullScreenPlaceholderView alloc] initWithFrame:[_webView frame]]);
</span><del>- [_webViewPlaceholder.get() setAction:@selector(cancelOperation:)];
</del><ins>+ [_webViewPlaceholder setAction:@selector(cancelOperation:)];
</ins><span class="cx"> }
</span><del>- [_webViewPlaceholder.get() setTarget:nil];
- [_webViewPlaceholder.get() setContents:(id)webViewContents.get()];
</del><ins>+ [_webViewPlaceholder setTarget:nil];
+ [_webViewPlaceholder setContents:(id)webViewContents.get()];
</ins><span class="cx"> [self _replaceView:_webView with:_webViewPlaceholder.get()];
</span><span class="cx">
</span><span class="cx"> // Then insert the WebView into the full screen window
</span><span class="lines">@@ -286,23 +286,23 @@
</span><span class="cx"> windowBounds.origin = NSZeroPoint;
</span><span class="cx"> WKWindowSetClipRect([self window], windowBounds);
</span><span class="cx">
</span><del>- [_fadeAnimation.get() stopAnimation];
- [_fadeAnimation.get() setWindow:nil];
</del><ins>+ [_fadeAnimation stopAnimation];
+ [_fadeAnimation setWindow:nil];
</ins><span class="cx"> _fadeAnimation = nullptr;
</span><span class="cx">
</span><del>- [_backgroundWindow.get() orderOut:self];
- [_backgroundWindow.get() setFrame:NSZeroRect display:YES];
</del><ins>+ [_backgroundWindow orderOut:self];
+ [_backgroundWindow setFrame:NSZeroRect display:YES];
</ins><span class="cx">
</span><del>- [_webViewPlaceholder.get() setExitWarningVisible:YES];
- [_webViewPlaceholder.get() setTarget:self];
</del><ins>+ [_webViewPlaceholder setExitWarningVisible:YES];
+ [_webViewPlaceholder setTarget:self];
</ins><span class="cx"> } else {
</span><span class="cx"> // Transition to fullscreen failed. Clean up.
</span><span class="cx"> _fullScreenState = NotInFullScreen;
</span><span class="cx">
</span><del>- [_scaleAnimation.get() stopAnimation];
</del><ins>+ [_scaleAnimation stopAnimation];
</ins><span class="cx">
</span><del>- [_backgroundWindow.get() orderOut:self];
- [_backgroundWindow.get() setFrame:NSZeroRect display:YES];
</del><ins>+ [_backgroundWindow orderOut:self];
+ [_backgroundWindow setFrame:NSZeroRect display:YES];
</ins><span class="cx">
</span><span class="cx"> [[self window] setAutodisplay:YES];
</span><span class="cx"> [_webView _setSuppressVisibilityUpdates:NO];
</span><span class="lines">@@ -324,7 +324,7 @@
</span><span class="cx"> - (void)exitFullScreen
</span><span class="cx"> {
</span><span class="cx"> if (_watchdogTimer) {
</span><del>- [_watchdogTimer.get() invalidate];
</del><ins>+ [_watchdogTimer invalidate];
</ins><span class="cx"> _watchdogTimer.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -332,7 +332,7 @@
</span><span class="cx"> return;
</span><span class="cx"> _fullScreenState = WaitingToExitFullScreen;
</span><span class="cx">
</span><del>- [_webViewPlaceholder.get() setExitWarningVisible:NO];
</del><ins>+ [_webViewPlaceholder setExitWarningVisible:NO];
</ins><span class="cx">
</span><span class="cx"> // Screen updates to be re-enabled in _startExitFullScreenAnimationWithDuration: or beganExitFullScreenWithInitialFrame:finalFrame:
</span><span class="cx"> NSDisableScreenUpdates();
</span><span class="lines">@@ -341,7 +341,7 @@
</span><span class="cx"> // See the related comment in enterFullScreen:
</span><span class="cx"> // We will resume the normal behavior in _startExitFullScreenAnimationWithDuration:
</span><span class="cx"> [_webView _setSuppressVisibilityUpdates:YES];
</span><del>- [_webViewPlaceholder.get() setTarget:nil];
</del><ins>+ [_webViewPlaceholder setTarget:nil];
</ins><span class="cx">
</span><span class="cx"> [self _manager]->setAnimatingFullScreen(true);
</span><span class="cx"> [self _manager]->willExitFullScreen();
</span><span class="lines">@@ -377,7 +377,7 @@
</span><span class="cx">
</span><span class="cx"> // Screen updates to be re-enabled in completeFinishExitFullScreenAnimationAfterRepaint.
</span><span class="cx"> NSDisableScreenUpdates();
</span><del>- [[_webViewPlaceholder.get() window] setAutodisplay:NO];
</del><ins>+ [[_webViewPlaceholder window] setAutodisplay:NO];
</ins><span class="cx">
</span><span class="cx"> NSResponder *firstResponder = [[self window] firstResponder];
</span><span class="cx"> [self _replaceView:_webViewPlaceholder.get() with:_webView];
</span><span class="lines">@@ -390,12 +390,12 @@
</span><span class="cx"> [[self window] orderOut:self];
</span><span class="cx"> [[self window] setFrame:NSZeroRect display:YES];
</span><span class="cx">
</span><del>- [_fadeAnimation.get() stopAnimation];
- [_fadeAnimation.get() setWindow:nil];
</del><ins>+ [_fadeAnimation stopAnimation];
+ [_fadeAnimation setWindow:nil];
</ins><span class="cx"> _fadeAnimation = nullptr;
</span><span class="cx">
</span><del>- [_backgroundWindow.get() orderOut:self];
- [_backgroundWindow.get() setFrame:NSZeroRect display:YES];
</del><ins>+ [_backgroundWindow orderOut:self];
+ [_backgroundWindow setFrame:NSZeroRect display:YES];
</ins><span class="cx">
</span><span class="cx"> [[_webView window] makeKeyAndOrderFront:self];
</span><span class="cx">
</span><span class="lines">@@ -555,9 +555,9 @@
</span><span class="cx">
</span><span class="cx"> _scaleAnimation = adoptNS([[WebWindowScaleAnimation alloc] initWithHintedDuration:duration window:[self window] initalFrame:initialWindowFrame finalFrame:screenFrame]);
</span><span class="cx">
</span><del>- [_scaleAnimation.get() setAnimationBlockingMode:NSAnimationNonblocking];
- [_scaleAnimation.get() setCurrentProgress:0];
- [_scaleAnimation.get() startAnimation];
</del><ins>+ [_scaleAnimation setAnimationBlockingMode:NSAnimationNonblocking];
+ [_scaleAnimation setCurrentProgress:0];
+ [_scaleAnimation startAnimation];
</ins><span class="cx">
</span><span class="cx"> // WKWindowSetClipRect takes window coordinates, so convert from screen coordinates here:
</span><span class="cx"> NSRect finalBounds = _finalFrame;
</span><span class="lines">@@ -577,24 +577,24 @@
</span><span class="cx"> if (!_backgroundWindow)
</span><span class="cx"> _backgroundWindow = createBackgroundFullscreenWindow(screenFrame);
</span><span class="cx"> else
</span><del>- [_backgroundWindow.get() setFrame:screenFrame display:NO];
</del><ins>+ [_backgroundWindow setFrame:screenFrame display:NO];
</ins><span class="cx">
</span><span class="cx"> CGFloat currentAlpha = 0;
</span><span class="cx"> if (_fadeAnimation) {
</span><del>- currentAlpha = [_fadeAnimation.get() currentAlpha];
- [_fadeAnimation.get() stopAnimation];
- [_fadeAnimation.get() setWindow:nil];
</del><ins>+ currentAlpha = [_fadeAnimation currentAlpha];
+ [_fadeAnimation stopAnimation];
+ [_fadeAnimation setWindow:nil];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _fadeAnimation = adoptNS([[WebWindowFadeAnimation alloc] initWithDuration:duration
</span><span class="cx"> window:_backgroundWindow.get()
</span><span class="cx"> initialAlpha:currentAlpha
</span><span class="cx"> finalAlpha:1]);
</span><del>- [_fadeAnimation.get() setAnimationBlockingMode:NSAnimationNonblocking];
- [_fadeAnimation.get() setCurrentProgress:0];
- [_fadeAnimation.get() startAnimation];
</del><ins>+ [_fadeAnimation setAnimationBlockingMode:NSAnimationNonblocking];
+ [_fadeAnimation setCurrentProgress:0];
+ [_fadeAnimation startAnimation];
</ins><span class="cx">
</span><del>- [_backgroundWindow.get() orderWindow:NSWindowBelow relativeTo:[[self window] windowNumber]];
</del><ins>+ [_backgroundWindow orderWindow:NSWindowBelow relativeTo:[[self window] windowNumber]];
</ins><span class="cx">
</span><span class="cx"> [_webView _setSuppressVisibilityUpdates:NO];
</span><span class="cx"> [[self window] setAutodisplay:YES];
</span><span class="lines">@@ -615,33 +615,33 @@
</span><span class="cx"> NSRect screenFrame = [[[self window] screen] frame];
</span><span class="cx"> NSRect initialWindowFrame = windowFrameFromApparentFrames(screenFrame, _initialFrame, _finalFrame);
</span><span class="cx">
</span><del>- NSRect currentFrame = _scaleAnimation ? [_scaleAnimation.get() currentFrame] : [[self window] frame];
</del><ins>+ NSRect currentFrame = _scaleAnimation ? [_scaleAnimation currentFrame] : [[self window] frame];
</ins><span class="cx"> _scaleAnimation = adoptNS([[WebWindowScaleAnimation alloc] initWithHintedDuration:duration window:[self window] initalFrame:currentFrame finalFrame:initialWindowFrame]);
</span><span class="cx">
</span><del>- [_scaleAnimation.get() setAnimationBlockingMode:NSAnimationNonblocking];
- [_scaleAnimation.get() setCurrentProgress:0];
- [_scaleAnimation.get() startAnimation];
</del><ins>+ [_scaleAnimation setAnimationBlockingMode:NSAnimationNonblocking];
+ [_scaleAnimation setCurrentProgress:0];
+ [_scaleAnimation startAnimation];
</ins><span class="cx">
</span><span class="cx"> if (!_backgroundWindow)
</span><span class="cx"> _backgroundWindow = createBackgroundFullscreenWindow(screenFrame);
</span><span class="cx"> else
</span><del>- [_backgroundWindow.get() setFrame:screenFrame display:NO];
</del><ins>+ [_backgroundWindow setFrame:screenFrame display:NO];
</ins><span class="cx">
</span><span class="cx"> CGFloat currentAlpha = 1;
</span><span class="cx"> if (_fadeAnimation) {
</span><del>- currentAlpha = [_fadeAnimation.get() currentAlpha];
- [_fadeAnimation.get() stopAnimation];
- [_fadeAnimation.get() setWindow:nil];
</del><ins>+ currentAlpha = [_fadeAnimation currentAlpha];
+ [_fadeAnimation stopAnimation];
+ [_fadeAnimation setWindow:nil];
</ins><span class="cx"> }
</span><span class="cx"> _fadeAnimation = adoptNS([[WebWindowFadeAnimation alloc] initWithDuration:duration
</span><span class="cx"> window:_backgroundWindow.get()
</span><span class="cx"> initialAlpha:currentAlpha
</span><span class="cx"> finalAlpha:0]);
</span><del>- [_fadeAnimation.get() setAnimationBlockingMode:NSAnimationNonblocking];
- [_fadeAnimation.get() setCurrentProgress:0];
- [_fadeAnimation.get() startAnimation];
</del><ins>+ [_fadeAnimation setAnimationBlockingMode:NSAnimationNonblocking];
+ [_fadeAnimation setCurrentProgress:0];
+ [_fadeAnimation startAnimation];
</ins><span class="cx">
</span><del>- [_backgroundWindow.get() orderWindow:NSWindowBelow relativeTo:[[self window] windowNumber]];
</del><ins>+ [_backgroundWindow orderWindow:NSWindowBelow relativeTo:[[self window] windowNumber]];
</ins><span class="cx">
</span><span class="cx"> // WKWindowSetClipRect takes window coordinates, so convert from screen coordinates here:
</span><span class="cx"> NSRect finalBounds = _finalFrame;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm (162504 => 162505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-01-22 06:08:09 UTC (rev 162504)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-01-22 06:18:19 UTC (rev 162505)
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> if (!cachePath)
</span><span class="cx"> cachePath = @"~/Library/Caches/com.apple.WebKit2.WebProcess";
</span><span class="cx">
</span><del>- return [cachePath.get() stringByStandardizingPath];
</del><ins>+ return [cachePath stringByStandardizingPath];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebContext::platformDefaultCookieStorageDirectory() const
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (162504 => 162505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2014-01-22 06:08:09 UTC (rev 162504)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2014-01-22 06:18:19 UTC (rev 162505)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> WebContextMenuProxyMac::~WebContextMenuProxyMac()
</span><span class="cx"> {
</span><span class="cx"> if (m_popup)
</span><del>- [m_popup.get() setControlView:nil];
</del><ins>+ [m_popup setControlView:nil];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebContextMenuProxyMac::contextMenuItemSelected(const WebContextMenuItemData& item)
</span><span class="lines">@@ -186,14 +186,14 @@
</span><span class="cx"> void WebContextMenuProxyMac::populate(const Vector<WebContextMenuItemData>& items)
</span><span class="cx"> {
</span><span class="cx"> if (m_popup)
</span><del>- [m_popup.get() removeAllItems];
</del><ins>+ [m_popup removeAllItems];
</ins><span class="cx"> else {
</span><span class="cx"> m_popup = adoptNS([[NSPopUpButtonCell alloc] initTextCell:@"" pullsDown:NO]);
</span><del>- [m_popup.get() setUsesItemFromMenu:NO];
- [m_popup.get() setAutoenablesItems:NO];
</del><ins>+ [m_popup setUsesItemFromMenu:NO];
+ [m_popup setAutoenablesItems:NO];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- NSMenu* menu = [m_popup.get() menu];
</del><ins>+ NSMenu* menu = [m_popup menu];
</ins><span class="cx"> populateNSMenu(menu, nsMenuItemVector(items));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -207,12 +207,12 @@
</span><span class="cx">
</span><span class="cx"> NSRect menuRect = NSMakeRect(menuLocation.x(), menuLocation.y(), 0, 0);
</span><span class="cx">
</span><del>- [m_popup.get() attachPopUpWithFrame:menuRect inView:m_webView];
</del><ins>+ [m_popup attachPopUpWithFrame:menuRect inView:m_webView];
</ins><span class="cx">
</span><del>- NSMenu* menu = [m_popup.get() menu];
</del><ins>+ NSMenu* menu = [m_popup menu];
</ins><span class="cx">
</span><span class="cx"> // These values were borrowed from AppKit to match their placement of the menu.
</span><del>- NSRect titleFrame = [m_popup.get() titleRectForBounds:menuRect];
</del><ins>+ NSRect titleFrame = [m_popup titleRectForBounds:menuRect];
</ins><span class="cx"> if (titleFrame.size.width <= 0 || titleFrame.size.height <= 0)
</span><span class="cx"> titleFrame = menuRect;
</span><span class="cx"> float vertOffset = roundf((NSMaxY(menuRect) - NSMaxY(titleFrame)) + NSHeight(titleFrame));
</span><span class="lines">@@ -226,12 +226,12 @@
</span><span class="cx">
</span><span class="cx"> WKPopupContextMenu(menu, location);
</span><span class="cx">
</span><del>- [m_popup.get() dismissPopUp];
</del><ins>+ [m_popup dismissPopUp];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebContextMenuProxyMac::hideContextMenu()
</span><span class="cx"> {
</span><del>- [m_popup.get() dismissPopUp];
</del><ins>+ [m_popup dismissPopUp];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebInspectorProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (162504 => 162505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2014-01-22 06:08:09 UTC (rev 162504)
+++ trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2014-01-22 06:18:19 UTC (rev 162505)
</span><span class="lines">@@ -344,8 +344,8 @@
</span><span class="cx"> m_dockBottomButton.get().hidden = !canAttach();
</span><span class="cx"> m_dockRightButton.get().hidden = !canAttach();
</span><span class="cx">
</span><del>- [m_inspectorView.get() setFrame:[contentView bounds]];
- [m_inspectorView.get() setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
</del><ins>+ [m_inspectorView setFrame:[contentView bounds]];
+ [m_inspectorView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
</ins><span class="cx"> [contentView addSubview:m_inspectorView.get()];
</span><span class="cx">
</span><span class="cx"> // Center the window if the saved frame was empty.
</span><span class="lines">@@ -361,7 +361,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> NSString *title = [NSString stringWithFormat:WEB_UI_STRING("Web Inspector — %@", "Web Inspector window title"), (NSString *)m_urlString];
</span><del>- [m_inspectorWindow.get() setTitle:title];
</del><ins>+ [m_inspectorWindow setTitle:title];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebPageProxy* WebInspectorProxy::platformCreateInspectorPage()
</span><span class="lines">@@ -393,7 +393,7 @@
</span><span class="cx"> m_inspectorView = adoptNS([[WKWebInspectorWKView alloc] initWithFrame:initialRect contextRef:toAPI(&page()->process().context()) pageGroupRef:toAPI(inspectorPageGroup()) relatedToPage:toAPI(m_page)]);
</span><span class="cx"> ASSERT(m_inspectorView);
</span><span class="cx">
</span><del>- [m_inspectorView.get() setDrawsBackground:NO];
</del><ins>+ [m_inspectorView setDrawsBackground:NO];
</ins><span class="cx">
</span><span class="cx"> m_inspectorProxyObjCAdapter = adoptNS([[WKWebInspectorProxyObjCAdapter alloc] initWithWebInspectorProxy:this]);
</span><span class="cx">
</span><span class="lines">@@ -467,14 +467,14 @@
</span><span class="cx"> void WebInspectorProxy::platformDidClose()
</span><span class="cx"> {
</span><span class="cx"> if (m_inspectorWindow) {
</span><del>- [m_inspectorWindow.get() setDelegate:nil];
- [m_inspectorWindow.get() orderOut:nil];
</del><ins>+ [m_inspectorWindow setDelegate:nil];
+ [m_inspectorWindow orderOut:nil];
</ins><span class="cx"> m_inspectorWindow = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_inspectorView = 0;
</span><span class="cx">
</span><del>- [m_inspectorProxyObjCAdapter.get() close];
</del><ins>+ [m_inspectorProxyObjCAdapter close];
</ins><span class="cx"> m_inspectorProxyObjCAdapter = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -486,8 +486,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_inspectorWindow) {
</span><del>- [m_inspectorWindow.get() setDelegate:nil];
- [m_inspectorWindow.get() orderOut:nil];
</del><ins>+ [m_inspectorWindow setDelegate:nil];
+ [m_inspectorWindow orderOut:nil];
</ins><span class="cx"> m_inspectorWindow = 0;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -623,7 +623,7 @@
</span><span class="cx"> switch (m_attachmentSide) {
</span><span class="cx"> case AttachmentSideBottom: {
</span><span class="cx"> if (!currentDimension)
</span><del>- currentDimension = NSHeight([m_inspectorView.get() frame]);
</del><ins>+ currentDimension = NSHeight([m_inspectorView frame]);
</ins><span class="cx">
</span><span class="cx"> CGFloat parentHeight = NSHeight(parentBounds);
</span><span class="cx"> CGFloat inspectorHeight = InspectorFrontendClientLocal::constrainedAttachedWindowHeight(currentDimension, parentHeight);
</span><span class="lines">@@ -636,7 +636,7 @@
</span><span class="cx">
</span><span class="cx"> case AttachmentSideRight: {
</span><span class="cx"> if (!currentDimension)
</span><del>- currentDimension = NSWidth([m_inspectorView.get() frame]);
</del><ins>+ currentDimension = NSWidth([m_inspectorView frame]);
</ins><span class="cx">
</span><span class="cx"> CGFloat parentWidth = NSWidth(parentBounds);
</span><span class="cx"> CGFloat inspectorWidth = InspectorFrontendClientLocal::constrainedAttachedWindowWidth(currentDimension, parentWidth);
</span><span class="lines">@@ -676,14 +676,14 @@
</span><span class="cx"> [[NSNotificationCenter defaultCenter] addObserver:m_inspectorProxyObjCAdapter.get() selector:@selector(inspectedViewFrameDidChange:) name:NSViewFrameDidChangeNotification object:inspectedView];
</span><span class="cx">
</span><span class="cx"> if (m_inspectorWindow) {
</span><del>- [m_inspectorWindow.get() setDelegate:nil];
- [m_inspectorWindow.get() orderOut:nil];
</del><ins>+ [m_inspectorWindow setDelegate:nil];
+ [m_inspectorWindow orderOut:nil];
</ins><span class="cx"> m_inspectorWindow = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- [m_inspectorView.get() removeFromSuperview];
</del><ins>+ [m_inspectorView removeFromSuperview];
</ins><span class="cx">
</span><del>- [m_inspectorView.get() setAutoresizingMask:NSViewWidthSizable | NSViewMaxYMargin];
</del><ins>+ [m_inspectorView setAutoresizingMask:NSViewWidthSizable | NSViewMaxYMargin];
</ins><span class="cx">
</span><span class="cx"> CGFloat currentDimension;
</span><span class="cx">
</span><span class="lines">@@ -708,7 +708,7 @@
</span><span class="cx"> WKView *inspectedView = m_page->wkView();
</span><span class="cx"> [[NSNotificationCenter defaultCenter] removeObserver:m_inspectorProxyObjCAdapter.get() name:NSViewFrameDidChangeNotification object:inspectedView];
</span><span class="cx">
</span><del>- [m_inspectorView.get() removeFromSuperview];
</del><ins>+ [m_inspectorView removeFromSuperview];
</ins><span class="cx">
</span><span class="cx"> // Make sure that we size the inspected view's frame after detaching so that it takes up the space that the
</span><span class="cx"> // attached inspector used to. Preserve the top position of the inspected view so banners in Safari still work.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebPopupMenuProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm (162504 => 162505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm 2014-01-22 06:08:09 UTC (rev 162504)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm 2014-01-22 06:18:19 UTC (rev 162505)
</span><span class="lines">@@ -49,32 +49,32 @@
</span><span class="cx"> WebPopupMenuProxyMac::~WebPopupMenuProxyMac()
</span><span class="cx"> {
</span><span class="cx"> if (m_popup)
</span><del>- [m_popup.get() setControlView:nil];
</del><ins>+ [m_popup setControlView:nil];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPopupMenuProxyMac::populate(const Vector<WebPopupItem>& items, NSFont *font, TextDirection menuTextDirection)
</span><span class="cx"> {
</span><span class="cx"> if (m_popup)
</span><del>- [m_popup.get() removeAllItems];
</del><ins>+ [m_popup removeAllItems];
</ins><span class="cx"> else {
</span><span class="cx"> m_popup = adoptNS([[NSPopUpButtonCell alloc] initTextCell:@"" pullsDown:NO]);
</span><del>- [m_popup.get() setUsesItemFromMenu:NO];
- [m_popup.get() setAutoenablesItems:NO];
</del><ins>+ [m_popup setUsesItemFromMenu:NO];
+ [m_popup setAutoenablesItems:NO];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int size = items.size();
</span><span class="cx">
</span><span class="cx"> for (int i = 0; i < size; i++) {
</span><span class="cx"> if (items[i].m_type == WebPopupItem::Separator)
</span><del>- [[m_popup.get() menu] addItem:[NSMenuItem separatorItem]];
</del><ins>+ [[m_popup menu] addItem:[NSMenuItem separatorItem]];
</ins><span class="cx"> else {
</span><del>- [m_popup.get() addItemWithTitle:@""];
- NSMenuItem *menuItem = [m_popup.get() lastItem];
</del><ins>+ [m_popup addItemWithTitle:@""];
+ NSMenuItem *menuItem = [m_popup lastItem];
</ins><span class="cx">
</span><span class="cx"> RetainPtr<NSMutableParagraphStyle> paragraphStyle = adoptNS([[NSParagraphStyle defaultParagraphStyle] mutableCopy]);
</span><span class="cx"> NSWritingDirection writingDirection = items[i].m_textDirection == LTR ? NSWritingDirectionLeftToRight : NSWritingDirectionRightToLeft;
</span><del>- [paragraphStyle.get() setBaseWritingDirection:writingDirection];
- [paragraphStyle.get() setAlignment:menuTextDirection == LTR ? NSLeftTextAlignment : NSRightTextAlignment];
</del><ins>+ [paragraphStyle setBaseWritingDirection:writingDirection];
+ [paragraphStyle setAlignment:menuTextDirection == LTR ? NSLeftTextAlignment : NSRightTextAlignment];
</ins><span class="cx"> RetainPtr<NSMutableDictionary> attributes = adoptNS([[NSMutableDictionary alloc] initWithObjectsAndKeys:
</span><span class="cx"> paragraphStyle.get(), NSParagraphStyleAttributeName,
</span><span class="cx"> font, NSFontAttributeName,
</span><span class="lines">@@ -82,14 +82,14 @@
</span><span class="cx"> if (items[i].m_hasTextDirectionOverride) {
</span><span class="cx"> RetainPtr<NSNumber> writingDirectionValue = adoptNS([[NSNumber alloc] initWithInteger:writingDirection + NSTextWritingDirectionOverride]);
</span><span class="cx"> RetainPtr<NSArray> writingDirectionArray = adoptNS([[NSArray alloc] initWithObjects:writingDirectionValue.get(), nil]);
</span><del>- [attributes.get() setObject:writingDirectionArray.get() forKey:NSWritingDirectionAttributeName];
</del><ins>+ [attributes setObject:writingDirectionArray.get() forKey:NSWritingDirectionAttributeName];
</ins><span class="cx"> }
</span><span class="cx"> RetainPtr<NSAttributedString> string = adoptNS([[NSAttributedString alloc] initWithString:nsStringFromWebCoreString(items[i].m_text) attributes:attributes.get()]);
</span><span class="cx">
</span><span class="cx"> [menuItem setAttributedTitle:string.get()];
</span><span class="cx"> // We set the title as well as the attributed title here. The attributed title will be displayed in the menu,
</span><span class="cx"> // but typeahead will use the non-attributed string that doesn't contain any leading or trailing whitespace.
</span><del>- [menuItem setTitle:[[string.get() string] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]];
</del><ins>+ [menuItem setTitle:[[string string] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]];
</ins><span class="cx"> [menuItem setEnabled:items[i].m_isEnabled];
</span><span class="cx"> [menuItem setToolTip:nsStringFromWebCoreString(items[i].m_toolTip)];
</span><span class="cx"> }
</span><span class="lines">@@ -107,11 +107,11 @@
</span><span class="cx">
</span><span class="cx"> populate(items, font, textDirection);
</span><span class="cx">
</span><del>- [m_popup.get() attachPopUpWithFrame:rect inView:m_webView];
- [m_popup.get() selectItemAtIndex:selectedIndex];
- [m_popup.get() setUserInterfaceLayoutDirection:textDirection == LTR ? NSUserInterfaceLayoutDirectionLeftToRight : NSUserInterfaceLayoutDirectionRightToLeft];
</del><ins>+ [m_popup attachPopUpWithFrame:rect inView:m_webView];
+ [m_popup selectItemAtIndex:selectedIndex];
+ [m_popup setUserInterfaceLayoutDirection:textDirection == LTR ? NSUserInterfaceLayoutDirectionLeftToRight : NSUserInterfaceLayoutDirectionRightToLeft];
</ins><span class="cx">
</span><del>- NSMenu *menu = [m_popup.get() menu];
</del><ins>+ NSMenu *menu = [m_popup menu];
</ins><span class="cx">
</span><span class="cx"> // These values were borrowed from AppKit to match their placement of the menu.
</span><span class="cx"> const int popOverHorizontalAdjust = -10;
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> // Menus that pop-under are offset underneath it.
</span><span class="cx"> NSPoint location;
</span><span class="cx"> if (data.shouldPopOver) {
</span><del>- NSRect titleFrame = [m_popup.get() titleRectForBounds:rect];
</del><ins>+ NSRect titleFrame = [m_popup titleRectForBounds:rect];
</ins><span class="cx"> if (titleFrame.size.width <= 0 || titleFrame.size.height <= 0)
</span><span class="cx"> titleFrame = rect;
</span><span class="cx"> float vertOffset = roundf((NSMaxY(rect) - NSMaxY(titleFrame)) + NSHeight(titleFrame));
</span><span class="lines">@@ -132,17 +132,17 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSView> dummyView = adoptNS([[NSView alloc] initWithFrame:rect]);
</span><span class="cx"> [m_webView addSubview:dummyView.get()];
</span><del>- location = [dummyView.get() convertPoint:location fromView:m_webView];
</del><ins>+ location = [dummyView convertPoint:location fromView:m_webView];
</ins><span class="cx">
</span><span class="cx"> WKPopupMenu(menu, location, roundf(NSWidth(rect)), dummyView.get(), selectedIndex, font);
</span><span class="cx">
</span><del>- [m_popup.get() dismissPopUp];
- [dummyView.get() removeFromSuperview];
</del><ins>+ [m_popup dismissPopUp];
+ [dummyView removeFromSuperview];
</ins><span class="cx">
</span><span class="cx"> if (!m_client)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_client->valueChangedForPopupMenu(this, [m_popup.get() indexOfSelectedItem]);
</del><ins>+ m_client->valueChangedForPopupMenu(this, [m_popup indexOfSelectedItem]);
</ins><span class="cx">
</span><span class="cx"> // <https://bugs.webkit.org/show_bug.cgi?id=57904> This code is adopted from EventHandler::sendFakeEventsAfterWidgetTracking().
</span><span class="cx"> if (!m_client->currentlyProcessedMouseDownEvent())
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPopupMenuProxyMac::hidePopupMenu()
</span><span class="cx"> {
</span><del>- [m_popup.get() dismissPopUp];
</del><ins>+ [m_popup dismissPopUp];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessEntryPointmacLegacyProcessWebContentProcessMainmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/EntryPoint/mac/LegacyProcess/WebContentProcessMain.mm (162504 => 162505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/EntryPoint/mac/LegacyProcess/WebContentProcessMain.mm 2014-01-22 06:08:09 UTC (rev 162504)
+++ trunk/Source/WebKit2/WebProcess/EntryPoint/mac/LegacyProcess/WebContentProcessMain.mm 2014-01-22 06:18:19 UTC (rev 162505)
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx"> RetainPtr<NSURL> clientExecutableURL = adoptNS([[NSURL alloc] initFileURLWithPath:nsStringFromWebCoreString(clientExecutable)]);
</span><span class="cx"> RetainPtr<CFURLRef> clientBundleURL = adoptCF(WKCopyBundleURLForExecutableURL((CFURLRef)clientExecutableURL.get()));
</span><span class="cx"> RetainPtr<NSBundle> clientBundle = adoptNS([[NSBundle alloc] initWithURL:(NSURL *)clientBundleURL.get()]);
</span><del>- clientIdentifier = [clientBundle.get() bundleIdentifier];
</del><ins>+ clientIdentifier = [clientBundle bundleIdentifier];
</ins><span class="cx"> if (clientIdentifier.isEmpty())
</span><span class="cx"> return false;
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapemacPluginProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm (162504 => 162505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm 2014-01-22 06:08:09 UTC (rev 162504)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm 2014-01-22 06:18:19 UTC (rev 162505)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> // Create a layer with flipped geometry and add the real plug-in layer as a sublayer
</span><span class="cx"> // so the coordinate system will match the event coordinate system.
</span><span class="cx"> m_pluginLayer = adoptNS([[CALayer alloc] init]);
</span><del>- [m_pluginLayer.get() setGeometryFlipped:YES];
</del><ins>+ [m_pluginLayer setGeometryFlipped:YES];
</ins><span class="cx">
</span><span class="cx"> if (m_isRestartedProcess) {
</span><span class="cx"> CABasicAnimation *fadeInAnimation = [CABasicAnimation animationWithKeyPath:@"opacity"];
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> fadeInAnimation.toValue = [NSNumber numberWithFloat:1];
</span><span class="cx"> fadeInAnimation.duration = fadeInDuration;
</span><span class="cx"> fadeInAnimation.removedOnCompletion = NO;
</span><del>- [m_pluginLayer.get() addAnimation:fadeInAnimation forKey:@"restarted-plugin-fade-in"];
</del><ins>+ [m_pluginLayer addAnimation:fadeInAnimation forKey:@"restarted-plugin-fade-in"];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> makeRenderLayer(m_pluginLayer.get(), m_remoteLayerClientID);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFPDFPluginmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm (162504 => 162505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2014-01-22 06:08:09 UTC (rev 162504)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2014-01-22 06:18:19 UTC (rev 162505)
</span><span class="lines">@@ -524,8 +524,8 @@
</span><span class="cx"> m_accessibilityObject.get().pdfLayerController = m_pdfLayerController.get();
</span><span class="cx"> m_accessibilityObject.get().parent = webFrame()->page()->accessibilityRemoteObject();
</span><span class="cx">
</span><del>- [m_containerLayer.get() addSublayer:m_contentLayer.get()];
- [m_containerLayer.get() addSublayer:m_scrollCornerLayer.get()];
</del><ins>+ [m_containerLayer addSublayer:m_contentLayer.get()];
+ [m_containerLayer addSublayer:m_scrollCornerLayer.get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PDFPlugin::~PDFPlugin()
</span><span class="lines">@@ -613,17 +613,17 @@
</span><span class="cx">
</span><span class="cx"> if (m_verticalScrollbarLayer) {
</span><span class="cx"> m_verticalScrollbarLayer.get().frame = verticalScrollbar()->frameRect();
</span><del>- [m_verticalScrollbarLayer.get() setNeedsDisplay];
</del><ins>+ [m_verticalScrollbarLayer setNeedsDisplay];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_horizontalScrollbarLayer) {
</span><span class="cx"> m_horizontalScrollbarLayer.get().frame = horizontalScrollbar()->frameRect();
</span><del>- [m_horizontalScrollbarLayer.get() setNeedsDisplay];
</del><ins>+ [m_horizontalScrollbarLayer setNeedsDisplay];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_scrollCornerLayer) {
</span><span class="cx"> m_scrollCornerLayer.get().frame = scrollCornerRect();
</span><del>- [m_scrollCornerLayer.get() setNeedsDisplay];
</del><ins>+ [m_scrollCornerLayer setNeedsDisplay];
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -642,10 +642,10 @@
</span><span class="cx"> RefPtr<Scrollbar> widget = Scrollbar::createNativeScrollbar(this, orientation, RegularScrollbar);
</span><span class="cx"> if (orientation == HorizontalScrollbar) {
</span><span class="cx"> m_horizontalScrollbarLayer = adoptNS([[WKPDFPluginScrollbarLayer alloc] initWithPDFPlugin:this]);
</span><del>- [m_containerLayer.get() addSublayer:m_horizontalScrollbarLayer.get()];
</del><ins>+ [m_containerLayer addSublayer:m_horizontalScrollbarLayer.get()];
</ins><span class="cx"> } else {
</span><span class="cx"> m_verticalScrollbarLayer = adoptNS([[WKPDFPluginScrollbarLayer alloc] initWithPDFPlugin:this]);
</span><del>- [m_containerLayer.get() addSublayer:m_verticalScrollbarLayer.get()];
</del><ins>+ [m_containerLayer addSublayer:m_verticalScrollbarLayer.get()];
</ins><span class="cx"> }
</span><span class="cx"> didAddScrollbar(widget.get(), orientation);
</span><span class="cx"> pluginView()->frame()->view()->addChild(widget.get());
</span><span class="lines">@@ -664,10 +664,10 @@
</span><span class="cx"> scrollbar = 0;
</span><span class="cx">
</span><span class="cx"> if (orientation == HorizontalScrollbar) {
</span><del>- [m_horizontalScrollbarLayer.get() removeFromSuperlayer];
</del><ins>+ [m_horizontalScrollbarLayer removeFromSuperlayer];
</ins><span class="cx"> m_horizontalScrollbarLayer = 0;
</span><span class="cx"> } else {
</span><del>- [m_verticalScrollbarLayer.get() removeFromSuperlayer];
</del><ins>+ [m_verticalScrollbarLayer removeFromSuperlayer];
</ins><span class="cx"> m_verticalScrollbarLayer = 0;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -896,20 +896,20 @@
</span><span class="cx">
</span><span class="cx"> updatePageAndDeviceScaleFactors();
</span><span class="cx">
</span><del>- [m_pdfLayerController.get() setFrameSize:size()];
</del><ins>+ [m_pdfLayerController setFrameSize:size()];
</ins><span class="cx"> m_pdfLayerController.get().document = document.get();
</span><span class="cx">
</span><span class="cx"> if (handlesPageScaleFactor())
</span><del>- pluginView()->setPageScaleFactor([m_pdfLayerController.get() contentScaleFactor], IntPoint());
</del><ins>+ pluginView()->setPageScaleFactor([m_pdfLayerController contentScaleFactor], IntPoint());
</ins><span class="cx">
</span><del>- notifyScrollPositionChanged(IntPoint([m_pdfLayerController.get() scrollPosition]));
</del><ins>+ notifyScrollPositionChanged(IntPoint([m_pdfLayerController scrollPosition]));
</ins><span class="cx">
</span><span class="cx"> calculateSizes();
</span><span class="cx"> updateScrollbars();
</span><span class="cx">
</span><span class="cx"> runScriptsInPDFDocument();
</span><span class="cx">
</span><del>- if ([document.get() isLocked])
</del><ins>+ if ([document isLocked])
</ins><span class="cx"> createPasswordEntryForm();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -978,7 +978,7 @@
</span><span class="cx"> void PDFPlugin::runScriptsInPDFDocument()
</span><span class="cx"> {
</span><span class="cx"> Vector<RetainPtr<CFStringRef>> scripts;
</span><del>- getAllScriptsInPDFDocument([m_pdfDocument.get() documentRef], scripts);
</del><ins>+ getAllScriptsInPDFDocument([m_pdfDocument documentRef], scripts);
</ins><span class="cx">
</span><span class="cx"> size_t scriptCount = scripts.size();
</span><span class="cx"> if (!scriptCount)
</span><span class="lines">@@ -1020,7 +1020,7 @@
</span><span class="cx"> if (!handlesPageScaleFactor())
</span><span class="cx"> newScaleFactor *= webFrame()->page()->pageScaleFactor();
</span><span class="cx">
</span><del>- [m_pdfLayerController.get() setDeviceScaleFactor:newScaleFactor];
</del><ins>+ [m_pdfLayerController setDeviceScaleFactor:newScaleFactor];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PDFPlugin::contentsScaleFactorChanged(float)
</span><span class="lines">@@ -1030,9 +1030,9 @@
</span><span class="cx">
</span><span class="cx"> void PDFPlugin::computePageBoxes()
</span><span class="cx"> {
</span><del>- size_t pageCount = CGPDFDocumentGetNumberOfPages([m_pdfDocument.get() documentRef]);
</del><ins>+ size_t pageCount = CGPDFDocumentGetNumberOfPages([m_pdfDocument documentRef]);
</ins><span class="cx"> for (size_t i = 0; i < pageCount; ++i) {
</span><del>- CGPDFPageRef pdfPage = CGPDFDocumentGetPage([m_pdfDocument.get() documentRef], i + 1);
</del><ins>+ CGPDFPageRef pdfPage = CGPDFDocumentGetPage([m_pdfDocument documentRef], i + 1);
</ins><span class="cx"> ASSERT(pdfPage);
</span><span class="cx">
</span><span class="cx"> CGRect box = CGPDFPageGetBoxRect(pdfPage, kCGPDFCropBox);
</span><span class="lines">@@ -1052,7 +1052,7 @@
</span><span class="cx"> // FIXME: This should come straight from PDFKit.
</span><span class="cx"> computePageBoxes();
</span><span class="cx">
</span><del>- setPDFDocumentSize(IntSize([m_pdfLayerController.get() contentSizeRespectingZoom]));
</del><ins>+ setPDFDocumentSize(IntSize([m_pdfLayerController contentSizeRespectingZoom]));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool PDFPlugin::initialize(const Parameters& parameters)
</span><span class="lines">@@ -1080,8 +1080,8 @@
</span><span class="cx"> destroyScrollbar(HorizontalScrollbar);
</span><span class="cx"> destroyScrollbar(VerticalScrollbar);
</span><span class="cx">
</span><del>- [m_scrollCornerLayer.get() removeFromSuperlayer];
- [m_contentLayer.get() removeFromSuperlayer];
</del><ins>+ [m_scrollCornerLayer removeFromSuperlayer];
+ [m_contentLayer removeFromSuperlayer];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PDFPlugin::updateControlTints(GraphicsContext* graphicsContext)
</span><span class="lines">@@ -1138,7 +1138,7 @@
</span><span class="cx"> context->scale(FloatSize(contentsScaleFactor, -contentsScaleFactor));
</span><span class="cx"> context->translate(0, -size().height());
</span><span class="cx">
</span><del>- [m_pdfLayerController.get() snapshotInContext:context->platformContext()];
</del><ins>+ [m_pdfLayerController snapshotInContext:context->platformContext()];
</ins><span class="cx">
</span><span class="cx"> return bitmap.release();
</span><span class="cx"> }
</span><span class="lines">@@ -1191,12 +1191,12 @@
</span><span class="cx">
</span><span class="cx"> void PDFPlugin::geometryDidChange(const IntSize& pluginSize, const IntRect&, const AffineTransform& pluginToRootViewTransform)
</span><span class="cx"> {
</span><del>- if (size() == pluginSize && pluginView()->pageScaleFactor() == [m_pdfLayerController.get() contentScaleFactor])
</del><ins>+ if (size() == pluginSize && pluginView()->pageScaleFactor() == [m_pdfLayerController contentScaleFactor])
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_size = pluginSize;
</span><span class="cx"> m_rootViewToPluginTransform = pluginToRootViewTransform.inverse();
</span><del>- [m_pdfLayerController.get() setFrameSize:pluginSize];
</del><ins>+ [m_pdfLayerController setFrameSize:pluginSize];
</ins><span class="cx">
</span><span class="cx"> [CATransaction begin];
</span><span class="cx"> [CATransaction setDisableActions:YES];
</span><span class="lines">@@ -1204,11 +1204,11 @@
</span><span class="cx"> transform = CATransform3DTranslate(transform, 0, -pluginSize.height(), 0);
</span><span class="cx">
</span><span class="cx"> if (handlesPageScaleFactor()) {
</span><del>- CGFloat magnification = pluginView()->pageScaleFactor() - [m_pdfLayerController.get() contentScaleFactor];
</del><ins>+ CGFloat magnification = pluginView()->pageScaleFactor() - [m_pdfLayerController contentScaleFactor];
</ins><span class="cx">
</span><span class="cx"> // FIXME: Instead of m_lastMousePositionInPluginCoordinates, we should use the zoom origin from PluginView::setPageScaleFactor.
</span><span class="cx"> if (magnification)
</span><del>- [m_pdfLayerController.get() magnifyWithMagnification:magnification atPoint:convertFromPluginToPDFView(m_lastMousePositionInPluginCoordinates) immediately:NO];
</del><ins>+ [m_pdfLayerController magnifyWithMagnification:magnification atPoint:convertFromPluginToPDFView(m_lastMousePositionInPluginCoordinates) immediately:NO];
</ins><span class="cx"> } else {
</span><span class="cx"> // If we don't handle page scale ourselves, we need to respect our parent page's
</span><span class="cx"> // scale, which may have changed.
</span><span class="lines">@@ -1221,7 +1221,7 @@
</span><span class="cx"> if (m_activeAnnotation)
</span><span class="cx"> m_activeAnnotation->updateGeometry();
</span><span class="cx">
</span><del>- [m_contentLayer.get() setSublayerTransform:transform];
</del><ins>+ [m_contentLayer setSublayerTransform:transform];
</ins><span class="cx"> [CATransaction commit];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1319,7 +1319,7 @@
</span><span class="cx"> {
</span><span class="cx"> HitTestResult hitTestResult = None;
</span><span class="cx">
</span><del>- PDFSelection *selectionUnderMouse = [m_pdfLayerController.get() getSelectionForWordAtPoint:convertFromPluginToPDFView(event.position())];
</del><ins>+ PDFSelection *selectionUnderMouse = [m_pdfLayerController getSelectionForWordAtPoint:convertFromPluginToPDFView(event.position())];
</ins><span class="cx"> if (selectionUnderMouse && [[selectionUnderMouse string] length])
</span><span class="cx"> hitTestResult = Text;
</span><span class="cx">
</span><span class="lines">@@ -1386,13 +1386,13 @@
</span><span class="cx">
</span><span class="cx"> switch (event.button()) {
</span><span class="cx"> case WebMouseEvent::LeftButton:
</span><del>- [m_pdfLayerController.get() mouseDragged:nsEvent];
</del><ins>+ [m_pdfLayerController mouseDragged:nsEvent];
</ins><span class="cx"> return true;
</span><span class="cx"> case WebMouseEvent::RightButton:
</span><span class="cx"> case WebMouseEvent::MiddleButton:
</span><span class="cx"> return false;
</span><span class="cx"> case WebMouseEvent::NoButton:
</span><del>- [m_pdfLayerController.get() mouseMoved:nsEvent];
</del><ins>+ [m_pdfLayerController mouseMoved:nsEvent];
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> case WebEvent::MouseDown:
</span><span class="lines">@@ -1401,10 +1401,10 @@
</span><span class="cx"> if (targetScrollbar)
</span><span class="cx"> return targetScrollbar->mouseDown(platformEvent);
</span><span class="cx">
</span><del>- [m_pdfLayerController.get() mouseDown:nsEvent];
</del><ins>+ [m_pdfLayerController mouseDown:nsEvent];
</ins><span class="cx"> return true;
</span><span class="cx"> case WebMouseEvent::RightButton:
</span><del>- [m_pdfLayerController.get() rightMouseDown:nsEvent];
</del><ins>+ [m_pdfLayerController rightMouseDown:nsEvent];
</ins><span class="cx"> return true;
</span><span class="cx"> case WebMouseEvent::MiddleButton:
</span><span class="cx"> case WebMouseEvent::NoButton:
</span><span class="lines">@@ -1416,7 +1416,7 @@
</span><span class="cx"> if (targetScrollbar)
</span><span class="cx"> return targetScrollbar->mouseUp(platformEvent);
</span><span class="cx">
</span><del>- [m_pdfLayerController.get() mouseUp:nsEvent];
</del><ins>+ [m_pdfLayerController mouseUp:nsEvent];
</ins><span class="cx"> return true;
</span><span class="cx"> case WebMouseEvent::RightButton:
</span><span class="cx"> case WebMouseEvent::MiddleButton:
</span><span class="lines">@@ -1456,7 +1456,7 @@
</span><span class="cx"> FrameView* frameView = webFrame()->coreFrame()->view();
</span><span class="cx"> IntPoint point = frameView->contentsToScreen(IntRect(frameView->windowToContents(event.position()), IntSize())).location();
</span><span class="cx">
</span><del>- if (NSMenu *nsMenu = [m_pdfLayerController.get() menuForEvent:nsEventForWebMouseEvent(event)]) {
</del><ins>+ if (NSMenu *nsMenu = [m_pdfLayerController menuForEvent:nsEventForWebMouseEvent(event)]) {
</ins><span class="cx"> WKPopupContextMenu(nsMenu, point);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -1477,7 +1477,7 @@
</span><span class="cx">
</span><span class="cx"> switch (event.type()) {
</span><span class="cx"> case WebEvent::KeyDown:
</span><del>- return [m_pdfLayerController.get() keyDown:fakeEvent];
</del><ins>+ return [m_pdfLayerController keyDown:fakeEvent];
</ins><span class="cx"> default:
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -1516,7 +1516,7 @@
</span><span class="cx"> m_scrollOffset = IntSize(offset.x(), offset.y());
</span><span class="cx">
</span><span class="cx"> [CATransaction begin];
</span><del>- [m_pdfLayerController.get() setScrollPosition:offset];
</del><ins>+ [m_pdfLayerController setScrollPosition:offset];
</ins><span class="cx">
</span><span class="cx"> if (m_activeAnnotation)
</span><span class="cx"> m_activeAnnotation->updateGeometry();
</span><span class="lines">@@ -1527,14 +1527,14 @@
</span><span class="cx"> void PDFPlugin::invalidateScrollbarRect(Scrollbar* scrollbar, const IntRect& rect)
</span><span class="cx"> {
</span><span class="cx"> if (scrollbar == horizontalScrollbar())
</span><del>- [m_horizontalScrollbarLayer.get() setNeedsDisplay];
</del><ins>+ [m_horizontalScrollbarLayer setNeedsDisplay];
</ins><span class="cx"> else if (scrollbar == verticalScrollbar())
</span><del>- [m_verticalScrollbarLayer.get() setNeedsDisplay];
</del><ins>+ [m_verticalScrollbarLayer setNeedsDisplay];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PDFPlugin::invalidateScrollCornerRect(const IntRect& rect)
</span><span class="cx"> {
</span><del>- [m_scrollCornerLayer.get() setNeedsDisplay];
</del><ins>+ [m_scrollCornerLayer setNeedsDisplay];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool PDFPlugin::isFullFramePlugin()
</span><span class="lines">@@ -1702,7 +1702,7 @@
</span><span class="cx">
</span><span class="cx"> int nsOptions = (options & FindOptionsCaseInsensitive) ? NSCaseInsensitiveSearch : 0;
</span><span class="cx">
</span><del>- return [[pdfDocument().get() findString:target withOptions:nsOptions] count];
</del><ins>+ return [[pdfDocument() findString:target withOptions:nsOptions] count];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PDFSelection *PDFPlugin::nextMatchForString(const String& target, BOOL searchForward, BOOL caseSensitive, BOOL wrapSearch, PDFSelection *initialSelection, BOOL startInSelection)
</span><span class="lines">@@ -1764,22 +1764,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (target.isEmpty()) {
</span><del>- PDFSelection* searchSelection = [m_pdfLayerController.get() searchSelection];
- [m_pdfLayerController.get() findString:target caseSensitive:caseSensitive highlightMatches:YES];
- [m_pdfLayerController.get() setSearchSelection:searchSelection];
</del><ins>+ PDFSelection* searchSelection = [m_pdfLayerController searchSelection];
+ [m_pdfLayerController findString:target caseSensitive:caseSensitive highlightMatches:YES];
+ [m_pdfLayerController setSearchSelection:searchSelection];
</ins><span class="cx"> m_lastFoundString = emptyString();
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_lastFoundString == target) {
</span><del>- PDFSelection *selection = nextMatchForString(target, searchForward, caseSensitive, wrapSearch, [m_pdfLayerController.get() searchSelection], NO);
</del><ins>+ PDFSelection *selection = nextMatchForString(target, searchForward, caseSensitive, wrapSearch, [m_pdfLayerController searchSelection], NO);
</ins><span class="cx"> if (!selection)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- [m_pdfLayerController.get() setSearchSelection:selection];
- [m_pdfLayerController.get() gotoSelection:selection];
</del><ins>+ [m_pdfLayerController setSearchSelection:selection];
+ [m_pdfLayerController gotoSelection:selection];
</ins><span class="cx"> } else {
</span><del>- [m_pdfLayerController.get() findString:target caseSensitive:caseSensitive highlightMatches:YES];
</del><ins>+ [m_pdfLayerController findString:target caseSensitive:caseSensitive highlightMatches:YES];
</ins><span class="cx"> m_lastFoundString = target;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1788,22 +1788,22 @@
</span><span class="cx">
</span><span class="cx"> bool PDFPlugin::performDictionaryLookupAtLocation(const WebCore::FloatPoint& point)
</span><span class="cx"> {
</span><del>- PDFSelection* lookupSelection = [m_pdfLayerController.get() getSelectionForWordAtPoint:convertFromPluginToPDFView(roundedIntPoint(point))];
</del><ins>+ PDFSelection* lookupSelection = [m_pdfLayerController getSelectionForWordAtPoint:convertFromPluginToPDFView(roundedIntPoint(point))];
</ins><span class="cx">
</span><span class="cx"> if ([[lookupSelection string] length])
</span><del>- [m_pdfLayerController.get() searchInDictionaryWithSelection:lookupSelection];
</del><ins>+ [m_pdfLayerController searchInDictionaryWithSelection:lookupSelection];
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PDFPlugin::focusNextAnnotation()
</span><span class="cx"> {
</span><del>- [m_pdfLayerController.get() activateNextAnnotation:false];
</del><ins>+ [m_pdfLayerController activateNextAnnotation:false];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PDFPlugin::focusPreviousAnnotation()
</span><span class="cx"> {
</span><del>- [m_pdfLayerController.get() activateNextAnnotation:true];
</del><ins>+ [m_pdfLayerController activateNextAnnotation:true];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PDFPlugin::notifySelectionChanged(PDFSelection *)
</span><span class="lines">@@ -1813,7 +1813,7 @@
</span><span class="cx">
</span><span class="cx"> String PDFPlugin::getSelectionString() const
</span><span class="cx"> {
</span><del>- return [[m_pdfLayerController.get() currentSelection] string];
</del><ins>+ return [[m_pdfLayerController currentSelection] string];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PDFPlugin::performWebSearch(NSString *string)
</span><span class="lines">@@ -1828,14 +1828,14 @@
</span><span class="cx">
</span><span class="cx"> bool PDFPlugin::handleWheelEvent(const WebWheelEvent& event)
</span><span class="cx"> {
</span><del>- PDFDisplayMode displayMode = [m_pdfLayerController.get() displayMode];
</del><ins>+ PDFDisplayMode displayMode = [m_pdfLayerController displayMode];
</ins><span class="cx">
</span><span class="cx"> if (displayMode == kPDFDisplaySinglePageContinuous || displayMode == kPDFDisplayTwoUpContinuous)
</span><span class="cx"> return ScrollableArea::handleWheelEvent(platform(event));
</span><span class="cx">
</span><del>- NSUInteger currentPageIndex = [m_pdfLayerController.get() currentPageIndex];
</del><ins>+ NSUInteger currentPageIndex = [m_pdfLayerController currentPageIndex];
</ins><span class="cx"> bool inFirstPage = currentPageIndex == 0;
</span><del>- bool inLastPage = [m_pdfLayerController.get() lastPageIndex] == currentPageIndex;
</del><ins>+ bool inLastPage = [m_pdfLayerController lastPageIndex] == currentPageIndex;
</ins><span class="cx">
</span><span class="cx"> bool atScrollTop = scrollPosition().y() == 0;
</span><span class="cx"> bool atScrollBottom = scrollPosition().y() == maximumScrollPosition().y();
</span><span class="lines">@@ -1850,12 +1850,12 @@
</span><span class="cx">
</span><span class="cx"> if (atScrollBottom && !inLastPage && event.delta().height() < 0) {
</span><span class="cx"> if (event.delta().height() <= -scrollMagnitudeThresholdForPageFlip && !inMomentumScroll)
</span><del>- [m_pdfLayerController.get() gotoNextPage];
</del><ins>+ [m_pdfLayerController gotoNextPage];
</ins><span class="cx"> return true;
</span><span class="cx"> } else if (atScrollTop && !inFirstPage && event.delta().height() > 0) {
</span><span class="cx"> if (event.delta().height() >= scrollMagnitudeThresholdForPageFlip && !inMomentumScroll) {
</span><span class="cx"> [CATransaction begin];
</span><del>- [m_pdfLayerController.get() gotoPreviousPage];
</del><ins>+ [m_pdfLayerController gotoPreviousPage];
</ins><span class="cx"> scrollToOffsetWithoutAnimation(maximumScrollPosition());
</span><span class="cx"> [CATransaction commit];
</span><span class="cx"> }
</span><span class="lines">@@ -1873,7 +1873,7 @@
</span><span class="cx"> // Save data straight from the resource instead of PDFKit if the document is
</span><span class="cx"> // untouched by the user, so that PDFs which PDFKit can't display will still be downloadable.
</span><span class="cx"> if (m_pdfDocumentWasMutated)
</span><del>- return [m_pdfDocument.get() dataRepresentation];
</del><ins>+ return [m_pdfDocument dataRepresentation];
</ins><span class="cx"> else
</span><span class="cx"> return rawData();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebDragClientMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (162504 => 162505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2014-01-22 06:08:09 UTC (rev 162504)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2014-01-22 06:18:19 UTC (rev 162505)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx">
</span><span class="cx"> void WebDragClient::startDrag(RetainPtr<NSImage> image, const IntPoint& point, const IntPoint&, Clipboard&, Frame& frame, bool linkDrag)
</span><span class="cx"> {
</span><del>- IntSize bitmapSize([image.get() size]);
</del><ins>+ IntSize bitmapSize([image size]);
</ins><span class="cx"> RefPtr<ShareableBitmap> bitmap = convertImageToBitmap(image.get(), bitmapSize);
</span><span class="cx"> ShareableBitmap::Handle handle;
</span><span class="cx"> if (!bitmap || !bitmap->createHandle(handle))
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPageBannerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PageBannerMac.mm (162504 => 162505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PageBannerMac.mm 2014-01-22 06:08:09 UTC (rev 162504)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PageBannerMac.mm 2014-01-22 06:18:19 UTC (rev 162505)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> void PageBanner::didChangeDeviceScaleFactor(float scaleFactor)
</span><span class="cx"> {
</span><span class="cx"> m_layer.get().contentsScale = scaleFactor;
</span><del>- [m_layer.get() setNeedsDisplay];
</del><ins>+ [m_layer setNeedsDisplay];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool PageBanner::mouseEvent(const WebMouseEvent& mouseEvent)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (162504 => 162505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2014-01-22 06:08:09 UTC (rev 162504)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2014-01-22 06:18:19 UTC (rev 162505)
</span><span class="lines">@@ -402,7 +402,7 @@
</span><span class="cx"> ASSERT(!m_isPaintingSuspended);
</span><span class="cx"> m_isPaintingSuspended = true;
</span><span class="cx">
</span><del>- [m_rootLayer.get() setValue:(id)kCFBooleanTrue forKey:@"NSCAViewRenderPaused"];
</del><ins>+ [m_rootLayer setValue:(id)kCFBooleanTrue forKey:@"NSCAViewRenderPaused"];
</ins><span class="cx"> [[NSNotificationCenter defaultCenter] postNotificationName:@"NSCAViewRenderDidPauseNotification" object:nil userInfo:[NSDictionary dictionaryWithObject:m_rootLayer.get() forKey:@"layer"]];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -415,7 +415,7 @@
</span><span class="cx"> }
</span><span class="cx"> m_isPaintingSuspended = false;
</span><span class="cx">
</span><del>- [m_rootLayer.get() setValue:(id)kCFBooleanFalse forKey:@"NSCAViewRenderPaused"];
</del><ins>+ [m_rootLayer setValue:(id)kCFBooleanFalse forKey:@"NSCAViewRenderPaused"];
</ins><span class="cx"> [[NSNotificationCenter defaultCenter] postNotificationName:@"NSCAViewRenderDidResumeNotification" object:nil userInfo:[NSDictionary dictionaryWithObject:m_rootLayer.get() forKey:@"layer"]];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -570,7 +570,7 @@
</span><span class="cx"> m_layerHostingContext->setRootLayer(m_hasRootCompositingLayer ? m_rootLayer.get() : 0);
</span><span class="cx">
</span><span class="cx"> for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(), end = m_pageOverlayLayers.end(); it != end; ++it)
</span><del>- [m_rootLayer.get() addSublayer:it->value->platformLayer()];
</del><ins>+ [m_rootLayer addSublayer:it->value->platformLayer()];
</ins><span class="cx">
</span><span class="cx"> if (TiledBacking* tiledBacking = mainFrameTiledBacking())
</span><span class="cx"> tiledBacking->setAggressivelyRetainsTiles(m_webPage->corePage()->settings().aggressiveTileRetentionEnabled());
</span><span class="lines">@@ -596,7 +596,7 @@
</span><span class="cx"> [CATransaction begin];
</span><span class="cx"> [CATransaction setDisableActions:YES];
</span><span class="cx">
</span><del>- [m_rootLayer.get() addSublayer:layer->platformLayer()];
</del><ins>+ [m_rootLayer addSublayer:layer->platformLayer()];
</ins><span class="cx">
</span><span class="cx"> [CATransaction commit];
</span><span class="cx">
</span><span class="lines">@@ -631,8 +631,8 @@
</span><span class="cx"> [CATransaction begin];
</span><span class="cx"> [CATransaction setDisableActions:YES];
</span><span class="cx">
</span><del>- [m_rootLayer.get() insertSublayer:layer->platformLayer() above:oldPlatformLayer.get()];
- [oldPlatformLayer.get() removeFromSuperlayer];
</del><ins>+ [m_rootLayer insertSublayer:layer->platformLayer() above:oldPlatformLayer.get()];
+ [oldPlatformLayer removeFromSuperlayer];
</ins><span class="cx">
</span><span class="cx"> [CATransaction commit];
</span><span class="cx">
</span><span class="lines">@@ -655,12 +655,12 @@
</span><span class="cx">
</span><span class="cx"> if (m_debugInfoLayer) {
</span><span class="cx"> #ifndef NDEBUG
</span><del>- [m_debugInfoLayer.get() setName:@"Debug Info"];
</del><ins>+ [m_debugInfoLayer setName:@"Debug Info"];
</ins><span class="cx"> #endif
</span><del>- [m_rootLayer.get() addSublayer:m_debugInfoLayer.get()];
</del><ins>+ [m_rootLayer addSublayer:m_debugInfoLayer.get()];
</ins><span class="cx"> }
</span><span class="cx"> } else if (m_debugInfoLayer) {
</span><del>- [m_debugInfoLayer.get() removeFromSuperlayer];
</del><ins>+ [m_debugInfoLayer removeFromSuperlayer];
</ins><span class="cx"> m_debugInfoLayer = nullptr;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (162504 => 162505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2014-01-22 06:08:09 UTC (rev 162504)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2014-01-22 06:18:19 UTC (rev 162505)
</span><span class="lines">@@ -596,7 +596,7 @@
</span><span class="cx"> [scaledAttributes setObject:font forKey:NSFontAttributeName];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- [scaledNSAttributedString.get() addAttributes:scaledAttributes.get() range:range];
</del><ins>+ [scaledNSAttributedString addAttributes:scaledAttributes.get() range:range];
</ins><span class="cx"> }];
</span><span class="cx">
</span><span class="cx"> AttributedString attributedString;
</span><span class="lines">@@ -732,7 +732,7 @@
</span><span class="cx"> static NSCachedURLResponse *cachedResponseForURL(WebPage* webPage, const URL& url)
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<NSMutableURLRequest> request = adoptNS([[NSMutableURLRequest alloc] initWithURL:url]);
</span><del>- [request.get() setValue:(NSString *)webPage->userAgent() forHTTPHeaderField:@"User-Agent"];
</del><ins>+ [request setValue:(NSString *)webPage->userAgent() forHTTPHeaderField:@"User-Agent"];
</ins><span class="cx">
</span><span class="cx"> if (CFURLStorageSessionRef storageSession = webPage->corePage()->mainFrame().loader().networkingContext()->storageSession().platformSession())
</span><span class="cx"> return WKCachedResponseForRequest(storageSession, request.get());
</span><span class="lines">@@ -839,8 +839,8 @@
</span><span class="cx"> WebFrame* frame = WebProcess::shared().webFrame(frameID);
</span><span class="cx"> Frame* coreFrame = frame ? frame->coreFrame() : 0;
</span><span class="cx"> RetainPtr<PDFDocument> pdfDocument = coreFrame ? pdfDocumentForPrintingFrame(coreFrame) : 0;
</span><del>- if ([pdfDocument.get() allowsPrinting]) {
- NSUInteger pageCount = [pdfDocument.get() pageCount];
</del><ins>+ if ([pdfDocument allowsPrinting]) {
+ NSUInteger pageCount = [pdfDocument pageCount];
</ins><span class="cx"> IntRect pageRect(0, 0, ceilf(printInfo.availablePaperWidth), ceilf(printInfo.availablePaperHeight));
</span><span class="cx"> for (NSUInteger i = 1; i <= pageCount; ++i) {
</span><span class="cx"> resultPageRects.append(pageRect);
</span></span></pre>
</div>
</div>
</body>
</html>