Merge WebKit at r72274: Initial merge by git.

Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb

18 files changed, 186 insertions, 40 deletions

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 8d54870..4acd7e5 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,144 @@
+2010-11-16  Stephanie Lewis  <slewis@apple.com>
+
+        Reviewed by Geoff Garen.
+
+        <rdar://problem/8624267> Leak creating offscreen webview running fast/dom tests
+
+        Make a static provider for WebDeviceOrientationProviderMock.  The old code allocated a new WebDeviceOrientationProviderMock for 
+        every WebView, and the WebKit API doesn't support that ownership model.
+
+        * WebView/WebDeviceOrientationProviderMock.h:
+        * WebView/WebDeviceOrientationProviderMock.mm:
+        (+[WebDeviceOrientationProviderMock shared]):
+
+2010-11-16  Dave Hyatt  <hyatt@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=11004
+        
+        font-size:0 is ignored.  Remove the minimum font size of 1 in CSSStyleSelector.
+        Change the pref value for minimum font size from 1 to 0.  Make sure to never use the NSFont's size,
+        since it doesn't honor a size of 0.  Instead pass the size in to the FontPlatformData(NSFont*) version
+        of the constructor rather than using [NSFont pointSize].
+
+        https://bugs.webkit.org/show_bug.cgi?id=49582
+        
+        Negative leading is not handled correctly.  There are two bugs here.  The first is that
+        maxAscent and maxDescent can be negative, so we need a notion of whether or not we have
+        set them before so that we can allow them to be < 0.
+        
+        The second issue is that we should understand where fonts will end up relative to
+        our baseline (excluding line height), and only allow those boxes to impact ascent and
+        descent if the actual font box (without factoring in line height) is above or below the
+        root line box baseline.
+
+        Added fast/css/negative-leading.html
+        
+        These two bug fixes have to land together to keep the Acid 3 test rendering correctly.
+
+        * Misc/WebKitNSStringExtras.mm:
+        (-[NSString _web_drawAtPoint:font:textColor:allowingFontSmoothing:]):
+        (-[NSString _web_widthWithFont:]):
+        * Misc/WebStringTruncator.mm:
+        (fontFromNSFont):
+        * WebView/WebPreferences.mm:
+        (+[WebPreferences initialize]):
+
+2010-11-16  Anders Carlsson  <andersca@apple.com>
+
+        Fix clang++ build.
+
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+
+2010-11-14  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Andreas Kling.
+
+        KeyboardEvent::keyIdentifier() should return "const String&"
+        https://bugs.webkit.org/show_bug.cgi?id=49426
+
+        * WebCoreSupport/WebEditorClient.mm:
+        (selectorForKeyEvent):
+          Change the type of a variable to have keyIdentifier(); String -> const String&
+
+2010-11-12  John Knottenbelt  <jknotten@chromium.org>
+
+        Reviewed by Steve Block.
+
+        Rename GeolocationControllerClient to GeolocationClient.
+        https://bugs.webkit.org/show_bug.cgi?id=49259
+
+        * WebCoreSupport/WebGeolocationClient.h: Renamed from WebKit/mac/WebCoreSupport/WebGeolocationControllerClient.h.
+        (WebGeolocationClient::webView):
+        (WebGeolocationClient::setEnableHighAccuracy):
+        * WebCoreSupport/WebGeolocationClient.mm: Renamed from WebKit/mac/WebCoreSupport/WebGeolocationControllerClient.mm.
+        (WebGeolocationClient::WebGeolocationClient):
+        (WebGeolocationClient::geolocationDestroyed):
+        (WebGeolocationClient::startUpdating):
+        (WebGeolocationClient::stopUpdating):
+        (WebGeolocationClient::lastPosition):
+        * WebKit.order:
+        * WebView/WebView.mm:
+        (-[WebView _commonInitializationWithFrameName:groupName:usesDocumentViews:]):
+
+2010-11-10  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=49356 
+        -[WebView _scaleWebView:] should take and origin and scroll the 
+        document
+        -and corresponding-
+        <rdar://problem/8643921>
+
+        * WebView/WebView.mm:
+        (-[WebView _scaleWebView:atOrigin:]):
+        * WebView/WebViewPrivate.h:
+
+2010-11-10  Csaba Osztrogonác  <ossy@webkit.org>
+
+        Reviewed by David Hyatt.
+
+        HTML5 Ruby support should be mandatory feature
+        https://bugs.webkit.org/show_bug.cgi?id=49272
+
+        Remove Ruby as optional feature.
+
+        * Configurations/FeatureDefines.xcconfig:
+
+2010-11-08  Ned Holbrook  <nholbrook@apple.com>
+
+        Reviewed by Adam Barth.
+
+        Avoid CFAttributedString creation in ComplexTextController by adopting UniChar provider SPI.
+        https://bugs.webkit.org/show_bug.cgi?id=48886
+
+        * WebCoreSupport/WebSystemInterface.mm:
+        (InitWebCoreSystemInterface):
+
+2010-11-08  Nate Chapin  <japhet@chromium.org>
+
+        Unreviewed, build fix.
+
+        Clumsy typo in r71562.
+
+        * Plugins/Hosted/HostedNetscapePluginStream.mm:
+        (WebKit::HostedNetscapePluginStream::start):
+
+2010-11-08  Nate Chapin  <japhet@chromium.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Interface changes in https://bugs.webkit.org/show_bug.cgi?id=27165
+
+        * Plugins/Hosted/HostedNetscapePluginStream.mm:
+        (WebKit::HostedNetscapePluginStream::start): Move duplicate code into NetscapePluginStreamLoader
+        * Plugins/WebNetscapePluginStream.mm:
+        (WebNetscapePluginStream::start): Move duplicate code into NetscapePluginStreamLoader
+        * WebView/WebView.mm:
+        (-[WebView _dispatchPendingLoadRequests]): Use resourceLoadScheduler() instead of cache()->loader().
+
 2010-11-08  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebKit/mac/Configurations/FeatureDefines.xcconfig b/WebKit/mac/Configurations/FeatureDefines.xcconfig
index d08fadf..46d5de4 100644
--- a/WebKit/mac/Configurations/FeatureDefines.xcconfig
+++ b/WebKit/mac/Configurations/FeatureDefines.xcconfig
@@ -91,9 +91,6 @@ ENABLE_NOTIFICATIONS = ;
 ENABLE_OFFLINE_WEB_APPLICATIONS = ENABLE_OFFLINE_WEB_APPLICATIONS;
 ENABLE_PROGRESS_TAG = ENABLE_PROGRESS_TAG;
 
-ENABLE_RUBY = $(ENABLE_RUBY_$(REAL_PLATFORM_NAME));
-ENABLE_RUBY_macosx = ENABLE_RUBY;
-
 ENABLE_SHARED_WORKERS = $(ENABLE_SHARED_WORKERS_$(REAL_PLATFORM_NAME));
 ENABLE_SHARED_WORKERS_macosx = ENABLE_SHARED_WORKERS;
 
@@ -124,4 +121,4 @@ ENABLE_XHTMLMP = ;
 ENABLE_XPATH = ENABLE_XPATH;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_RESIZER) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PROGRESS_TAG) $(ENABLE_RUBY) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_RESIZER) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PROGRESS_TAG) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
diff --git a/WebKit/mac/Configurations/Version.xcconfig b/WebKit/mac/Configurations/Version.xcconfig
index 56baf78..e0ce9cb 100644
--- a/WebKit/mac/Configurations/Version.xcconfig
+++ b/WebKit/mac/Configurations/Version.xcconfig
@@ -22,7 +22,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 MAJOR_VERSION = 534;
-MINOR_VERSION = 12;
+MINOR_VERSION = 13;
 TINY_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION);
 
diff --git a/WebKit/mac/Misc/WebKitNSStringExtras.mm b/WebKit/mac/Misc/WebKitNSStringExtras.mm
index 4785de5..4bf268c 100644
--- a/WebKit/mac/Misc/WebKitNSStringExtras.mm
+++ b/WebKit/mac/Misc/WebKitNSStringExtras.mm
@@ -88,7 +88,7 @@ static BOOL canUseFastRenderer(const UniChar *buffer, unsigned length)
         if (!flipped)
             CGContextScaleCTM(cgContext, 1, -1);
 
-        Font webCoreFont(FontPlatformData(font), ![nsContext isDrawingToScreen], fontSmoothingIsAllowed ? AutoSmoothing : Antialiased);
+        Font webCoreFont(FontPlatformData(font, [font pointSize]), ![nsContext isDrawingToScreen], fontSmoothingIsAllowed ? AutoSmoothing : Antialiased);
         TextRun run(buffer.data(), length);
         run.disableRoundingHacks();
 
@@ -134,7 +134,7 @@ static BOOL canUseFastRenderer(const UniChar *buffer, unsigned length)
     [self getCharacters:buffer.data()];
 
     if (canUseFastRenderer(buffer.data(), length)) {
-        Font webCoreFont(FontPlatformData(font), ![[NSGraphicsContext currentContext] isDrawingToScreen]);
+        Font webCoreFont(FontPlatformData(font, [font pointSize]), ![[NSGraphicsContext currentContext] isDrawingToScreen]);
         TextRun run(buffer.data(), length);
         run.disableRoundingHacks();
         return webCoreFont.floatWidth(run);
diff --git a/WebKit/mac/Misc/WebStringTruncator.mm b/WebKit/mac/Misc/WebStringTruncator.mm
index fb31bbb..8081b92 100644
--- a/WebKit/mac/Misc/WebStringTruncator.mm
+++ b/WebKit/mac/Misc/WebStringTruncator.mm
@@ -58,7 +58,7 @@ static Font& fontFromNSFont(NSFont *font)
         CFRelease(currentFont);
     currentFont = font;
     CFRetain(currentFont);
-    FontPlatformData f(font);
+    FontPlatformData f(font, [font pointSize]);
     currentRenderer = Font(f, ![[NSGraphicsContext currentContext] isDrawingToScreen]);
     return currentRenderer;
 }
diff --git a/WebKit/mac/Plugins/Hosted/HostedNetscapePluginStream.mm b/WebKit/mac/Plugins/Hosted/HostedNetscapePluginStream.mm
index 876a556..8ac1389 100644
--- a/WebKit/mac/Plugins/Hosted/HostedNetscapePluginStream.mm
+++ b/WebKit/mac/Plugins/Hosted/HostedNetscapePluginStream.mm
@@ -39,6 +39,7 @@
 #import <WebCore/DocumentLoader.h>
 #import <WebCore/Frame.h>
 #import <WebCore/FrameLoader.h>
+#import <WebCore/ResourceLoadScheduler.h>
 #import <WebCore/SecurityOrigin.h>
 #import <WebCore/WebCoreURLResponse.h>
 #import <wtf/RefCountedLeakCounter.h>
@@ -213,11 +214,7 @@ void HostedNetscapePluginStream::start()
     ASSERT(!m_frameLoader);
     ASSERT(!m_loader);
     
-    m_loader = NetscapePlugInStreamLoader::create(core([m_instance->pluginView() webFrame]), this);
-    m_loader->setShouldBufferData(false);
-    
-    m_loader->documentLoader()->addPlugInStreamLoader(m_loader.get());
-    m_loader->load(m_request.get());
+    m_loader = resourceLoadScheduler()->schedulePluginStreamLoad(core([m_instance->pluginView() webFrame]), this, m_request.get());
 }
 
 void HostedNetscapePluginStream::stop()
diff --git a/WebKit/mac/Plugins/WebNetscapePluginStream.mm b/WebKit/mac/Plugins/WebNetscapePluginStream.mm
index f39b104..c677973 100644
--- a/WebKit/mac/Plugins/WebNetscapePluginStream.mm
+++ b/WebKit/mac/Plugins/WebNetscapePluginStream.mm
@@ -42,6 +42,7 @@
 #import <WebCore/DocumentLoader.h>
 #import <WebCore/Frame.h>
 #import <WebCore/FrameLoader.h>
+#import <WebCore/ResourceLoadScheduler.h>
 #import <WebCore/SecurityOrigin.h>
 #import <WebCore/WebCoreObjCExtras.h>
 #import <WebCore/WebCoreURLResponse.h>
@@ -282,11 +283,7 @@ void WebNetscapePluginStream::start()
     ASSERT(!m_frameLoader);
     ASSERT(!m_loader);
     
-    m_loader = NetscapePlugInStreamLoader::create(core([m_pluginView.get() webFrame]), this);
-    m_loader->setShouldBufferData(false);
-    
-    m_loader->documentLoader()->addPlugInStreamLoader(m_loader.get());
-    m_loader->load(m_request.get());
+    m_loader = resourceLoadScheduler()->schedulePluginStreamLoad(core([m_pluginView.get() webFrame]), this, m_request.get());
 }
 
 void WebNetscapePluginStream::stop()
diff --git a/WebKit/mac/WebCoreSupport/WebEditorClient.mm b/WebKit/mac/WebCoreSupport/WebEditorClient.mm
index 39b511e..9efa766 100644
--- a/WebKit/mac/WebCoreSupport/WebEditorClient.mm
+++ b/WebKit/mac/WebCoreSupport/WebEditorClient.mm
@@ -643,7 +643,7 @@ static SEL selectorForKeyEvent(KeyboardEvent* event)
     // Eventually, we should move all of the auto-fill code down to WebKit and remove the need for this function by
     // not relying on the selector in the new implementation.
     // The key identifiers are from <http://www.w3.org/TR/DOM-Level-3-Events/keyset.html#KeySet-Set>
-    String key = event->keyIdentifier();
+    const String& key = event->keyIdentifier();
     if (key == "Up")
         return @selector(moveUp:);
     if (key == "Down")
diff --git a/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm b/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
index 7ca27c0..5968084 100644
--- a/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
+++ b/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
@@ -1767,7 +1767,7 @@ PassRefPtr<Widget> WebFrameLoaderClient::createJavaAppletWidget(const IntSize& s
                 loadManually:NO
                 element:element] autorelease];
             if (view)
-                return adoptRef(new NetscapePluginWidget(view));
+                return adoptRef(new NetscapePluginWidget(static_cast<WebBaseNetscapePluginView *>(view)));
         } else {
             ASSERT_NOT_REACHED();
         }
diff --git a/WebKit/mac/WebCoreSupport/WebGeolocationControllerClient.h b/WebKit/mac/WebCoreSupport/WebGeolocationClient.h
index 34d6a29..5ea3369 100644
--- a/WebKit/mac/WebCoreSupport/WebGeolocationControllerClient.h
+++ b/WebKit/mac/WebCoreSupport/WebGeolocationClient.h
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebCore/GeolocationControllerClient.h>
+#import <WebCore/GeolocationClient.h>
 
 namespace WebCore {
     class GeolocationPosition;
@@ -31,9 +31,9 @@ namespace WebCore {
 
 @class WebView;
 
-class WebGeolocationControllerClient : public WebCore::GeolocationControllerClient {
+class WebGeolocationClient : public WebCore::GeolocationClient {
 public:
-    WebGeolocationControllerClient(WebView *);
+    WebGeolocationClient(WebView *);
     WebView *webView() { return m_webView; }
 
     void geolocationDestroyed();
diff --git a/WebKit/mac/WebCoreSupport/WebGeolocationControllerClient.mm b/WebKit/mac/WebCoreSupport/WebGeolocationClient.mm
index 98ffc72..a635b44 100644
--- a/WebKit/mac/WebCoreSupport/WebGeolocationControllerClient.mm
+++ b/WebKit/mac/WebCoreSupport/WebGeolocationClient.mm
@@ -23,34 +23,34 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import "WebGeolocationControllerClient.h"
+#import "WebGeolocationClient.h"
 
 #import "WebGeolocationPositionInternal.h"
 #import "WebViewInternal.h"
 
 using namespace WebCore;
 
-WebGeolocationControllerClient::WebGeolocationControllerClient(WebView *webView)
+WebGeolocationClient::WebGeolocationClient(WebView *webView)
     : m_webView(webView)
 {
 }
 
-void WebGeolocationControllerClient::geolocationDestroyed()
+void WebGeolocationClient::geolocationDestroyed()
 {
     delete this;
 }
 
-void WebGeolocationControllerClient::startUpdating()
+void WebGeolocationClient::startUpdating()
 {
     [[m_webView _geolocationProvider] registerWebView:m_webView];
 }
 
-void WebGeolocationControllerClient::stopUpdating()
+void WebGeolocationClient::stopUpdating()
 {
     [[m_webView _geolocationProvider] unregisterWebView:m_webView];
 }
 
-GeolocationPosition* WebGeolocationControllerClient::lastPosition()
+GeolocationPosition* WebGeolocationClient::lastPosition()
 {
 #if ENABLE(CLIENT_BASED_GEOLOCATION)
     return core([[m_webView _geolocationProvider] lastPosition]);
diff --git a/WebKit/mac/WebCoreSupport/WebSystemInterface.mm b/WebKit/mac/WebCoreSupport/WebSystemInterface.mm
index df3ea4d..2c57646 100644
--- a/WebKit/mac/WebCoreSupport/WebSystemInterface.mm
+++ b/WebKit/mac/WebCoreSupport/WebSystemInterface.mm
@@ -118,5 +118,10 @@ void InitWebCoreSystemInterface(void)
     INIT(GetHyphenationLocationBeforeIndex);
 #endif
 
+    INIT(CreateCTLineWithUniCharProvider);
+#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+    INIT(CreateCTTypesetterWithUniCharProviderAndOptions);
+#endif
+
     didInit = true;
 }
diff --git a/WebKit/mac/WebKit.order b/WebKit/mac/WebKit.order
index c2b5f5d..e566942 100644
--- a/WebKit/mac/WebKit.order
+++ b/WebKit/mac/WebKit.order
@@ -90,8 +90,8 @@ __ZN24WebDatabaseTrackerClient30sharedWebDatabaseTrackerClientEv
 __ZN24WebDatabaseTrackerClientC1Ev
 __ZN24WebDatabaseTrackerClientC2Ev
 __ZL47WebKitInitializeApplicationCachePathIfNecessaryv
-__ZN30WebGeolocationControllerClientC1EP7WebView
-__ZN30WebGeolocationControllerClientC2EP7WebView
+__ZN30WebGeolocationClientC1EP7WebView
+__ZN30WebGeolocationClientC2EP7WebView
 __ZN15WebChromeClientC1EP7WebView
 __ZN15WebChromeClientC2EP7WebView
 __ZN20WebContextMenuClientC1EP7WebView
@@ -744,8 +744,8 @@ __ZN20WebFrameLoaderClient20frameLoaderDestroyedEv
 __ZN20WebFrameLoaderClientD0Ev
 -[WebFrame dealloc]
 -[WebFramePrivate dealloc]
-__ZN30WebGeolocationControllerClient20geolocationDestroyedEv
-__ZN30WebGeolocationControllerClientD0Ev
+__ZN30WebGeolocationClient20geolocationDestroyedEv
+__ZN30WebGeolocationClientD0Ev
 __ZN20WebContextMenuClient20contextMenuDestroyedEv
 __ZN20WebContextMenuClientD0Ev
 __ZN13WebDragClient23dragControllerDestroyedEv
diff --git a/WebKit/mac/WebView/WebDeviceOrientationProviderMock.h b/WebKit/mac/WebView/WebDeviceOrientationProviderMock.h
index be5a764..8f33691 100644
--- a/WebKit/mac/WebView/WebDeviceOrientationProviderMock.h
+++ b/WebKit/mac/WebView/WebDeviceOrientationProviderMock.h
@@ -32,6 +32,8 @@
     WebDeviceOrientationProviderMockInternal* m_internal;
 }
 
++ (WebDeviceOrientationProviderMock *)shared;
+
 - (id)init;
 - (void)setOrientation:(WebDeviceOrientation*)orientation;
 
diff --git a/WebKit/mac/WebView/WebDeviceOrientationProviderMock.mm b/WebKit/mac/WebView/WebDeviceOrientationProviderMock.mm
index 0435264..9600b7d 100644
--- a/WebKit/mac/WebView/WebDeviceOrientationProviderMock.mm
+++ b/WebKit/mac/WebView/WebDeviceOrientationProviderMock.mm
@@ -78,6 +78,12 @@ using namespace WebCore;
 
 @implementation WebDeviceOrientationProviderMock
 
++ (WebDeviceOrientationProviderMock *)shared
+{
+    static WebDeviceOrientationProviderMock *provider = [[WebDeviceOrientationProviderMock alloc] init];
+    return provider;
+}
+
 - (id)init
 {
     self = [super init];
diff --git a/WebKit/mac/WebView/WebPreferences.mm b/WebKit/mac/WebView/WebPreferences.mm
index ed06188..1bacb85 100644
--- a/WebKit/mac/WebView/WebPreferences.mm
+++ b/WebKit/mac/WebView/WebPreferences.mm
@@ -305,7 +305,7 @@ static WebCacheModel cacheModelForMainBundle(void)
         @"Helvetica",                   WebKitSansSerifFontPreferenceKey,
         @"Apple Chancery",              WebKitCursiveFontPreferenceKey,
         @"Papyrus",                     WebKitFantasyFontPreferenceKey,
-        @"1",                           WebKitMinimumFontSizePreferenceKey,
+        @"0",                           WebKitMinimumFontSizePreferenceKey,
         @"9",                           WebKitMinimumLogicalFontSizePreferenceKey, 
         @"16",                          WebKitDefaultFontSizePreferenceKey,
         @"13",                          WebKitDefaultFixedFontSizePreferenceKey,
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
diff --git a/WebKit/mac/WebView/WebViewPrivate.h b/WebKit/mac/WebView/WebViewPrivate.h
index b951689..af594d9 100644
--- a/WebKit/mac/WebView/WebViewPrivate.h
+++ b/WebKit/mac/WebView/WebViewPrivate.h
@@ -542,7 +542,7 @@ Could be worth adding to the API.
 + (void)_setDomainRelaxationForbidden:(BOOL)forbidden forURLScheme:(NSString *)scheme;
 + (void)_registerURLSchemeAsSecure:(NSString *)scheme;
 
-- (void)_scaleWebView:(float)scale;
+- (void)_scaleWebView:(float)scale atOrigin:(NSPoint)origin;
 - (float)_viewScaleFactor;
 
 @end