Changeset 174824 in webkit


Ignore:
Timestamp:
Oct 17, 2014 10:30:54 AM (10 years ago)
Author:
Simon Fraser
Message:

[iOS] Turn off font autosizing for iOS WebKitTestRunner
​https://bugs.webkit.org/show_bug.cgi?id=137806

Reviewed by Sam Weinig.
Source/WebKit2:

Confusingly, WKPreferencesSetTextAutosizingEnabled() does nothing on iOS.
Instead, we have to add WKPreferencesSetMinimumZoomFontSize() and set it to 0
to disable font autosizing.

  • UIProcess/API/C/WKPreferences.cpp:

(WKPreferencesSetMinimumZoomFontSize):
(WKPreferencesGetMinimumZoomFontSize):

  • UIProcess/API/C/WKPreferencesRefPrivate.h:

Tools:

Confusingly, WKPreferencesSetTextAutosizingEnabled() does nothing on iOS.
Instead, we have to add WKPreferencesSetMinimumZoomFontSize() and set it to 0
to disable font autosizing.

Add platformResetPreferencesToConsistentValues() and implement it in the iOS
test controller to set platform-specific prefs.

  • WebKitTestRunner/TestController.cpp:

(WTR::TestController::resetPreferencesToConsistentValues):
(WTR::TestController::platformResetPreferencesToConsistentValues):

  • WebKitTestRunner/TestController.h:
  • WebKitTestRunner/ios/TestControllerIOS.mm:

(WTR::TestController::platformResetPreferencesToConsistentValues):

  • WebKitTestRunner/mac/TestControllerMac.mm:

(WTR::TestController::platformResetPreferencesToConsistentValues):

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r174820 r174824  
     12014-10-16  Simon Fraser  <simon.fraser@apple.com>
     2
     3        [iOS] Turn off font autosizing for iOS WebKitTestRunner
     4        https://bugs.webkit.org/show_bug.cgi?id=137806
     5
     6        Reviewed by Sam Weinig.
     7       
     8        Confusingly, WKPreferencesSetTextAutosizingEnabled() does nothing on iOS.
     9        Instead, we have to add WKPreferencesSetMinimumZoomFontSize() and set it to 0
     10        to disable font autosizing.
     11
     12        * UIProcess/API/C/WKPreferences.cpp:
     13        (WKPreferencesSetMinimumZoomFontSize):
     14        (WKPreferencesGetMinimumZoomFontSize):
     15        * UIProcess/API/C/WKPreferencesRefPrivate.h:
     16
    1172014-10-17  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
    218

  • trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp

    r173776 r174824  
    12861286    return toImpl(preferencesRef)->longMousePressEnabled();
    12871287}
     1288
     1289void WKPreferencesSetMinimumZoomFontSize(WKPreferencesRef preferencesRef, double size)
     1290{
     1291    toImpl(preferencesRef)->setMinimumZoomFontSize(size);
     1292}
     1293
     1294double WKPreferencesGetMinimumZoomFontSize(WKPreferencesRef preferencesRef)
     1295{
     1296    return toImpl(preferencesRef)->minimumZoomFontSize();
     1297}

  • trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h

    r173776 r174824  
    335335WK_EXPORT bool WKPreferencesGetLongMousePressEnabled(WKPreferencesRef preferencesRef);
    336336
     337// Defaults to 0. Setting this to 0 disables font autosizing on iOS.
     338WK_EXPORT void WKPreferencesSetMinimumZoomFontSize(WKPreferencesRef preferencesRef, double);
     339WK_EXPORT double WKPreferencesGetMinimumZoomFontSize(WKPreferencesRef preferencesRef);
     340
    337341#ifdef __cplusplus
    338342}

  • trunk/Tools/ChangeLog

    r174809 r174824  
     12014-10-16  Simon Fraser  <simon.fraser@apple.com>
     2
     3        [iOS] Turn off font autosizing for iOS WebKitTestRunner
     4        https://bugs.webkit.org/show_bug.cgi?id=137806
     5
     6        Reviewed by Sam Weinig.
     7
     8        Confusingly, WKPreferencesSetTextAutosizingEnabled() does nothing on iOS.
     9        Instead, we have to add WKPreferencesSetMinimumZoomFontSize() and set it to 0
     10        to disable font autosizing.
     11       
     12        Add platformResetPreferencesToConsistentValues() and implement it in the iOS
     13        test controller to set platform-specific prefs.
     14
     15        * WebKitTestRunner/TestController.cpp:
     16        (WTR::TestController::resetPreferencesToConsistentValues):
     17        (WTR::TestController::platformResetPreferencesToConsistentValues):
     18        * WebKitTestRunner/TestController.h:
     19        * WebKitTestRunner/ios/TestControllerIOS.mm:
     20        (WTR::TestController::platformResetPreferencesToConsistentValues):
     21        * WebKitTestRunner/mac/TestControllerMac.mm:
     22        (WTR::TestController::platformResetPreferencesToConsistentValues):
     23
    1242014-10-16  Dan Bernstein  <mitz@apple.com>
    225

  • trunk/Tools/WebKitTestRunner/TestController.cpp

    r174160 r174824  
    589589
    590590    WKPreferencesSetAcceleratedDrawingEnabled(preferences, m_shouldUseAcceleratedDrawing);
     591   
     592    platformResetPreferencesToConsistentValues();
    591593}
    592594
    … …  
    729731#if !PLATFORM(COCOA)
    730732void TestController::platformConfigureViewForTest(const TestInvocation&)
     733{
     734}
     735
     736void TestController::platformResetPreferencesToConsistentValues()
    731737{
    732738}

  • trunk/Tools/WebKitTestRunner/TestController.h

    r171880 r174824  
    122122    void platformDestroy();
    123123    void platformInitializeContext();
     124    void platformResetPreferencesToConsistentValues();
    124125    void platformConfigureViewForTest(const TestInvocation&);
    125126    void platformWillRunTest(const TestInvocation&);

  • trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm

    r171687 r174824  
    3131#import "PlatformWebView.h"
    3232#import "TestInvocation.h"
     33#import <WebKit/WKPreferencesRefPrivate.h>
    3334#import <WebKit/WKStringCF.h>
    34 #include <wtf/MainThread.h>
     35#import <wtf/MainThread.h>
    3536
    3637namespace WTR {
    … …  
    8081}
    8182
     83void TestController::platformResetPreferencesToConsistentValues()
     84{
     85    WKPreferencesRef preferences = WKPageGroupGetPreferences(m_pageGroup.get());
     86    // Note that WKPreferencesSetTextAutosizingEnabled has no effect on iOS.
     87    WKPreferencesSetMinimumZoomFontSize(preferences, 0);
     88}
     89
    8290void TestController::platformConfigureViewForTest(const TestInvocation& test)
    8391{

  • trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm

    r169845 r174824  
    7979}
    8080
     81void TestController::platformResetPreferencesToConsistentValues()
     82{
     83}
     84
    8185void TestController::platformConfigureViewForTest(const TestInvocation& test)
    8286{
Note: See TracChangeset for help on using the changeset viewer.