Changeset 162505 in webkit

Timestamp:

Jan 21, 2014 10:18:19 PM (10 years ago)

Author:

timothy_horton@apple.com

Message:

[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.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/Downloads/mac/DownloadMac.mm (modified) (4 diffs)
• Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm (modified) (4 diffs)
• Shared/mac/ArgumentCodersMac.mm (modified) (4 diffs)
• Shared/mac/ObjCObjectGraphCoders.mm (modified) (2 diffs)
• UIProcess/API/ios/WKGeolocationProviderIOS.mm (modified) (5 diffs)
• UIProcess/API/ios/WKInteractionView.mm (modified) (4 diffs)
• UIProcess/API/mac/FindIndicatorWindow.mm (modified) (6 diffs)
• UIProcess/API/mac/WKPrintingView.mm (modified) (1 diff)
• UIProcess/API/mac/WKView.mm (modified) (5 diffs)
• UIProcess/Plugins/mac/PluginProcessProxyMac.mm (modified) (2 diffs)
• UIProcess/mac/CorrectionPanel.mm (modified) (2 diffs)
• UIProcess/mac/TextCheckerMac.mm (modified) (1 diff)
• UIProcess/mac/WKFullScreenWindowController.mm (modified) (13 diffs)
• UIProcess/mac/WebContextMac.mm (modified) (1 diff)
• UIProcess/mac/WebContextMenuProxyMac.mm (modified) (4 diffs)
• UIProcess/mac/WebInspectorProxyMac.mm (modified) (10 diffs)
• UIProcess/mac/WebPopupMenuProxyMac.mm (modified) (9 diffs)
• WebProcess/EntryPoint/mac/LegacyProcess/WebContentProcessMain.mm (modified) (1 diff)
• WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm (modified) (2 diffs)
• WebProcess/Plugins/PDF/PDFPlugin.mm (modified) (33 diffs)
• WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (modified) (1 diff)
• WebProcess/WebPage/mac/PageBannerMac.mm (modified) (1 diff)
• WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (modified) (6 diffs)
• WebProcess/WebPage/mac/WebPageMac.mm (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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.
+
 2014-01-21  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit2/Shared/Downloads/mac/DownloadMac.mm

@@ -64 +64 @@
 
     // FIXME: Allow this to be changed by the client.
-    [m_nsURLDownload.get() setDeletesFileUponFailure:NO];
+    [m_nsURLDownload setDeletesFileUponFailure:NO];
 }
 
@@ -80 +80 @@
 
     // FIXME: Allow this to be changed by the client.
-    [m_nsURLDownload.get() setDeletesFileUponFailure:NO];
+    [m_nsURLDownload setDeletesFileUponFailure:NO];
 }
 
 void Download::cancel()
 {
-    [m_nsURLDownload.get() cancel];
-
-    RetainPtr<NSData> resumeData = [m_nsURLDownload.get() resumeData];
-    didCancel(IPC::DataReference(reinterpret_cast<const uint8_t*>([resumeData.get() bytes]), [resumeData.get() length]));
+    [m_nsURLDownload cancel];
+
+    RetainPtr<NSData> resumeData = [m_nsURLDownload resumeData];
+    didCancel(IPC::DataReference(reinterpret_cast<const uint8_t*>([resumeData bytes]), [resumeData length]));
 }
 
@@ -96 +96 @@
     ASSERT(m_delegate);
 
-    [m_delegate.get() invalidate];
+    [m_delegate invalidate];
     m_delegate = nullptr;
     m_nsURLDownload = nullptr;
@@ -264 +264 @@
 
         RetainPtr<NSData> resumeData = [download resumeData];
-        IPC::DataReference dataReference(reinterpret_cast<const uint8_t*>([resumeData.get() bytes]), [resumeData.get() length]);
+        IPC::DataReference dataReference(reinterpret_cast<const uint8_t*>([resumeData bytes]), [resumeData length]);
 
         _download->didFail(error, dataReference);

trunk/Source/WebKit2/Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm

@@ -217 +217 @@
 
     dispatchOnResourceLoaderRunLoop(^ {
-        [[protocol.get() client] URLProtocol:protocol.get() didFailWithError:nsError.get()];
+        [[protocol client] URLProtocol:protocol.get() didFailWithError:nsError.get()];
     });
 
@@ -232 +232 @@
 
     dispatchOnResourceLoaderRunLoop(^ {
-        [[protocol.get() client] URLProtocol:protocol.get() didLoadData:nsData.get()];
+        [[protocol client] URLProtocol:protocol.get() didLoadData:nsData.get()];
     });
 }
@@ -245 +245 @@
 
     dispatchOnResourceLoaderRunLoop(^ {
-        [[protocol.get() client] URLProtocol:protocol.get() didReceiveResponse:nsResponse.get() cacheStoragePolicy:static_cast<NSURLCacheStoragePolicy>(cacheStoragePolicy)];
+        [[protocol client] URLProtocol:protocol.get() didReceiveResponse:nsResponse.get() cacheStoragePolicy:static_cast<NSURLCacheStoragePolicy>(cacheStoragePolicy)];
     });
 }
@@ -256 +256 @@
 
     dispatchOnResourceLoaderRunLoop(^ {
-        [[protocol.get() client] URLProtocolDidFinishLoading:protocol.get()];
+        [[protocol client] URLProtocolDidFinishLoading:protocol.get()];
     });
 

trunk/Source/WebKit2/Shared/mac/ArgumentCodersMac.mm

@@ -250 +250 @@
         return false;
 
-    NSUInteger stringLength = [plainString.get() length];
+    NSUInteger stringLength = [plainString length];
 
     RetainPtr<NSMutableAttributedString> resultString = adoptNS([[NSMutableAttributedString alloc] initWithString:plainString.get()]);
@@ -274 +274 @@
         if (!IPC::decode(decoder, attributes))
             return false;
-        [resultString.get() addAttributes:attributes.get() range:NSMakeRange(rangeLocation, rangeLength)];
+        [resultString addAttributes:attributes.get() range:NSMakeRange(rangeLocation, rangeLength)];
     }
 
@@ -341 +341 @@
             return false;
 
-        [dictionary.get() setObject:value.get() forKey:key.get()];
+        [dictionary setObject:value.get() forKey:key.get()];
     }
 
@@ -426 +426 @@
             return false;
 
-        [array.get() addObject:value.get()];
+        [array addObject:value.get()];
     }
 

trunk/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm

@@ -194 +194 @@
                     return false;
 
-                [array.get() addObject:value.get()];
+                [array addObject:value.get()];
             }
 
@@ -218 +218 @@
                     return false;
 
-                [dictionary.get() setObject:value.get() forKey:key.get()];
+                [dictionary setObject:value.get() forKey:key.get()];
             }
 

trunk/Source/WebKit2/UIProcess/API/ios/WKGeolocationProviderIOS.mm

@@ -110 +110 @@
 
     if (_requestsWaitingForCoreLocationStart.isEmpty() && _requestsInWarmUp.isEmpty()) {
-        [_coreLocationProvider.get() stop];
+        [_coreLocationProvider stop];
         _lastActivePosition.clear();
     }
@@ -119 +119 @@
 {
     _isWebCoreGeolocationActive = YES;
-    [_coreLocationProvider.get() start];
+    [_coreLocationProvider start];
 
     // If we have the last position, it is from the initialization or warm up. It is the last known
@@ -135 +135 @@
 -(void)_setEnableHighAccuracy:(BOOL)enableHighAccuracy
 {
-    [_coreLocationProvider.get() setEnableHighAccuracy:enableHighAccuracy];
+    [_coreLocationProvider setEnableHighAccuracy:enableHighAccuracy];
 }
 
@@ -173 +173 @@
     geolocationRequestData.window = window;
     _requestsWaitingForCoreLocationStart.append(geolocationRequestData);
-    [_coreLocationProvider.get() start];
+    [_coreLocationProvider start];
 }
 @end
@@ -264 +264 @@
 - (void)deny
 {
-    [_provider.get() permissionDenied:_permissionRequestProxy.get()];
+    [_provider permissionDenied:_permissionRequestProxy.get()];
     _permissionRequestProxy->deny();
 }

trunk/Source/WebKit2/UIProcess/API/ios/WKInteractionView.mm

@@ -308 +308 @@
     if (!_highlightView) {
         _highlightView = adoptNS([[_UIHighlightView alloc] initWithFrame:CGRectZero]);
-        [_highlightView.get() setOpaque:NO];
-        [_highlightView.get() setCornerRadius:UIWebViewMinimumHighlightRadius];
+        [_highlightView setOpaque:NO];
+        [_highlightView setCornerRadius:UIWebViewMinimumHighlightRadius];
     }
     [self addSubview:_highlightView.get()];
 
     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)]);
-    [_highlightView.get() setColor:highlightUIKitColor.get()];
+    [_highlightView setColor:highlightUIKitColor.get()];
 
     bool allHighlightRectsAreRectilinear = true;
@@ -334 +334 @@
     CGRect boundaryRect = [self frame];
     if (allHighlightRectsAreRectilinear)
-        [_highlightView.get() setFrames:rects.get() boundaryRect:boundaryRect];
+        [_highlightView setFrames:rects.get() boundaryRect:boundaryRect];
     else {
         RetainPtr<NSMutableArray> quads = adoptNS([[NSMutableArray alloc] initWithCapacity:static_cast<const NSUInteger>(quadCount)]);
@@ -340 +340 @@
             const FloatQuad& quad = highlightedQuads[i];
             FloatQuad extendedQuad = inflateQuad(quad, UIWebViewMinimumHighlightRadius);
-            [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()]];
+            [quads addObject:[NSValue valueWithCGPoint:extendedQuad.p1()]];
+            [quads addObject:[NSValue valueWithCGPoint:extendedQuad.p2()]];
+            [quads addObject:[NSValue valueWithCGPoint:extendedQuad.p3()]];
+            [quads addObject:[NSValue valueWithCGPoint:extendedQuad.p4()]];
         }
-        [_highlightView.get() setQuads:quads.get() boundaryRect:boundaryRect];
+        [_highlightView setQuads:quads.get() boundaryRect:boundaryRect];
     }
 
     RetainPtr<NSMutableArray> borderRadii = adoptNS([[NSMutableArray alloc] initWithCapacity:4]);
-    [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()];
+    [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()];
 }
 
 - (void)_cancelLongPressGestureRecognizer
 {
-    [_highlightLongPressGestureRecognizer.get() cancel];
+    [_highlightLongPressGestureRecognizer cancel];
 }
 
@@ -500 +500 @@
 {
     _isTapHighlightIDValid = NO;
-    [_highlightView.get() removeFromSuperview];
+    [_highlightView removeFromSuperview];
 }
 

trunk/Source/WebKit2/UIProcess/API/mac/FindIndicatorWindow.mm

@@ -151 +151 @@
                                                                   defer:NO]);
 
-    [m_findIndicatorWindow.get() setBackgroundColor:[NSColor clearColor]];
-    [m_findIndicatorWindow.get() setOpaque:NO];
-    [m_findIndicatorWindow.get() setIgnoresMouseEvents:YES];
+    [m_findIndicatorWindow setBackgroundColor:[NSColor clearColor]];
+    [m_findIndicatorWindow setOpaque:NO];
+    [m_findIndicatorWindow setIgnoresMouseEvents:YES];
 
     RetainPtr<WKFindIndicatorView> findIndicatorView = adoptNS([[WKFindIndicatorView alloc] _initWithFindIndicator:m_findIndicator]);
-    [m_findIndicatorWindow.get() setContentView:findIndicatorView.get()];
+    [m_findIndicatorWindow setContentView:findIndicatorView.get()];
 
     [[m_wkView window] addChildWindow:m_findIndicatorWindow.get() ordered:NSWindowAbove];
-    [m_findIndicatorWindow.get() setReleasedWhenClosed:NO];
+    [m_findIndicatorWindow setReleasedWhenClosed:NO];
 
     if (animate) {
@@ -168 +168 @@
                                                                             animationProgressCallback:&FindIndicatorWindow::bounceAnimationCallback
                                                                               animationDidEndCallback:&FindIndicatorWindow::bounceAnimationDidEnd]);
-        [m_bounceAnimation.get() startAnimation];
+        [m_bounceAnimation startAnimation];
     }
 
@@ -183 +183 @@
 
     if (m_fadeOutAnimation) {
-        [m_fadeOutAnimation.get() stopAnimation];
+        [m_fadeOutAnimation stopAnimation];
         m_fadeOutAnimation = nullptr;
     }
 
     if (m_bounceAnimation) {
-        [m_bounceAnimation.get() stopAnimation];
+        [m_bounceAnimation stopAnimation];
         m_bounceAnimation = nullptr;
     }
@@ -195 +195 @@
         WKWindowBounceAnimationContextDestroy(m_bounceAnimationContext);
     
-    [[m_findIndicatorWindow.get() parentWindow] removeChildWindow:m_findIndicatorWindow.get()];
-    [m_findIndicatorWindow.get() close];
+    [[m_findIndicatorWindow parentWindow] removeChildWindow:m_findIndicatorWindow.get()];
+    [m_findIndicatorWindow close];
     m_findIndicatorWindow = nullptr;
 }
@@ -208 +208 @@
                                                                            animationProgressCallback:&FindIndicatorWindow::fadeOutAnimationCallback
                                                                              animationDidEndCallback:&FindIndicatorWindow::fadeOutAnimationDidEnd]);
-    [m_fadeOutAnimation.get() startAnimation];
+    [m_fadeOutAnimation startAnimation];
 }
                         
@@ -215 +215 @@
     ASSERT(m_fadeOutAnimation);
 
-    [m_findIndicatorWindow.get() setAlphaValue:1.0 - progress];
+    [m_findIndicatorWindow setAlphaValue:1.0 - progress];
 }
 

trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm

@@ -77 +77 @@
 - (void)_setAutodisplay:(BOOL)newState
 {
-    if (!newState && [[_wkView.get() window] isAutodisplay])
-        [_wkView.get() displayIfNeeded];
+    if (!newState && [[_wkView window] isAutodisplay])
+        [_wkView displayIfNeeded];
     
-    [[_wkView.get() window] setAutodisplay:newState];
+    [[_wkView window] setAutodisplay:newState];
 
     // For some reason, painting doesn't happen for a long time without this call, <rdar://problem/8975229>.
     if (newState)
-        [_wkView.get() displayIfNeeded];
+        [_wkView displayIfNeeded];
 }
 

trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

@@ -1606 +1606 @@
     if (actualRange) {
         *actualRange = nsRange;
-        actualRange->length = [result.string.get() length];
-    }
-
-    LOG(TextInput, "attributedSubstringFromRange:(%u, %u) -> \"%@\"", nsRange.location, nsRange.length, [result.string.get() string]);
-    return [[result.string.get() retain] autorelease];
+        actualRange->length = [result.string length];
+    }
+
+    LOG(TextInput, "attributedSubstringFromRange:(%u, %u) -> \"%@\"", nsRange.location, nsRange.length, [result.string string]);
+    return [[result.string retain] autorelease];
 }
 
@@ -2203 +2203 @@
         
     ColorSpaceData colorSpaceData;
-    colorSpaceData.cgColorSpace = [_data->_colorSpace.get() CGColorSpace];
+    colorSpaceData.cgColorSpace = [_data->_colorSpace CGColorSpace];
 
     return colorSpaceData;    
@@ -2586 +2586 @@
     RetainPtr<NSMutableArray> types = adoptNS([[NSMutableArray alloc] initWithObjects:NSFilesPromisePboardType, nil]);
     
-    [types.get() addObjectsFromArray:archiveBuffer ? PasteboardTypes::forImagesWithArchive() : PasteboardTypes::forImages()];
+    [types addObjectsFromArray:archiveBuffer ? PasteboardTypes::forImagesWithArchive() : PasteboardTypes::forImages()];
     [pasteboard declareTypes:types.get() owner:self];
     if (!matchesExtensionOrEquivalent(filename, extension))
@@ -2677 +2677 @@
     
     // FIXME: Report an error if we fail to create a file.
-    NSString *path = [[dropDestination path] stringByAppendingPathComponent:[wrapper.get() preferredFilename]];
+    NSString *path = [[dropDestination path] stringByAppendingPathComponent:[wrapper preferredFilename]];
     path = pathWithUniqueFilenameForPath(path);
     if (![wrapper writeToURL:[NSURL fileURLWithPath:path] options:NSFileWrapperWritingWithNameUpdating originalContentsURL:nil error:nullptr])
@@ -2766 +2766 @@
     RetainPtr<WKResponderChainSink> sink = adoptNS([[WKResponderChainSink alloc] initWithResponderChain:self]);
     [super doCommandBySelector:selector];
-    [sink.get() detach];
-    return ![sink.get() didReceiveUnhandledCommand];
+    [sink detach];
+    return ![sink didReceiveUnhandledCommand];
 }
 

trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm

@@ -272 +272 @@
     
     m_placeholderWindow = adoptNS([[WKPlaceholderModalWindow alloc] initWithContentRect:NSMakeRect(0, 0, 1, 1) styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES]);
-    [m_placeholderWindow.get() setReleasedWhenClosed:NO];
+    [m_placeholderWindow setReleasedWhenClosed:NO];
     
     m_activationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationWillBecomeActiveNotification object:NSApp queue:nil
@@ -283 +283 @@
     [NSApp runModalForWindow:m_placeholderWindow.get()];
     
-    [m_placeholderWindow.get() orderOut:nil];
+    [m_placeholderWindow orderOut:nil];
     m_placeholderWindow = nullptr;
 }

trunk/Source/WebKit2/UIProcess/mac/CorrectionPanel.mm

@@ -119 +119 @@
 
     NSSpellChecker* spellChecker = [NSSpellChecker sharedSpellChecker];
-    NSInteger documentTag = [m_view.get() spellCheckerDocumentTag];
+    NSInteger documentTag = [m_view spellCheckerDocumentTag];
     
     switch (correctionIndicatorType) {
@@ -142 +142 @@
     }
 
-    [m_view.get() handleAcceptedAlternativeText:acceptedReplacement];
+    [m_view handleAcceptedAlternativeText:acceptedReplacement];
     m_view.clear();
     if (acceptedReplacement)

trunk/Source/WebKit2/UIProcess/mac/TextCheckerMac.mm

@@ -419 +419 @@
     for (size_t i = 0; i < grammarDetail.guesses.size(); ++i) {
         NSString *guess = grammarDetail.guesses[i];
-        [corrections.get() addObject:guess];
+        [corrections addObject:guess];
     }
 

trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm

@@ -168 +168 @@
     NSRect screenFrame = [[window screen] frame];
     [window setFrame:screenFrame display:YES];
-    [_backgroundWindow.get() setFrame:screenFrame display:YES];
+    [_backgroundWindow setFrame:screenFrame display:YES];
 }
 
@@ -236 +236 @@
     if (!_webViewPlaceholder) {
         _webViewPlaceholder = adoptNS([[WebCoreFullScreenPlaceholderView alloc] initWithFrame:[_webView frame]]);
-        [_webViewPlaceholder.get() setAction:@selector(cancelOperation:)];
-    }
-    [_webViewPlaceholder.get() setTarget:nil];
-    [_webViewPlaceholder.get() setContents:(id)webViewContents.get()];
+        [_webViewPlaceholder setAction:@selector(cancelOperation:)];
+    }
+    [_webViewPlaceholder setTarget:nil];
+    [_webViewPlaceholder setContents:(id)webViewContents.get()];
     [self _replaceView:_webView with:_webViewPlaceholder.get()];
     
@@ -287 +287 @@
         WKWindowSetClipRect([self window], windowBounds);
 
-        [_fadeAnimation.get() stopAnimation];
-        [_fadeAnimation.get() setWindow:nil];
+        [_fadeAnimation stopAnimation];
+        [_fadeAnimation setWindow:nil];
         _fadeAnimation = nullptr;
         
-        [_backgroundWindow.get() orderOut:self];
-        [_backgroundWindow.get() setFrame:NSZeroRect display:YES];
-
-        [_webViewPlaceholder.get() setExitWarningVisible:YES];
-        [_webViewPlaceholder.get() setTarget:self];
+        [_backgroundWindow orderOut:self];
+        [_backgroundWindow setFrame:NSZeroRect display:YES];
+
+        [_webViewPlaceholder setExitWarningVisible:YES];
+        [_webViewPlaceholder setTarget:self];
     } else {
         // Transition to fullscreen failed. Clean up.
         _fullScreenState = NotInFullScreen;
 
-        [_scaleAnimation.get() stopAnimation];
-
-        [_backgroundWindow.get() orderOut:self];
-        [_backgroundWindow.get() setFrame:NSZeroRect display:YES];
+        [_scaleAnimation stopAnimation];
+
+        [_backgroundWindow orderOut:self];
+        [_backgroundWindow setFrame:NSZeroRect display:YES];
 
         [[self window] setAutodisplay:YES];
@@ -325 +325 @@
 {
     if (_watchdogTimer) {
-        [_watchdogTimer.get() invalidate];
+        [_watchdogTimer invalidate];
         _watchdogTimer.clear();
     }
@@ -333 +333 @@
     _fullScreenState = WaitingToExitFullScreen;
 
-    [_webViewPlaceholder.get() setExitWarningVisible:NO];
+    [_webViewPlaceholder setExitWarningVisible:NO];
 
     // Screen updates to be re-enabled in _startExitFullScreenAnimationWithDuration: or beganExitFullScreenWithInitialFrame:finalFrame:
@@ -342 +342 @@
     // We will resume the normal behavior in _startExitFullScreenAnimationWithDuration:
     [_webView _setSuppressVisibilityUpdates:YES];
-    [_webViewPlaceholder.get() setTarget:nil];
+    [_webViewPlaceholder setTarget:nil];
 
     [self _manager]->setAnimatingFullScreen(true);
@@ -378 +378 @@
     // Screen updates to be re-enabled in completeFinishExitFullScreenAnimationAfterRepaint.
     NSDisableScreenUpdates();
-    [[_webViewPlaceholder.get() window] setAutodisplay:NO];
+    [[_webViewPlaceholder window] setAutodisplay:NO];
 
     NSResponder *firstResponder = [[self window] firstResponder];
@@ -391 +391 @@
     [[self window] setFrame:NSZeroRect display:YES];
 
-    [_fadeAnimation.get() stopAnimation];
-    [_fadeAnimation.get() setWindow:nil];
+    [_fadeAnimation stopAnimation];
+    [_fadeAnimation setWindow:nil];
     _fadeAnimation = nullptr;
 
-    [_backgroundWindow.get() orderOut:self];
-    [_backgroundWindow.get() setFrame:NSZeroRect display:YES];
+    [_backgroundWindow orderOut:self];
+    [_backgroundWindow setFrame:NSZeroRect display:YES];
 
     [[_webView window] makeKeyAndOrderFront:self];
@@ -556 +556 @@
     _scaleAnimation = adoptNS([[WebWindowScaleAnimation alloc] initWithHintedDuration:duration window:[self window] initalFrame:initialWindowFrame finalFrame:screenFrame]);
     
-    [_scaleAnimation.get() setAnimationBlockingMode:NSAnimationNonblocking];
-    [_scaleAnimation.get() setCurrentProgress:0];
-    [_scaleAnimation.get() startAnimation];
+    [_scaleAnimation setAnimationBlockingMode:NSAnimationNonblocking];
+    [_scaleAnimation setCurrentProgress:0];
+    [_scaleAnimation startAnimation];
 
     // WKWindowSetClipRect takes window coordinates, so convert from screen coordinates here:
@@ -578 +578 @@
         _backgroundWindow = createBackgroundFullscreenWindow(screenFrame);
     else
-        [_backgroundWindow.get() setFrame:screenFrame display:NO];
+        [_backgroundWindow setFrame:screenFrame display:NO];
 
     CGFloat currentAlpha = 0;
     if (_fadeAnimation) {
-        currentAlpha = [_fadeAnimation.get() currentAlpha];
-        [_fadeAnimation.get() stopAnimation];
-        [_fadeAnimation.get() setWindow:nil];
+        currentAlpha = [_fadeAnimation currentAlpha];
+        [_fadeAnimation stopAnimation];
+        [_fadeAnimation setWindow:nil];
     }
 
@@ -591 +591 @@
                                                                initialAlpha:currentAlpha 
                                                                  finalAlpha:1]);
-    [_fadeAnimation.get() setAnimationBlockingMode:NSAnimationNonblocking];
-    [_fadeAnimation.get() setCurrentProgress:0];
-    [_fadeAnimation.get() startAnimation];
-
-    [_backgroundWindow.get() orderWindow:NSWindowBelow relativeTo:[[self window] windowNumber]];
+    [_fadeAnimation setAnimationBlockingMode:NSAnimationNonblocking];
+    [_fadeAnimation setCurrentProgress:0];
+    [_fadeAnimation startAnimation];
+
+    [_backgroundWindow orderWindow:NSWindowBelow relativeTo:[[self window] windowNumber]];
 
     [_webView _setSuppressVisibilityUpdates:NO];
@@ -616 +616 @@
     NSRect initialWindowFrame = windowFrameFromApparentFrames(screenFrame, _initialFrame, _finalFrame);
 
-    NSRect currentFrame = _scaleAnimation ? [_scaleAnimation.get() currentFrame] : [[self window] frame];
+    NSRect currentFrame = _scaleAnimation ? [_scaleAnimation currentFrame] : [[self window] frame];
     _scaleAnimation = adoptNS([[WebWindowScaleAnimation alloc] initWithHintedDuration:duration window:[self window] initalFrame:currentFrame finalFrame:initialWindowFrame]);
 
-    [_scaleAnimation.get() setAnimationBlockingMode:NSAnimationNonblocking];
-    [_scaleAnimation.get() setCurrentProgress:0];
-    [_scaleAnimation.get() startAnimation];
+    [_scaleAnimation setAnimationBlockingMode:NSAnimationNonblocking];
+    [_scaleAnimation setCurrentProgress:0];
+    [_scaleAnimation startAnimation];
 
     if (!_backgroundWindow)
         _backgroundWindow = createBackgroundFullscreenWindow(screenFrame);
     else
-        [_backgroundWindow.get() setFrame:screenFrame display:NO];
+        [_backgroundWindow setFrame:screenFrame display:NO];
 
     CGFloat currentAlpha = 1;
     if (_fadeAnimation) {
-        currentAlpha = [_fadeAnimation.get() currentAlpha];
-        [_fadeAnimation.get() stopAnimation];
-        [_fadeAnimation.get() setWindow:nil];
+        currentAlpha = [_fadeAnimation currentAlpha];
+        [_fadeAnimation stopAnimation];
+        [_fadeAnimation setWindow:nil];
     }
     _fadeAnimation = adoptNS([[WebWindowFadeAnimation alloc] initWithDuration:duration 
@@ -638 +638 @@
                                                                initialAlpha:currentAlpha 
                                                                  finalAlpha:0]);
-    [_fadeAnimation.get() setAnimationBlockingMode:NSAnimationNonblocking];
-    [_fadeAnimation.get() setCurrentProgress:0];
-    [_fadeAnimation.get() startAnimation];
-
-    [_backgroundWindow.get() orderWindow:NSWindowBelow relativeTo:[[self window] windowNumber]];
+    [_fadeAnimation setAnimationBlockingMode:NSAnimationNonblocking];
+    [_fadeAnimation setCurrentProgress:0];
+    [_fadeAnimation startAnimation];
+
+    [_backgroundWindow orderWindow:NSWindowBelow relativeTo:[[self window] windowNumber]];
 
     // WKWindowSetClipRect takes window coordinates, so convert from screen coordinates here:

trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm

@@ -212 +212 @@
         cachePath = @"~/Library/Caches/com.apple.WebKit2.WebProcess";
 
-    return [cachePath.get() stringByStandardizingPath];
+    return [cachePath stringByStandardizingPath];
 }
 

trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm

@@ -114 +114 @@
 {
     if (m_popup)
-        [m_popup.get() setControlView:nil];
+        [m_popup setControlView:nil];
 }
 
@@ -187 +187 @@
 {
     if (m_popup)
-        [m_popup.get() removeAllItems];
+        [m_popup removeAllItems];
     else {
         m_popup = adoptNS([[NSPopUpButtonCell alloc] initTextCell:@"" pullsDown:NO]);
-        [m_popup.get() setUsesItemFromMenu:NO];
-        [m_popup.get() setAutoenablesItems:NO];
-    }
-
-    NSMenu* menu = [m_popup.get() menu];
+        [m_popup setUsesItemFromMenu:NO];
+        [m_popup setAutoenablesItems:NO];
+    }
+
+    NSMenu* menu = [m_popup menu];
     populateNSMenu(menu, nsMenuItemVector(items));
 }
@@ -208 +208 @@
     NSRect menuRect = NSMakeRect(menuLocation.x(), menuLocation.y(), 0, 0);
     
-    [m_popup.get() attachPopUpWithFrame:menuRect inView:m_webView];
-
-    NSMenu* menu = [m_popup.get() menu];
+    [m_popup attachPopUpWithFrame:menuRect inView:m_webView];
+
+    NSMenu* menu = [m_popup menu];
 
     // These values were borrowed from AppKit to match their placement of the menu.
-    NSRect titleFrame = [m_popup.get()  titleRectForBounds:menuRect];
+    NSRect titleFrame = [m_popup  titleRectForBounds:menuRect];
     if (titleFrame.size.width <= 0 || titleFrame.size.height <= 0)
         titleFrame = menuRect;
@@ -227 +227 @@
     WKPopupContextMenu(menu, location);
 
-    [m_popup.get() dismissPopUp];
+    [m_popup dismissPopUp];
 }
 
 void WebContextMenuProxyMac::hideContextMenu()
 {
-    [m_popup.get() dismissPopUp];
+    [m_popup dismissPopUp];
 }
 

trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm

@@ -345 +345 @@
     m_dockRightButton.get().hidden = !canAttach();
 
-    [m_inspectorView.get() setFrame:[contentView bounds]];
-    [m_inspectorView.get() setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
+    [m_inspectorView setFrame:[contentView bounds]];
+    [m_inspectorView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
     [contentView addSubview:m_inspectorView.get()];
 
@@ -362 +362 @@
 
     NSString *title = [NSString stringWithFormat:WEB_UI_STRING("Web Inspector — %@", "Web Inspector window title"), (NSString *)m_urlString];
-    [m_inspectorWindow.get() setTitle:title];
+    [m_inspectorWindow setTitle:title];
 }
 
@@ -394 +394 @@
     ASSERT(m_inspectorView);
 
-    [m_inspectorView.get() setDrawsBackground:NO];
+    [m_inspectorView setDrawsBackground:NO];
 
     m_inspectorProxyObjCAdapter = adoptNS([[WKWebInspectorProxyObjCAdapter alloc] initWithWebInspectorProxy:this]);
@@ -468 +468 @@
 {
     if (m_inspectorWindow) {
-        [m_inspectorWindow.get() setDelegate:nil];
-        [m_inspectorWindow.get() orderOut:nil];
+        [m_inspectorWindow setDelegate:nil];
+        [m_inspectorWindow orderOut:nil];
         m_inspectorWindow = 0;
     }
@@ -475 +475 @@
     m_inspectorView = 0;
 
-    [m_inspectorProxyObjCAdapter.get() close];
+    [m_inspectorProxyObjCAdapter close];
     m_inspectorProxyObjCAdapter = 0;
 }
@@ -487 +487 @@
 
     if (m_inspectorWindow) {
-        [m_inspectorWindow.get() setDelegate:nil];
-        [m_inspectorWindow.get() orderOut:nil];
+        [m_inspectorWindow setDelegate:nil];
+        [m_inspectorWindow orderOut:nil];
         m_inspectorWindow = 0;
     }
@@ -624 +624 @@
         case AttachmentSideBottom: {
             if (!currentDimension)
-                currentDimension = NSHeight([m_inspectorView.get() frame]);
+                currentDimension = NSHeight([m_inspectorView frame]);
 
             CGFloat parentHeight = NSHeight(parentBounds);
@@ -637 +637 @@
         case AttachmentSideRight: {
             if (!currentDimension)
-                currentDimension = NSWidth([m_inspectorView.get() frame]);
+                currentDimension = NSWidth([m_inspectorView frame]);
 
             CGFloat parentWidth = NSWidth(parentBounds);
@@ -677 +677 @@
 
     if (m_inspectorWindow) {
-        [m_inspectorWindow.get() setDelegate:nil];
-        [m_inspectorWindow.get() orderOut:nil];
+        [m_inspectorWindow setDelegate:nil];
+        [m_inspectorWindow orderOut:nil];
         m_inspectorWindow = 0;
     }
 
-    [m_inspectorView.get() removeFromSuperview];
-
-    [m_inspectorView.get() setAutoresizingMask:NSViewWidthSizable | NSViewMaxYMargin];
+    [m_inspectorView removeFromSuperview];
+
+    [m_inspectorView setAutoresizingMask:NSViewWidthSizable | NSViewMaxYMargin];
 
     CGFloat currentDimension;
@@ -709 +709 @@
     [[NSNotificationCenter defaultCenter] removeObserver:m_inspectorProxyObjCAdapter.get() name:NSViewFrameDidChangeNotification object:inspectedView];
 
-    [m_inspectorView.get() removeFromSuperview];
+    [m_inspectorView removeFromSuperview];
 
     // Make sure that we size the inspected view's frame after detaching so that it takes up the space that the

trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm

@@ -50 +50 @@
 {
     if (m_popup)
-        [m_popup.get() setControlView:nil];
+        [m_popup setControlView:nil];
 }
 
@@ -56 +56 @@
 {
     if (m_popup)
-        [m_popup.get() removeAllItems];
+        [m_popup removeAllItems];
     else {
         m_popup = adoptNS([[NSPopUpButtonCell alloc] initTextCell:@"" pullsDown:NO]);
-        [m_popup.get() setUsesItemFromMenu:NO];
-        [m_popup.get() setAutoenablesItems:NO];
+        [m_popup setUsesItemFromMenu:NO];
+        [m_popup setAutoenablesItems:NO];
     }
 
@@ -67 +67 @@
     for (int i = 0; i < size; i++) {
         if (items[i].m_type == WebPopupItem::Separator)
-            [[m_popup.get() menu] addItem:[NSMenuItem separatorItem]];
+            [[m_popup menu] addItem:[NSMenuItem separatorItem]];
         else {
-            [m_popup.get() addItemWithTitle:@""];
-            NSMenuItem *menuItem = [m_popup.get() lastItem];
+            [m_popup addItemWithTitle:@""];
+            NSMenuItem *menuItem = [m_popup lastItem];
 
             RetainPtr<NSMutableParagraphStyle> paragraphStyle = adoptNS([[NSParagraphStyle defaultParagraphStyle] mutableCopy]);
             NSWritingDirection writingDirection = items[i].m_textDirection == LTR ? NSWritingDirectionLeftToRight : NSWritingDirectionRightToLeft;
-            [paragraphStyle.get() setBaseWritingDirection:writingDirection];
-            [paragraphStyle.get() setAlignment:menuTextDirection == LTR ? NSLeftTextAlignment : NSRightTextAlignment];
+            [paragraphStyle setBaseWritingDirection:writingDirection];
+            [paragraphStyle setAlignment:menuTextDirection == LTR ? NSLeftTextAlignment : NSRightTextAlignment];
             RetainPtr<NSMutableDictionary> attributes = adoptNS([[NSMutableDictionary alloc] initWithObjectsAndKeys:
                 paragraphStyle.get(), NSParagraphStyleAttributeName,
@@ -83 +83 @@
                 RetainPtr<NSNumber> writingDirectionValue = adoptNS([[NSNumber alloc] initWithInteger:writingDirection + NSTextWritingDirectionOverride]);
                 RetainPtr<NSArray> writingDirectionArray = adoptNS([[NSArray alloc] initWithObjects:writingDirectionValue.get(), nil]);
-                [attributes.get() setObject:writingDirectionArray.get() forKey:NSWritingDirectionAttributeName];
+                [attributes setObject:writingDirectionArray.get() forKey:NSWritingDirectionAttributeName];
             }
             RetainPtr<NSAttributedString> string = adoptNS([[NSAttributedString alloc] initWithString:nsStringFromWebCoreString(items[i].m_text) attributes:attributes.get()]);
@@ -90 +90 @@
             // We set the title as well as the attributed title here. The attributed title will be displayed in the menu,
             // but typeahead will use the non-attributed string that doesn't contain any leading or trailing whitespace.
-            [menuItem setTitle:[[string.get() string] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]];
+            [menuItem setTitle:[[string string] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]];
             [menuItem setEnabled:items[i].m_isEnabled];
             [menuItem setToolTip:nsStringFromWebCoreString(items[i].m_toolTip)];
@@ -108 +108 @@
     populate(items, font, textDirection);
 
-    [m_popup.get() attachPopUpWithFrame:rect inView:m_webView];
-    [m_popup.get() selectItemAtIndex:selectedIndex];
-    [m_popup.get() setUserInterfaceLayoutDirection:textDirection == LTR ? NSUserInterfaceLayoutDirectionLeftToRight : NSUserInterfaceLayoutDirectionRightToLeft];
+    [m_popup attachPopUpWithFrame:rect inView:m_webView];
+    [m_popup selectItemAtIndex:selectedIndex];
+    [m_popup setUserInterfaceLayoutDirection:textDirection == LTR ? NSUserInterfaceLayoutDirectionLeftToRight : NSUserInterfaceLayoutDirectionRightToLeft];
 
-    NSMenu *menu = [m_popup.get() menu];
+    NSMenu *menu = [m_popup menu];
 
     // These values were borrowed from AppKit to match their placement of the menu.
@@ -123 +123 @@
     NSPoint location;
     if (data.shouldPopOver) {
-        NSRect titleFrame = [m_popup.get()  titleRectForBounds:rect];
+        NSRect titleFrame = [m_popup  titleRectForBounds:rect];
         if (titleFrame.size.width <= 0 || titleFrame.size.height <= 0)
             titleFrame = rect;
@@ -133 +133 @@
     RetainPtr<NSView> dummyView = adoptNS([[NSView alloc] initWithFrame:rect]);
     [m_webView addSubview:dummyView.get()];
-    location = [dummyView.get() convertPoint:location fromView:m_webView];
+    location = [dummyView convertPoint:location fromView:m_webView];
 
     WKPopupMenu(menu, location, roundf(NSWidth(rect)), dummyView.get(), selectedIndex, font);
 
-    [m_popup.get() dismissPopUp];
-    [dummyView.get() removeFromSuperview];
+    [m_popup dismissPopUp];
+    [dummyView removeFromSuperview];
     
     if (!m_client)
         return;
     
-    m_client->valueChangedForPopupMenu(this, [m_popup.get() indexOfSelectedItem]);
+    m_client->valueChangedForPopupMenu(this, [m_popup indexOfSelectedItem]);
     
     // <https://bugs.webkit.org/show_bug.cgi?id=57904> This code is adopted from EventHandler::sendFakeEventsAfterWidgetTracking().
@@ -181 +181 @@
 void WebPopupMenuProxyMac::hidePopupMenu()
 {
-    [m_popup.get() dismissPopUp];
+    [m_popup dismissPopUp];
 }
 

trunk/Source/WebKit2/WebProcess/EntryPoint/mac/LegacyProcess/WebContentProcessMain.mm

@@ -155 +155 @@
         RetainPtr<CFURLRef> clientBundleURL = adoptCF(WKCopyBundleURLForExecutableURL((CFURLRef)clientExecutableURL.get()));
         RetainPtr<NSBundle> clientBundle = adoptNS([[NSBundle alloc] initWithURL:(NSURL *)clientBundleURL.get()]);
-        clientIdentifier = [clientBundle.get() bundleIdentifier];
+        clientIdentifier = [clientBundle bundleIdentifier];
         if (clientIdentifier.isEmpty())
             return false;

trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm

@@ -53 +53 @@
         // so the coordinate system will match the event coordinate system.
         m_pluginLayer = adoptNS([[CALayer alloc] init]);
-        [m_pluginLayer.get() setGeometryFlipped:YES];
+        [m_pluginLayer setGeometryFlipped:YES];
 
         if (m_isRestartedProcess) {
@@ -61 +61 @@
             fadeInAnimation.duration = fadeInDuration;
             fadeInAnimation.removedOnCompletion = NO;
-            [m_pluginLayer.get() addAnimation:fadeInAnimation forKey:@"restarted-plugin-fade-in"];
+            [m_pluginLayer addAnimation:fadeInAnimation forKey:@"restarted-plugin-fade-in"];
         }
 

trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm

@@ -525 +525 @@
     m_accessibilityObject.get().parent = webFrame()->page()->accessibilityRemoteObject();
 
-    [m_containerLayer.get() addSublayer:m_contentLayer.get()];
-    [m_containerLayer.get() addSublayer:m_scrollCornerLayer.get()];
+    [m_containerLayer addSublayer:m_contentLayer.get()];
+    [m_containerLayer addSublayer:m_scrollCornerLayer.get()];
 }
 
@@ -614 +614 @@
     if (m_verticalScrollbarLayer) {
         m_verticalScrollbarLayer.get().frame = verticalScrollbar()->frameRect();
-        [m_verticalScrollbarLayer.get() setNeedsDisplay];
+        [m_verticalScrollbarLayer setNeedsDisplay];
     }
     
     if (m_horizontalScrollbarLayer) {
         m_horizontalScrollbarLayer.get().frame = horizontalScrollbar()->frameRect();
-        [m_horizontalScrollbarLayer.get() setNeedsDisplay];
+        [m_horizontalScrollbarLayer setNeedsDisplay];
     }
     
     if (m_scrollCornerLayer) {
         m_scrollCornerLayer.get().frame = scrollCornerRect();
-        [m_scrollCornerLayer.get() setNeedsDisplay];
+        [m_scrollCornerLayer setNeedsDisplay];
     }
 }
@@ -643 +643 @@
     if (orientation == HorizontalScrollbar) {
         m_horizontalScrollbarLayer = adoptNS([[WKPDFPluginScrollbarLayer alloc] initWithPDFPlugin:this]);
-        [m_containerLayer.get() addSublayer:m_horizontalScrollbarLayer.get()];
+        [m_containerLayer addSublayer:m_horizontalScrollbarLayer.get()];
     } else {
         m_verticalScrollbarLayer = adoptNS([[WKPDFPluginScrollbarLayer alloc] initWithPDFPlugin:this]);
-        [m_containerLayer.get() addSublayer:m_verticalScrollbarLayer.get()];
+        [m_containerLayer addSublayer:m_verticalScrollbarLayer.get()];
     }
     didAddScrollbar(widget.get(), orientation);
@@ -665 +665 @@
 
     if (orientation == HorizontalScrollbar) {
-        [m_horizontalScrollbarLayer.get() removeFromSuperlayer];
+        [m_horizontalScrollbarLayer removeFromSuperlayer];
         m_horizontalScrollbarLayer = 0;
     } else {
-        [m_verticalScrollbarLayer.get() removeFromSuperlayer];
+        [m_verticalScrollbarLayer removeFromSuperlayer];
         m_verticalScrollbarLayer = 0;
     }
@@ -897 +897 @@
     updatePageAndDeviceScaleFactors();
 
-    [m_pdfLayerController.get() setFrameSize:size()];
+    [m_pdfLayerController setFrameSize:size()];
     m_pdfLayerController.get().document = document.get();
 
     if (handlesPageScaleFactor())
-        pluginView()->setPageScaleFactor([m_pdfLayerController.get() contentScaleFactor], IntPoint());
-
-    notifyScrollPositionChanged(IntPoint([m_pdfLayerController.get() scrollPosition]));
+        pluginView()->setPageScaleFactor([m_pdfLayerController contentScaleFactor], IntPoint());
+
+    notifyScrollPositionChanged(IntPoint([m_pdfLayerController scrollPosition]));
 
     calculateSizes();
@@ -910 +910 @@
     runScriptsInPDFDocument();
 
-    if ([document.get() isLocked])
+    if ([document isLocked])
         createPasswordEntryForm();
 }
@@ -979 +979 @@
 {
     Vector<RetainPtr<CFStringRef>> scripts;
-    getAllScriptsInPDFDocument([m_pdfDocument.get() documentRef], scripts);
+    getAllScriptsInPDFDocument([m_pdfDocument documentRef], scripts);
 
     size_t scriptCount = scripts.size();
@@ -1021 +1021 @@
         newScaleFactor *= webFrame()->page()->pageScaleFactor();
 
-    [m_pdfLayerController.get() setDeviceScaleFactor:newScaleFactor];
+    [m_pdfLayerController setDeviceScaleFactor:newScaleFactor];
 }
 
@@ -1031 +1031 @@
 void PDFPlugin::computePageBoxes()
 {
-    size_t pageCount = CGPDFDocumentGetNumberOfPages([m_pdfDocument.get() documentRef]);
+    size_t pageCount = CGPDFDocumentGetNumberOfPages([m_pdfDocument documentRef]);
     for (size_t i = 0; i < pageCount; ++i) {
-        CGPDFPageRef pdfPage = CGPDFDocumentGetPage([m_pdfDocument.get() documentRef], i + 1);
+        CGPDFPageRef pdfPage = CGPDFDocumentGetPage([m_pdfDocument documentRef], i + 1);
         ASSERT(pdfPage);
 
@@ -1053 +1053 @@
     computePageBoxes();
 
-    setPDFDocumentSize(IntSize([m_pdfLayerController.get() contentSizeRespectingZoom]));
+    setPDFDocumentSize(IntSize([m_pdfLayerController contentSizeRespectingZoom]));
 }
 
@@ -1081 +1081 @@
     destroyScrollbar(VerticalScrollbar);
     
-    [m_scrollCornerLayer.get() removeFromSuperlayer];
-    [m_contentLayer.get() removeFromSuperlayer];
+    [m_scrollCornerLayer removeFromSuperlayer];
+    [m_contentLayer removeFromSuperlayer];
 }
 
@@ -1139 +1139 @@
     context->translate(0, -size().height());
 
-    [m_pdfLayerController.get() snapshotInContext:context->platformContext()];
+    [m_pdfLayerController snapshotInContext:context->platformContext()];
 
     return bitmap.release();
@@ -1192 +1192 @@
 void PDFPlugin::geometryDidChange(const IntSize& pluginSize, const IntRect&, const AffineTransform& pluginToRootViewTransform)
 {
-    if (size() == pluginSize && pluginView()->pageScaleFactor() == [m_pdfLayerController.get() contentScaleFactor])
+    if (size() == pluginSize && pluginView()->pageScaleFactor() == [m_pdfLayerController contentScaleFactor])
         return;
 
     m_size = pluginSize;
     m_rootViewToPluginTransform = pluginToRootViewTransform.inverse();
-    [m_pdfLayerController.get() setFrameSize:pluginSize];
+    [m_pdfLayerController setFrameSize:pluginSize];
 
     [CATransaction begin];
@@ -1205 +1205 @@
     
     if (handlesPageScaleFactor()) {
-        CGFloat magnification = pluginView()->pageScaleFactor() - [m_pdfLayerController.get() contentScaleFactor];
+        CGFloat magnification = pluginView()->pageScaleFactor() - [m_pdfLayerController contentScaleFactor];
 
         // FIXME: Instead of m_lastMousePositionInPluginCoordinates, we should use the zoom origin from PluginView::setPageScaleFactor.
         if (magnification)
-            [m_pdfLayerController.get() magnifyWithMagnification:magnification atPoint:convertFromPluginToPDFView(m_lastMousePositionInPluginCoordinates) immediately:NO];
+            [m_pdfLayerController magnifyWithMagnification:magnification atPoint:convertFromPluginToPDFView(m_lastMousePositionInPluginCoordinates) immediately:NO];
     } else {
         // If we don't handle page scale ourselves, we need to respect our parent page's
@@ -1222 +1222 @@
         m_activeAnnotation->updateGeometry();
 
-    [m_contentLayer.get() setSublayerTransform:transform];
+    [m_contentLayer setSublayerTransform:transform];
     [CATransaction commit];
 }
@@ -1320 +1320 @@
     HitTestResult hitTestResult = None;
 
-    PDFSelection *selectionUnderMouse = [m_pdfLayerController.get() getSelectionForWordAtPoint:convertFromPluginToPDFView(event.position())];
+    PDFSelection *selectionUnderMouse = [m_pdfLayerController getSelectionForWordAtPoint:convertFromPluginToPDFView(event.position())];
     if (selectionUnderMouse && [[selectionUnderMouse string] length])
         hitTestResult = Text;
@@ -1387 +1387 @@
         switch (event.button()) {
         case WebMouseEvent::LeftButton:
-            [m_pdfLayerController.get() mouseDragged:nsEvent];
+            [m_pdfLayerController mouseDragged:nsEvent];
             return true;
         case WebMouseEvent::RightButton:
@@ -1393 +1393 @@
             return false;
         case WebMouseEvent::NoButton:
-            [m_pdfLayerController.get() mouseMoved:nsEvent];
+            [m_pdfLayerController mouseMoved:nsEvent];
             return true;
         }
@@ -1402 +1402 @@
                 return targetScrollbar->mouseDown(platformEvent);
 
-            [m_pdfLayerController.get() mouseDown:nsEvent];
+            [m_pdfLayerController mouseDown:nsEvent];
             return true;
         case WebMouseEvent::RightButton:
-            [m_pdfLayerController.get() rightMouseDown:nsEvent];
+            [m_pdfLayerController rightMouseDown:nsEvent];
             return true;
         case WebMouseEvent::MiddleButton:
@@ -1417 +1417 @@
                 return targetScrollbar->mouseUp(platformEvent);
 
-            [m_pdfLayerController.get() mouseUp:nsEvent];
+            [m_pdfLayerController mouseUp:nsEvent];
             return true;
         case WebMouseEvent::RightButton:
@@ -1457 +1457 @@
     IntPoint point = frameView->contentsToScreen(IntRect(frameView->windowToContents(event.position()), IntSize())).location();
     
-    if (NSMenu *nsMenu = [m_pdfLayerController.get() menuForEvent:nsEventForWebMouseEvent(event)]) {
+    if (NSMenu *nsMenu = [m_pdfLayerController menuForEvent:nsEventForWebMouseEvent(event)]) {
         WKPopupContextMenu(nsMenu, point);
         return true;
@@ -1478 +1478 @@
     switch (event.type()) {
     case WebEvent::KeyDown:
-        return [m_pdfLayerController.get() keyDown:fakeEvent];
+        return [m_pdfLayerController keyDown:fakeEvent];
     default:
         return false;
@@ -1517 +1517 @@
 
     [CATransaction begin];
-    [m_pdfLayerController.get() setScrollPosition:offset];
+    [m_pdfLayerController setScrollPosition:offset];
 
     if (m_activeAnnotation)
@@ -1528 +1528 @@
 {
     if (scrollbar == horizontalScrollbar())
-        [m_horizontalScrollbarLayer.get() setNeedsDisplay];
+        [m_horizontalScrollbarLayer setNeedsDisplay];
     else if (scrollbar == verticalScrollbar())
-        [m_verticalScrollbarLayer.get() setNeedsDisplay];
+        [m_verticalScrollbarLayer setNeedsDisplay];
 }
 
 void PDFPlugin::invalidateScrollCornerRect(const IntRect& rect)
 {
-    [m_scrollCornerLayer.get() setNeedsDisplay];
+    [m_scrollCornerLayer setNeedsDisplay];
 }
 
@@ -1703 +1703 @@
     int nsOptions = (options & FindOptionsCaseInsensitive) ? NSCaseInsensitiveSearch : 0;
 
-    return [[pdfDocument().get() findString:target withOptions:nsOptions] count];
+    return [[pdfDocument() findString:target withOptions:nsOptions] count];
 }
 
@@ -1765 +1765 @@
 
     if (target.isEmpty()) {
-        PDFSelection* searchSelection = [m_pdfLayerController.get() searchSelection];
-        [m_pdfLayerController.get() findString:target caseSensitive:caseSensitive highlightMatches:YES];
-        [m_pdfLayerController.get() setSearchSelection:searchSelection];
+        PDFSelection* searchSelection = [m_pdfLayerController searchSelection];
+        [m_pdfLayerController findString:target caseSensitive:caseSensitive highlightMatches:YES];
+        [m_pdfLayerController setSearchSelection:searchSelection];
         m_lastFoundString = emptyString();
         return false;
@@ -1773 +1773 @@
 
     if (m_lastFoundString == target) {
-        PDFSelection *selection = nextMatchForString(target, searchForward, caseSensitive, wrapSearch, [m_pdfLayerController.get() searchSelection], NO);
+        PDFSelection *selection = nextMatchForString(target, searchForward, caseSensitive, wrapSearch, [m_pdfLayerController searchSelection], NO);
         if (!selection)
             return false;
 
-        [m_pdfLayerController.get() setSearchSelection:selection];
-        [m_pdfLayerController.get() gotoSelection:selection];
+        [m_pdfLayerController setSearchSelection:selection];
+        [m_pdfLayerController gotoSelection:selection];
     } else {
-        [m_pdfLayerController.get() findString:target caseSensitive:caseSensitive highlightMatches:YES];
+        [m_pdfLayerController findString:target caseSensitive:caseSensitive highlightMatches:YES];
         m_lastFoundString = target;
     }
@@ -1789 +1789 @@
 bool PDFPlugin::performDictionaryLookupAtLocation(const WebCore::FloatPoint& point)
 {
-    PDFSelection* lookupSelection = [m_pdfLayerController.get() getSelectionForWordAtPoint:convertFromPluginToPDFView(roundedIntPoint(point))];
+    PDFSelection* lookupSelection = [m_pdfLayerController getSelectionForWordAtPoint:convertFromPluginToPDFView(roundedIntPoint(point))];
 
     if ([[lookupSelection string] length])
-        [m_pdfLayerController.get() searchInDictionaryWithSelection:lookupSelection];
+        [m_pdfLayerController searchInDictionaryWithSelection:lookupSelection];
 
     return true;
@@ -1799 +1799 @@
 void PDFPlugin::focusNextAnnotation()
 {
-    [m_pdfLayerController.get() activateNextAnnotation:false];
+    [m_pdfLayerController activateNextAnnotation:false];
 }
 
 void PDFPlugin::focusPreviousAnnotation()
 {
-    [m_pdfLayerController.get() activateNextAnnotation:true];
+    [m_pdfLayerController activateNextAnnotation:true];
 }
 
@@ -1814 +1814 @@
 String PDFPlugin::getSelectionString() const
 {
-    return [[m_pdfLayerController.get() currentSelection] string];
+    return [[m_pdfLayerController currentSelection] string];
 }
 
@@ -1829 +1829 @@
 bool PDFPlugin::handleWheelEvent(const WebWheelEvent& event)
 {
-    PDFDisplayMode displayMode = [m_pdfLayerController.get() displayMode];
+    PDFDisplayMode displayMode = [m_pdfLayerController displayMode];
 
     if (displayMode == kPDFDisplaySinglePageContinuous || displayMode == kPDFDisplayTwoUpContinuous)
         return ScrollableArea::handleWheelEvent(platform(event));
 
-    NSUInteger currentPageIndex = [m_pdfLayerController.get() currentPageIndex];
+    NSUInteger currentPageIndex = [m_pdfLayerController currentPageIndex];
     bool inFirstPage = currentPageIndex == 0;
-    bool inLastPage = [m_pdfLayerController.get() lastPageIndex] == currentPageIndex;
+    bool inLastPage = [m_pdfLayerController lastPageIndex] == currentPageIndex;
 
     bool atScrollTop = scrollPosition().y() == 0;
@@ -1851 +1851 @@
     if (atScrollBottom && !inLastPage && event.delta().height() < 0) {
         if (event.delta().height() <= -scrollMagnitudeThresholdForPageFlip && !inMomentumScroll)
-            [m_pdfLayerController.get() gotoNextPage];
+            [m_pdfLayerController gotoNextPage];
         return true;
     } else if (atScrollTop && !inFirstPage && event.delta().height() > 0) {
         if (event.delta().height() >= scrollMagnitudeThresholdForPageFlip && !inMomentumScroll) {
             [CATransaction begin];
-            [m_pdfLayerController.get() gotoPreviousPage];
+            [m_pdfLayerController gotoPreviousPage];
             scrollToOffsetWithoutAnimation(maximumScrollPosition());
             [CATransaction commit];
@@ -1874 +1874 @@
     // untouched by the user, so that PDFs which PDFKit can't display will still be downloadable.
     if (m_pdfDocumentWasMutated)
-        return [m_pdfDocument.get() dataRepresentation];
+        return [m_pdfDocument dataRepresentation];
     else
         return rawData();

trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm

@@ -79 +79 @@
 void WebDragClient::startDrag(RetainPtr<NSImage> image, const IntPoint& point, const IntPoint&, Clipboard&, Frame& frame, bool linkDrag)
 {
-    IntSize bitmapSize([image.get() size]);
+    IntSize bitmapSize([image size]);
     RefPtr<ShareableBitmap> bitmap = convertImageToBitmap(image.get(), bitmapSize);
     ShareableBitmap::Handle handle;

trunk/Source/WebKit2/WebProcess/WebPage/mac/PageBannerMac.mm

@@ -124 +124 @@
 {
     m_layer.get().contentsScale = scaleFactor;
-    [m_layer.get() setNeedsDisplay];
+    [m_layer setNeedsDisplay];
 }
 

trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm

@@ -403 +403 @@
     m_isPaintingSuspended = true;
 
-    [m_rootLayer.get() setValue:(id)kCFBooleanTrue forKey:@"NSCAViewRenderPaused"];
+    [m_rootLayer setValue:(id)kCFBooleanTrue forKey:@"NSCAViewRenderPaused"];
     [[NSNotificationCenter defaultCenter] postNotificationName:@"NSCAViewRenderDidPauseNotification" object:nil userInfo:[NSDictionary dictionaryWithObject:m_rootLayer.get() forKey:@"layer"]];
 }
@@ -416 +416 @@
     m_isPaintingSuspended = false;
 
-    [m_rootLayer.get() setValue:(id)kCFBooleanFalse forKey:@"NSCAViewRenderPaused"];
+    [m_rootLayer setValue:(id)kCFBooleanFalse forKey:@"NSCAViewRenderPaused"];
     [[NSNotificationCenter defaultCenter] postNotificationName:@"NSCAViewRenderDidResumeNotification" object:nil userInfo:[NSDictionary dictionaryWithObject:m_rootLayer.get() forKey:@"layer"]];
 }
@@ -571 +571 @@
 
     for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(), end = m_pageOverlayLayers.end(); it != end; ++it)
-        [m_rootLayer.get() addSublayer:it->value->platformLayer()];
+        [m_rootLayer addSublayer:it->value->platformLayer()];
 
     if (TiledBacking* tiledBacking = mainFrameTiledBacking())
@@ -597 +597 @@
     [CATransaction setDisableActions:YES];
 
-    [m_rootLayer.get() addSublayer:layer->platformLayer()];
+    [m_rootLayer addSublayer:layer->platformLayer()];
 
     [CATransaction commit];
@@ -632 +632 @@
     [CATransaction setDisableActions:YES];
 
-    [m_rootLayer.get() insertSublayer:layer->platformLayer() above:oldPlatformLayer.get()];
-    [oldPlatformLayer.get() removeFromSuperlayer];
+    [m_rootLayer insertSublayer:layer->platformLayer() above:oldPlatformLayer.get()];
+    [oldPlatformLayer removeFromSuperlayer];
 
     [CATransaction commit];
@@ -656 +656 @@
         if (m_debugInfoLayer) {
 #ifndef NDEBUG
-            [m_debugInfoLayer.get() setName:@"Debug Info"];
+            [m_debugInfoLayer setName:@"Debug Info"];
 #endif
-            [m_rootLayer.get() addSublayer:m_debugInfoLayer.get()];
+            [m_rootLayer addSublayer:m_debugInfoLayer.get()];
         }
     } else if (m_debugInfoLayer) {
-        [m_debugInfoLayer.get() removeFromSuperlayer];
+        [m_debugInfoLayer removeFromSuperlayer];
         m_debugInfoLayer = nullptr;
     }

trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm

@@ -597 +597 @@
         }
 
-        [scaledNSAttributedString.get() addAttributes:scaledAttributes.get() range:range];
+        [scaledNSAttributedString addAttributes:scaledAttributes.get() range:range];
     }];
 
@@ -733 +733 @@
 {
     RetainPtr<NSMutableURLRequest> request = adoptNS([[NSMutableURLRequest alloc] initWithURL:url]);
-    [request.get() setValue:(NSString *)webPage->userAgent() forHTTPHeaderField:@"User-Agent"];
+    [request setValue:(NSString *)webPage->userAgent() forHTTPHeaderField:@"User-Agent"];
 
     if (CFURLStorageSessionRef storageSession = webPage->corePage()->mainFrame().loader().networkingContext()->storageSession().platformSession())
@@ -840 +840 @@
     Frame* coreFrame = frame ? frame->coreFrame() : 0;
     RetainPtr<PDFDocument> pdfDocument = coreFrame ? pdfDocumentForPrintingFrame(coreFrame) : 0;
-    if ([pdfDocument.get() allowsPrinting]) {
-        NSUInteger pageCount = [pdfDocument.get() pageCount];
+    if ([pdfDocument allowsPrinting]) {
+        NSUInteger pageCount = [pdfDocument pageCount];
         IntRect pageRect(0, 0, ceilf(printInfo.availablePaperWidth), ceilf(printInfo.availablePaperHeight));
         for (NSUInteger i = 1; i <= pageCount; ++i) {