[webkit-changes] [93577] trunk/Source/WebKit/chromium

Mon, 22 Aug 2011 19:53:32 -0700

Title: [93577] trunk/Source/WebKit/chromium
Revision
93577
Author
[email protected]
Date
2011-08-22 19:53:26 -0700 (Mon, 22 Aug 2011)

Log Message

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 <[email protected]> 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:

Modified Paths

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (93576 => 93577)


--- trunk/Source/WebKit/chromium/ChangeLog	2011-08-23 02:53:09 UTC (rev 93576)
+++ trunk/Source/WebKit/chromium/ChangeLog	2011-08-23 02:53:26 UTC (rev 93577)
@@ -1,3 +1,22 @@
+2011-08-22  Sheriff Bot  <[email protected]>
+
+        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  <[email protected]>
 
         [chromium] Update WebSettings to support per-script font settings

Modified: trunk/Source/WebKit/chromium/public/WebSettings.h (93576 => 93577)


--- trunk/Source/WebKit/chromium/public/WebSettings.h	2011-08-23 02:53:09 UTC (rev 93576)
+++ trunk/Source/WebKit/chromium/public/WebSettings.h	2011-08-23 02:53:26 UTC (rev 93577)
@@ -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 @@
         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;

Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp (93576 => 93577)


--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp	2011-08-23 02:53:09 UTC (rev 93576)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp	2011-08-23 02:53:26 UTC (rev 93577)
@@ -54,34 +54,34 @@
     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)

Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.h (93576 => 93577)


--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.h	2011-08-23 02:53:09 UTC (rev 93576)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.h	2011-08-23 02:53:26 UTC (rev 93577)
@@ -44,12 +44,12 @@
     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);

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to