[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[jhoneycutt at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 419e63c1f346408caf0270bd3a1bec51e8a5bc22
Author: jhoneycutt at apple.com <jhoneycutt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 3 22:56:17 2010 +0000

    WebKitTestRunner needs to activate the Mac font ascent hack
    https://bugs.webkit.org/show_bug.cgi?id=43404
    
    Reviewed by Darin Adler.
    
    WebKit2:
    
    * WebProcess/InjectedBundle/API/c/WKBundle.cpp:
    (WKBundleActivateMacFontAscentHack):
    Get the InjectedBundle, and calls its activateMacFontAscentHack().
    
    * WebProcess/InjectedBundle/API/c/WKBundlePrivate.h:
    Declare WKBundleActivateMacFontAscentHack().
    
    * WebProcess/InjectedBundle/InjectedBundle.h:
    Declare activateMacFontAscentHack().
    
    * WebProcess/InjectedBundle/mac/InjectedBundleMac.cpp:
    (WebKit::InjectedBundle::activateMacFontAscentHack):
    Stubbed.
    
    * WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp:
    (WebKit::InjectedBundle::activateMacFontAscentHack):
    Stubbed.
    
    * WebProcess/InjectedBundle/win/InjectedBundleWin.cpp:
    (WebKit::InjectedBundle::activateMacFontAscentHack):
    Activate the ascent hack.
    
    WebKitTools:
    
    * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
    (WTR::InjectedBundle::initialize):
    Call WKBundleActivateMacFontAscentHack().
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64603 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 0b6a2fb..b5b42df 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,32 @@
+2010-08-03  Jon Honeycutt  <jhoneycutt at apple.com>
+
+        WebKitTestRunner needs to activate the Mac font ascent hack
+        https://bugs.webkit.org/show_bug.cgi?id=43404
+
+        Reviewed by Darin Adler.
+
+        * WebProcess/InjectedBundle/API/c/WKBundle.cpp:
+        (WKBundleActivateMacFontAscentHack):
+        Get the InjectedBundle, and calls its activateMacFontAscentHack().
+
+        * WebProcess/InjectedBundle/API/c/WKBundlePrivate.h:
+        Declare WKBundleActivateMacFontAscentHack().
+
+        * WebProcess/InjectedBundle/InjectedBundle.h:
+        Declare activateMacFontAscentHack().
+
+        * WebProcess/InjectedBundle/mac/InjectedBundleMac.cpp:
+        (WebKit::InjectedBundle::activateMacFontAscentHack):
+        Stubbed.
+
+        * WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp:
+        (WebKit::InjectedBundle::activateMacFontAscentHack):
+        Stubbed.
+
+        * WebProcess/InjectedBundle/win/InjectedBundleWin.cpp:
+        (WebKit::InjectedBundle::activateMacFontAscentHack):
+        Activate the ascent hack.
+
 2010-08-03  Simon Fraser  <simon.fraser at apple.com>
 
         Fix typo in typo fix.
diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp
index 77abb17..e3b2632 100644
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp
@@ -57,3 +57,8 @@ void WKBundleRemoveAllVisitedLinks(WKBundleRef bundleRef)
 {
     toWK(bundleRef)->removeAllVisitedLinks();
 }
+
+void WKBundleActivateMacFontAscentHack(WKBundleRef bundleRef)
+{
+    toWK(bundleRef)->activateMacFontAscentHack();
+}
diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h
index 5cd053f..35e7fe2 100644
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h
@@ -35,6 +35,7 @@ extern "C" {
 
 WK_EXPORT void WKBundleSetShouldTrackVisitedLinks(WKBundleRef bundle, bool shouldTrackVisitedLinks);
 WK_EXPORT void WKBundleRemoveAllVisitedLinks(WKBundleRef bundle);
+WK_EXPORT void WKBundleActivateMacFontAscentHack(WKBundleRef bundle);
 
 #ifdef __cplusplus
 }
diff --git a/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h b/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h
index 7ac7130..857ac9e 100644
--- a/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h
+++ b/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h
@@ -70,6 +70,7 @@ public:
     void postMessage(const WebCore::String&, APIObject*);
     void setShouldTrackVisitedLinks(bool);
     void removeAllVisitedLinks();
+    void activateMacFontAscentHack();
 
     // Callback hooks
     void didCreatePage(WebPage*);
diff --git a/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.cpp b/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.cpp
index 7fb55f0..c961282 100644
--- a/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.cpp
+++ b/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.cpp
@@ -86,4 +86,8 @@ bool InjectedBundle::load()
     return true;
 }
 
+void InjectedBundle::activateMacFontAscentHack()
+{
+}
+
 } // namespace WebKit
diff --git a/WebKit2/WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp b/WebKit2/WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp
index e4441c1..d514564 100644
--- a/WebKit2/WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp
+++ b/WebKit2/WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp
@@ -39,4 +39,8 @@ bool InjectedBundle::load()
     return false;
 }
 
+void InjectedBundle::activateMacFontAscentHack()
+{
+}
+
 } // namespace WebKit
diff --git a/WebKit2/WebProcess/InjectedBundle/win/InjectedBundleWin.cpp b/WebKit2/WebProcess/InjectedBundle/win/InjectedBundleWin.cpp
index 51e37fe..feef104 100644
--- a/WebKit2/WebProcess/InjectedBundle/win/InjectedBundleWin.cpp
+++ b/WebKit2/WebProcess/InjectedBundle/win/InjectedBundleWin.cpp
@@ -27,6 +27,7 @@
 
 #include "WKBundleAPICast.h"
 #include "WKBundleInitialize.h"
+#include <WebCore/SimpleFontData.h>
 
 #include <windows.h>
 #include <winbase.h>
@@ -79,4 +80,9 @@ bool InjectedBundle::load()
     return true;
 }
 
+void InjectedBundle::activateMacFontAscentHack()
+{
+    SimpleFontData::setShouldApplyMacAscentHack(true);
+}
+
 } // namespace WebKit
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d66f927..472b3c7 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-03  Jon Honeycutt  <jhoneycutt at apple.com>
+
+        WebKitTestRunner needs to activate the Mac font ascent hack
+        https://bugs.webkit.org/show_bug.cgi?id=43404
+
+        Reviewed by Darin Adler.
+
+        * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+        (WTR::InjectedBundle::initialize):
+        Call WKBundleActivateMacFontAscentHack().
+
 2010-08-03  Alex Milowski  <alex at milowski.com>
 
         Reviewed by Beth Dakin.
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp
index 095bd9c..94feab1 100644
--- a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp
@@ -81,6 +81,7 @@ void InjectedBundle::initialize(WKBundleRef bundle)
     WKBundleSetClient(m_bundle, &client);
 
     activateFonts();
+    WKBundleActivateMacFontAscentHack(m_bundle);
 }
 
 void InjectedBundle::done()

-- 
WebKit Debian packaging