diff options
| author | Russell Brenner <russellbrenner@google.com> | 2010-11-18 17:33:13 -0800 |
|---|---|---|
| committer | Russell Brenner <russellbrenner@google.com> | 2010-12-02 13:47:21 -0800 |
| commit | 6b70adc33054f8aee8c54d0f460458a9df11b8a5 (patch) | |
| tree | 103a13998c33944d6ab3b8318c509a037e639460 /WebKit/mac/WebView/WebView.mm | |
| parent | bdf4ebc8e70b2d221b6ee7a65660918ecb1d33aa (diff) | |
| download | external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.zip external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.tar.gz external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.tar.bz2 | |
Merge WebKit at r72274: Initial merge by git.
Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
Diffstat (limited to 'WebKit/mac/WebView/WebView.mm')
| -rw-r--r-- | WebKit/mac/WebView/WebView.mm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm index 49bb451..0498554 100644 --- a/WebKit/mac/WebView/WebView.mm +++ b/WebKit/mac/WebView/WebView.mm @@ -60,7 +60,7 @@ #import "WebFormDelegatePrivate.h" #import "WebFrameInternal.h" #import "WebFrameViewInternal.h" -#import "WebGeolocationControllerClient.h" +#import "WebGeolocationClient.h" #import "WebGeolocationPositionInternal.h" #import "WebHTMLRepresentation.h" #import "WebHTMLViewInternal.h" @@ -147,6 +147,7 @@ #import <WebCore/RenderView.h> #import <WebCore/RenderWidget.h> #import <WebCore/ResourceHandle.h> +#import <WebCore/ResourceLoadScheduler.h> #import <WebCore/RuntimeApplicationChecks.h> #import <WebCore/SchemeRegistry.h> #import <WebCore/ScriptController.h> @@ -621,7 +622,7 @@ static bool shouldEnableLoadDeferring() - (void)_dispatchPendingLoadRequests { - cache()->loader()->servePendingRequests(); + resourceLoadScheduler()->servePendingRequests(); } - (void)_registerDraggedTypes @@ -706,7 +707,7 @@ static NSString *leakMailQuirksUserScriptPath() pageClients.inspectorClient = new WebInspectorClient(self); pageClients.pluginHalterClient = new WebPluginHalterClient(self); #if ENABLE(CLIENT_BASED_GEOLOCATION) - pageClients.geolocationControllerClient = new WebGeolocationControllerClient(self); + pageClients.geolocationClient = new WebGeolocationClient(self); #endif #if ENABLE(DEVICE_ORIENTATION) pageClients.deviceOrientationClient = new WebDeviceOrientationClient(self); @@ -2626,13 +2627,13 @@ static PassOwnPtr<Vector<String> > toStringVector(NSArray* patterns) SchemeRegistry::registerURLSchemeAsSecure(scheme); } -- (void)_scaleWebView:(float)scale +- (void)_scaleWebView:(float)scale atOrigin:(NSPoint)origin { Frame* coreFrame = [self _mainCoreFrame]; if (!coreFrame) return; - coreFrame->scalePage(scale); + coreFrame->scalePage(scale, IntPoint(origin)); } - (float)_viewScaleFactor |