Changeset 93618 in webkit


Ignore:
Timestamp:
Aug 23, 2011, 11:30:33 AM (14 years ago)
Author:
commit-queue@webkit.org
Message:

[chromium] Update WebSettings to support per-script font settings
​https://bugs.webkit.org/show_bug.cgi?id=66220

Patch by Matt Falkenhagen <​falken@chromium.org> on 2011-08-23
Reviewed by Tony Chang.

  • WebKit.gyp:
  • public/WebSettings.h:
  • src/WebSettingsImpl.cpp:

(WebKit::WebSettingsImpl::setStandardFontFamily):
(WebKit::WebSettingsImpl::setFixedFontFamily):
(WebKit::WebSettingsImpl::setSerifFontFamily):
(WebKit::WebSettingsImpl::setSansSerifFontFamily):
(WebKit::WebSettingsImpl::setCursiveFontFamily):
(WebKit::WebSettingsImpl::setFantasyFontFamily):

  • src/WebSettingsImpl.h:
Location:
trunk/Source/WebKit/chromium
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/chromium/ChangeLog

    r93609 r93618  
     12011-08-23  Matt Falkenhagen  <falken@chromium.org>
     2
     3        [chromium] Update WebSettings to support per-script font settings
     4        https://bugs.webkit.org/show_bug.cgi?id=66220
     5
     6        Reviewed by Tony Chang.
     7
     8        * WebKit.gyp:
     9        * public/WebSettings.h:
     10        * src/WebSettingsImpl.cpp:
     11        (WebKit::WebSettingsImpl::setStandardFontFamily):
     12        (WebKit::WebSettingsImpl::setFixedFontFamily):
     13        (WebKit::WebSettingsImpl::setSerifFontFamily):
     14        (WebKit::WebSettingsImpl::setSansSerifFontFamily):
     15        (WebKit::WebSettingsImpl::setCursiveFontFamily):
     16        (WebKit::WebSettingsImpl::setFantasyFontFamily):
     17        * src/WebSettingsImpl.h:
     18
    1192011-08-23  Nat Duca  <nduca@chromium.org>
    220

  • trunk/Source/WebKit/chromium/WebKit.gyp

    r93169 r93618  
    7070                '../../WebCore/WebCore.gyp/WebCore.gyp:webcore',
    7171                '<(chromium_src_dir)/skia/skia.gyp:skia',
     72                '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
    7273                '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
    7374                '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_glsl',
    … …  
    7677            'export_dependent_settings': [
    7778                '<(chromium_src_dir)/skia/skia.gyp:skia',
     79                '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
    7880                '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
    7981                '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',

  • trunk/Source/WebKit/chromium/public/WebSettings.h

    r93577 r93618  
    3333
    3434#include "WebCommon.h"
     35#include <unicode/uscript.h>
    3536
    3637#define HAS_WEBAUDIO_FEATURE_ENABLE 1
    … …  
    5253    };
    5354
    54     virtual void setStandardFontFamily(const WebString&) = 0;
    55     virtual void setFixedFontFamily(const WebString&) = 0;
    56     virtual void setSerifFontFamily(const WebString&) = 0;
    57     virtual void setSansSerifFontFamily(const WebString&) = 0;
    58     virtual void setCursiveFontFamily(const WebString&) = 0;
    59     virtual void setFantasyFontFamily(const WebString&) = 0;
     55    virtual void setStandardFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
     56    virtual void setFixedFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
     57    virtual void setSerifFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
     58    virtual void setSansSerifFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
     59    virtual void setCursiveFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
     60    virtual void setFantasyFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
    6061    virtual void setDefaultFontSize(int) = 0;
    6162    virtual void setDefaultFixedFontSize(int) = 0;

  • trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp

    r93577 r93618  
    5555}
    5656
    57 void WebSettingsImpl::setStandardFontFamily(const WebString& font)
    58 {
    59     m_settings->setStandardFontFamily(font);
    60 }
    61 
    62 void WebSettingsImpl::setFixedFontFamily(const WebString& font)
    63 {
    64     m_settings->setFixedFontFamily((String)font);
    65 }
    66 
    67 void WebSettingsImpl::setSerifFontFamily(const WebString& font)
    68 {
    69     m_settings->setSerifFontFamily((String)font);
    70 }
    71 
    72 void WebSettingsImpl::setSansSerifFontFamily(const WebString& font)
    73 {
    74     m_settings->setSansSerifFontFamily((String)font);
    75 }
    76 
    77 void WebSettingsImpl::setCursiveFontFamily(const WebString& font)
    78 {
    79     m_settings->setCursiveFontFamily((String)font);
    80 }
    81 
    82 void WebSettingsImpl::setFantasyFontFamily(const WebString& font)
    83 {
    84     m_settings->setFantasyFontFamily((String)font);
     57void WebSettingsImpl::setStandardFontFamily(const WebString& font, UScriptCode script)
     58{
     59    m_settings->setStandardFontFamily(font, script);
     60}
     61
     62void WebSettingsImpl::setFixedFontFamily(const WebString& font, UScriptCode script)
     63{
     64    m_settings->setFixedFontFamily(font, script);
     65}
     66
     67void WebSettingsImpl::setSerifFontFamily(const WebString& font, UScriptCode script)
     68{
     69    m_settings->setSerifFontFamily(font, script);
     70}
     71
     72void WebSettingsImpl::setSansSerifFontFamily(const WebString& font, UScriptCode script)
     73{
     74    m_settings->setSansSerifFontFamily(font, script);
     75}
     76
     77void WebSettingsImpl::setCursiveFontFamily(const WebString& font, UScriptCode script)
     78{
     79    m_settings->setCursiveFontFamily(font, script);
     80}
     81
     82void WebSettingsImpl::setFantasyFontFamily(const WebString& font, UScriptCode script)
     83{
     84    m_settings->setFantasyFontFamily(font, script);
    8585}
    8686

  • trunk/Source/WebKit/chromium/src/WebSettingsImpl.h

    r93577 r93618  
    4545    virtual ~WebSettingsImpl() { }
    4646
    47     virtual void setStandardFontFamily(const WebString&);
    48     virtual void setFixedFontFamily(const WebString&);
    49     virtual void setSerifFontFamily(const WebString&);
    50     virtual void setSansSerifFontFamily(const WebString&);
    51     virtual void setCursiveFontFamily(const WebString&);
    52     virtual void setFantasyFontFamily(const WebString&);
     47    virtual void setStandardFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON);
     48    virtual void setFixedFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON);
     49    virtual void setSerifFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON);
     50    virtual void setSansSerifFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON);
     51    virtual void setCursiveFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON);
     52    virtual void setFantasyFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON);
    5353    virtual void setDefaultFontSize(int);
    5454    virtual void setDefaultFixedFontSize(int);
Note: See TracChangeset for help on using the changeset viewer.