- Revision
- 135702
- Author
- [email protected]
- Date
- 2012-11-26 03:16:09 -0800 (Mon, 26 Nov 2012)
Log Message
Text Autosizing: Add Text Autosizing APIs for WK2
https://bugs.webkit.org/show_bug.cgi?id=100633
Patch by Jaehun Lim <[email protected]> on 2012-11-26
Reviewed by Sam Weinig.
Source/WebKit2:
Implement basic Text Autosizing APIs for WK2.
Text Autosizing is a useful feature for mobile browsers. It adjusts the font size
of text in wide columns, and makes text more legible.
This patch adds setting APIs for Text Autosizing in WK2.
* Shared/WebPreferencesStore.h:
(WebKit):
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetTextAutosizingEnabled):
(WKPreferencesGetTextAutosizingEnabled):
* UIProcess/API/C/WKPreferences.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):
Tools:
Add test cases for Text Autosizing in WKPreferences.
* TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp:
(TestWebKitAPI::TEST):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (135701 => 135702)
--- trunk/Source/WebKit2/ChangeLog 2012-11-26 11:06:55 UTC (rev 135701)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-26 11:16:09 UTC (rev 135702)
@@ -1,3 +1,24 @@
+2012-11-26 Jaehun Lim <[email protected]>
+
+ Text Autosizing: Add Text Autosizing APIs for WK2
+ https://bugs.webkit.org/show_bug.cgi?id=100633
+
+ Reviewed by Sam Weinig.
+
+ Implement basic Text Autosizing APIs for WK2.
+ Text Autosizing is a useful feature for mobile browsers. It adjusts the font size
+ of text in wide columns, and makes text more legible.
+ This patch adds setting APIs for Text Autosizing in WK2.
+
+ * Shared/WebPreferencesStore.h:
+ (WebKit):
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetTextAutosizingEnabled):
+ (WKPreferencesGetTextAutosizingEnabled):
+ * UIProcess/API/C/WKPreferences.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
2012-11-26 Pierre Rossi <[email protected]>
[Qt] REGRESSION(r135575): It made all tests assert
Modified: trunk/Source/WebKit2/Shared/WebPreferencesStore.h (135701 => 135702)
--- trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2012-11-26 11:06:55 UTC (rev 135701)
+++ trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2012-11-26 11:16:09 UTC (rev 135702)
@@ -139,6 +139,7 @@
macro(PlugInSnapshottingEnabled, plugInSnapshottingEnabled, Bool, bool, false) \
macro(PDFPluginEnabled, pdfPluginEnabled, Bool, bool, false) \
macro(UsesEncodingDetector, usesEncodingDetector, Bool, bool, false) \
+ macro(TextAutosizingEnabled, textAutosizingEnabled, Bool, bool, false) \
\
#define FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (135701 => 135702)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2012-11-26 11:06:55 UTC (rev 135701)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2012-11-26 11:16:09 UTC (rev 135702)
@@ -953,3 +953,14 @@
{
return toImpl(preferencesRef)->usesEncodingDetector();
}
+
+void WKPreferencesSetTextAutosizingEnabled(WKPreferencesRef preferencesRef, bool textAutosizingEnabled)
+{
+ toImpl(preferencesRef)->setTextAutosizingEnabled(textAutosizingEnabled);
+}
+
+bool WKPreferencesGetTextAutosizingEnabled(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->textAutosizingEnabled();
+}
+
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.h (135701 => 135702)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.h 2012-11-26 11:06:55 UTC (rev 135701)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.h 2012-11-26 11:16:09 UTC (rev 135702)
@@ -224,6 +224,10 @@
WK_EXPORT void WKPreferencesSetEncodingDetectorEnabled(WKPreferencesRef preferencesRef, bool enabled);
WK_EXPORT bool WKPreferencesGetEncodingDetectorEnabled(WKPreferencesRef preferencesRef);
+// Defaults to false.
+WK_EXPORT void WKPreferencesSetTextAutosizingEnabled(WKPreferencesRef preferences, bool textAutosizingEnabled);
+WK_EXPORT bool WKPreferencesGetTextAutosizingEnabled(WKPreferencesRef preferences);
+
#ifdef __cplusplus
}
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (135701 => 135702)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-11-26 11:06:55 UTC (rev 135701)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-11-26 11:16:09 UTC (rev 135702)
@@ -2293,6 +2293,10 @@
settings->setPlugInSnapshottingEnabled(store.getBoolValueForKey(WebPreferencesKey::plugInSnapshottingEnabledKey()));
settings->setUsesEncodingDetector(store.getBoolValueForKey(WebPreferencesKey::usesEncodingDetectorKey()));
+#if ENABLE(TEXT_AUTOSIZING)
+ settings->setTextAutosizingEnabled(store.getBoolValueForKey(WebPreferencesKey::textAutosizingEnabledKey()));
+#endif
+
platformPreferencesDidChange(store);
if (m_drawingArea)
Modified: trunk/Tools/ChangeLog (135701 => 135702)
--- trunk/Tools/ChangeLog 2012-11-26 11:06:55 UTC (rev 135701)
+++ trunk/Tools/ChangeLog 2012-11-26 11:16:09 UTC (rev 135702)
@@ -1,3 +1,15 @@
+2012-11-26 Jaehun Lim <[email protected]>
+
+ Text Autosizing: Add Text Autosizing APIs for WK2
+ https://bugs.webkit.org/show_bug.cgi?id=100633
+
+ Reviewed by Sam Weinig.
+
+ Add test cases for Text Autosizing in WKPreferences.
+
+ * TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp:
+ (TestWebKitAPI::TEST):
+
2012-11-26 Pierre Rossi <[email protected]>
[Qt] REGRESSION(r135575): It made all tests assert
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp (135701 => 135702)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp 2012-11-26 11:06:55 UTC (rev 135701)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp 2012-11-26 11:16:09 UTC (rev 135702)
@@ -102,6 +102,7 @@
EXPECT_FALSE(WKPreferencesGetCompositingRepaintCountersVisible(preference));
EXPECT_FALSE(WKPreferencesGetNeedsSiteSpecificQuirks(preference));
EXPECT_EQ(kWKAllowAllStorage, WKPreferencesGetStorageBlockingPolicy(preference));
+ EXPECT_FALSE(WKPreferencesGetTextAutosizingEnabled(preference));
WKRelease(preference);
}
