Skip to content
Permalink
Browse files
Unreviewed, rolling out r93575.
http://trac.webkit.org/changeset/93575
https://bugs.webkit.org/show_bug.cgi?id=66744

Does not compile on chromium canaries (Requested by jamesr on
#webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2011-08-22

* 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:

Canonical link: https://commits.webkit.org/82554@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@93577 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
WebKit Review Bot authored and webkit-commit-queue committed Aug 23, 2011
1 parent 3846d35 commit d97ff9d3626ada510296ba3596214ffcbfc857c3
Showing 4 changed files with 43 additions and 30 deletions.
@@ -1,3 +1,22 @@
2011-08-22 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r93575.
http://trac.webkit.org/changeset/93575
https://bugs.webkit.org/show_bug.cgi?id=66744

Does not compile on chromium canaries (Requested by jamesr on
#webkit).

* 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:

2011-08-22 Matt Falkenhagen <falken@chromium.org>

[chromium] Update WebSettings to support per-script font settings
@@ -32,12 +32,6 @@
#define WebSettings_h

#include "WebCommon.h"
#if WEBKIT_IMPLEMENTATION
#include <wtf/unicode/Unicode.h>
#else
#include <unicode/uchar.h>
#include <unicode/uscript.h>
#endif

#define HAS_WEBAUDIO_FEATURE_ENABLE 1

@@ -57,12 +51,12 @@ class WebSettings {
EditingBehaviorUnix
};

virtual void setStandardFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
virtual void setFixedFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
virtual void setSerifFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
virtual void setSansSerifFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
virtual void setCursiveFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
virtual void setFantasyFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
virtual void setStandardFontFamily(const WebString&) = 0;
virtual void setFixedFontFamily(const WebString&) = 0;
virtual void setSerifFontFamily(const WebString&) = 0;
virtual void setSansSerifFontFamily(const WebString&) = 0;
virtual void setCursiveFontFamily(const WebString&) = 0;
virtual void setFantasyFontFamily(const WebString&) = 0;
virtual void setDefaultFontSize(int) = 0;
virtual void setDefaultFixedFontSize(int) = 0;
virtual void setMinimumFontSize(int) = 0;
@@ -54,34 +54,34 @@ WebSettingsImpl::WebSettingsImpl(Settings* settings)
ASSERT(settings);
}

void WebSettingsImpl::setStandardFontFamily(const WebString& font, UScriptCode script)
void WebSettingsImpl::setStandardFontFamily(const WebString& font)
{
m_settings->setStandardFontFamily(font, script);
m_settings->setStandardFontFamily(font);
}

void WebSettingsImpl::setFixedFontFamily(const WebString& font, UScriptCode script)
void WebSettingsImpl::setFixedFontFamily(const WebString& font)
{
m_settings->setFixedFontFamily(font, script);
m_settings->setFixedFontFamily((String)font);
}

void WebSettingsImpl::setSerifFontFamily(const WebString& font, UScriptCode script)
void WebSettingsImpl::setSerifFontFamily(const WebString& font)
{
m_settings->setSerifFontFamily(font, script);
m_settings->setSerifFontFamily((String)font);
}

void WebSettingsImpl::setSansSerifFontFamily(const WebString& font, UScriptCode script)
void WebSettingsImpl::setSansSerifFontFamily(const WebString& font)
{
m_settings->setSansSerifFontFamily(font, script);
m_settings->setSansSerifFontFamily((String)font);
}

void WebSettingsImpl::setCursiveFontFamily(const WebString& font, UScriptCode script)
void WebSettingsImpl::setCursiveFontFamily(const WebString& font)
{
m_settings->setCursiveFontFamily(font, script);
m_settings->setCursiveFontFamily((String)font);
}

void WebSettingsImpl::setFantasyFontFamily(const WebString& font, UScriptCode script)
void WebSettingsImpl::setFantasyFontFamily(const WebString& font)
{
m_settings->setFantasyFontFamily(font, script);
m_settings->setFantasyFontFamily((String)font);
}

void WebSettingsImpl::setDefaultFontSize(int size)
@@ -44,12 +44,12 @@ class WebSettingsImpl : public WebSettings {
explicit WebSettingsImpl(WebCore::Settings*);
virtual ~WebSettingsImpl() { }

virtual void setStandardFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON);
virtual void setFixedFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON);
virtual void setSerifFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON);
virtual void setSansSerifFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON);
virtual void setCursiveFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON);
virtual void setFantasyFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON);
virtual void setStandardFontFamily(const WebString&);
virtual void setFixedFontFamily(const WebString&);
virtual void setSerifFontFamily(const WebString&);
virtual void setSansSerifFontFamily(const WebString&);
virtual void setCursiveFontFamily(const WebString&);
virtual void setFantasyFontFamily(const WebString&);
virtual void setDefaultFontSize(int);
virtual void setDefaultFixedFontSize(int);
virtual void setMinimumFontSize(int);

0 comments on commit d97ff9d

Please sign in to comment.