[WinCairo] Improve test results for fast layouttests.
authorpeavo@outlook.com <peavo@outlook.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 23 Oct 2015 20:21:54 +0000 (20:21 +0000)
committerpeavo@outlook.com <peavo@outlook.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 23 Oct 2015 20:21:54 +0000 (20:21 +0000)
https://bugs.webkit.org/show_bug.cgi?id=150464

Reviewed by Alex Christensen.

Source/WebCore:

Disable the Mac ascent hack for WinCairo.

* platform/graphics/win/SimpleFontDataCairoWin.cpp:
(WebCore::Font::platformInit):

Tools:

Set custom device scale factor to 1.0.

* DumpRenderTree/win/DumpRenderTree.cpp:
(createWebViewAndOffscreenWindow):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@191507 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/win/SimpleFontDataCairoWin.cpp
Tools/ChangeLog
Tools/DumpRenderTree/win/DumpRenderTree.cpp

index b466057..13f6b40 100644 (file)
@@ -1,3 +1,15 @@
+2015-10-23  Per Arne Vollan  <peavo@outlook.com>
+
+        [WinCairo] Improve test results for fast layouttests.
+        https://bugs.webkit.org/show_bug.cgi?id=150464
+
+        Reviewed by Alex Christensen.
+
+        Disable the Mac ascent hack for WinCairo.
+
+        * platform/graphics/win/SimpleFontDataCairoWin.cpp:
+        (WebCore::Font::platformInit):
+
 2015-10-23  Simon Fraser  <simon.fraser@apple.com>
 
         REGRESSION (r187121): Multiple-keyframe animations not honouring ' forwards' fill-mode
index fae4b4a..1645db1 100644 (file)
@@ -81,8 +81,6 @@ void Font::platformInit()
     ::GetTextFace(dc, faceLength, faceName.data());
     m_isSystemFont = !wcscmp(faceName.data(), L"Lucida Grande");
  
-    ascent = ascentConsideringMacAscentHack(faceName.data(), ascent, descent);
-
     m_fontMetrics.setAscent(ascent);
     m_fontMetrics.setDescent(descent);
     m_fontMetrics.setLineGap(lineGap);
index a6a6500..59b7b90 100644 (file)
@@ -1,3 +1,15 @@
+2015-10-23  Per Arne Vollan  <peavo@outlook.com>
+
+        [WinCairo] Improve test results for fast layouttests.
+        https://bugs.webkit.org/show_bug.cgi?id=150464
+
+        Reviewed by Alex Christensen.
+
+        Set custom device scale factor to 1.0.
+
+        * DumpRenderTree/win/DumpRenderTree.cpp:
+        (createWebViewAndOffscreenWindow):
+
 2015-10-23  Mark Salisbury  <mark.salisbury@hp.com>
 
         [GTK] update-webkitgtk-libs should use mesa tarball
index edc70a0..6a9d25e 100644 (file)
@@ -1234,6 +1234,7 @@ IWebView* createWebViewAndOffscreenWindow(HWND* webViewWindow)
 
     viewPrivate->setShouldApplyMacFontAscentHack(TRUE);
     viewPrivate->setAlwaysUsesComplexTextCodePath(forceComplexText);
+    viewPrivate->setCustomBackingScaleFactor(1.0);
 
     _bstr_t pluginPath = _bstr_t(exePath().data()) + TestPluginDir;
     if (FAILED(viewPrivate->addAdditionalPluginDirectory(pluginPath.GetBSTR())))