Changeset 93577 in webkit
- Timestamp:
- Aug 22, 2011 7:53:26 PM (13 years ago)
- Location:
- trunk/Source/WebKit/chromium
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/chromium/ChangeLog
r93575 r93577 1 2011-08-22 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r93575. 4 http://trac.webkit.org/changeset/93575 5 https://bugs.webkit.org/show_bug.cgi?id=66744 6 7 Does not compile on chromium canaries (Requested by jamesr on 8 #webkit). 9 10 * public/WebSettings.h: 11 * src/WebSettingsImpl.cpp: 12 (WebKit::WebSettingsImpl::setStandardFontFamily): 13 (WebKit::WebSettingsImpl::setFixedFontFamily): 14 (WebKit::WebSettingsImpl::setSerifFontFamily): 15 (WebKit::WebSettingsImpl::setSansSerifFontFamily): 16 (WebKit::WebSettingsImpl::setCursiveFontFamily): 17 (WebKit::WebSettingsImpl::setFantasyFontFamily): 18 * src/WebSettingsImpl.h: 19 1 20 2011-08-22 Matt Falkenhagen <falken@chromium.org> 2 21 -
trunk/Source/WebKit/chromium/public/WebSettings.h
r93575 r93577 33 33 34 34 #include "WebCommon.h" 35 #if WEBKIT_IMPLEMENTATION36 #include <wtf/unicode/Unicode.h>37 #else38 #include <unicode/uchar.h>39 #include <unicode/uscript.h>40 #endif41 35 42 36 #define HAS_WEBAUDIO_FEATURE_ENABLE 1 … … 58 52 }; 59 53 60 virtual void setStandardFontFamily(const WebString& , UScriptCode = USCRIPT_COMMON) = 0;61 virtual void setFixedFontFamily(const WebString& , UScriptCode = USCRIPT_COMMON) = 0;62 virtual void setSerifFontFamily(const WebString& , UScriptCode = USCRIPT_COMMON) = 0;63 virtual void setSansSerifFontFamily(const WebString& , UScriptCode = USCRIPT_COMMON) = 0;64 virtual void setCursiveFontFamily(const WebString& , UScriptCode = USCRIPT_COMMON) = 0;65 virtual void setFantasyFontFamily(const WebString& , UScriptCode = USCRIPT_COMMON) = 0;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; 66 60 virtual void setDefaultFontSize(int) = 0; 67 61 virtual void setDefaultFixedFontSize(int) = 0; -
trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp
r93575 r93577 55 55 } 56 56 57 void WebSettingsImpl::setStandardFontFamily(const WebString& font , UScriptCode script)58 { 59 m_settings->setStandardFontFamily(font , script);60 } 61 62 void WebSettingsImpl::setFixedFontFamily(const WebString& font , UScriptCode script)63 { 64 m_settings->setFixedFontFamily( font, script);65 } 66 67 void WebSettingsImpl::setSerifFontFamily(const WebString& font , UScriptCode script)68 { 69 m_settings->setSerifFontFamily( font, script);70 } 71 72 void WebSettingsImpl::setSansSerifFontFamily(const WebString& font , UScriptCode script)73 { 74 m_settings->setSansSerifFontFamily( font, script);75 } 76 77 void WebSettingsImpl::setCursiveFontFamily(const WebString& font , UScriptCode script)78 { 79 m_settings->setCursiveFontFamily( font, script);80 } 81 82 void WebSettingsImpl::setFantasyFontFamily(const WebString& font , UScriptCode script)83 { 84 m_settings->setFantasyFontFamily( font, script);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); 85 85 } 86 86 -
trunk/Source/WebKit/chromium/src/WebSettingsImpl.h
r93575 r93577 45 45 virtual ~WebSettingsImpl() { } 46 46 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);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&); 53 53 virtual void setDefaultFontSize(int); 54 54 virtual void setDefaultFixedFontSize(int);
Note: See TracChangeset
for help on using the changeset viewer.