Diff
Modified: trunk/ChangeLog (149637 => 149638)
--- trunk/ChangeLog 2013-05-06 20:48:36 UTC (rev 149637)
+++ trunk/ChangeLog 2013-05-06 20:56:10 UTC (rev 149638)
@@ -1,3 +1,14 @@
+2013-05-06 Mike Lattanzio <[email protected]>
+
+ [BlackBerry] Enable and Expose Text Autosizing through BlackBerry::WebKit::WebSettings
+ https://bugs.webkit.org/show_bug.cgi?id=113808
+
+ Reviewed by Rob Buis.
+
+ Set the ENABLE_TEXT_AUTOSIZING default to ON for BlackBerry.
+
+ * Source/cmake/OptionsBlackBerry.cmake:
+
2013-05-06 Christophe Dumez <[email protected]>
[EFL] Shadow DOM should be disabled at compile time
Modified: trunk/Source/WebCore/ChangeLog (149637 => 149638)
--- trunk/Source/WebCore/ChangeLog 2013-05-06 20:48:36 UTC (rev 149637)
+++ trunk/Source/WebCore/ChangeLog 2013-05-06 20:56:10 UTC (rev 149638)
@@ -1,3 +1,14 @@
+2013-05-06 Mike Lattanzio <[email protected]>
+
+ [BlackBerry] Enable and Expose Text Autosizing through BlackBerry::WebKit::WebSettings
+ https://bugs.webkit.org/show_bug.cgi?id=113808
+
+ Reviewed by Rob Buis.
+
+ Added TextAutosizer.cpp to the BlackBerry build.
+
+ * PlatformBlackBerry.cmake:
+
2013-05-06 Darin Adler <[email protected]>
Use OwnPtr instead of deleteAllValues in SVGAttributeToPropertyMap
Modified: trunk/Source/WebCore/PlatformBlackBerry.cmake (149637 => 149638)
--- trunk/Source/WebCore/PlatformBlackBerry.cmake 2013-05-06 20:48:36 UTC (rev 149637)
+++ trunk/Source/WebCore/PlatformBlackBerry.cmake 2013-05-06 20:56:10 UTC (rev 149638)
@@ -223,6 +223,12 @@
)
endif ()
+if (ENABLE_TEXT_AUTOSIZING)
+ list(APPEND WebCore_SOURCES
+ ${WEBCORE_DIR}/rendering/TextAutosizer.cpp
+ )
+endif ()
+
# To speed up linking when working on accel comp, you can move this whole chunk
# to Source/WebKit/blackberry/CMakeListsBlackBerry.txt.
# Append to WebKit_SOURCES instead of WebCore_SOURCES.
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (149637 => 149638)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-05-06 20:48:36 UTC (rev 149637)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-05-06 20:56:10 UTC (rev 149638)
@@ -5936,6 +5936,10 @@
updateBackgroundColor(webSettings->backgroundColor());
m_page->setDeviceScaleFactor(webSettings->devicePixelRatio());
+
+#if ENABLE(TEXT_AUTOSIZING)
+ coreSettings->setTextAutosizingEnabled(webSettings->isTextAutosizingEnabled());
+#endif
}
BlackBerry::Platform::String WebPage::textHasAttribute(const BlackBerry::Platform::String& query) const
Modified: trunk/Source/WebKit/blackberry/Api/WebSettings.cpp (149637 => 149638)
--- trunk/Source/WebKit/blackberry/Api/WebSettings.cpp 2013-05-06 20:48:36 UTC (rev 149637)
+++ trunk/Source/WebKit/blackberry/Api/WebSettings.cpp 2013-05-06 20:56:10 UTC (rev 149638)
@@ -96,6 +96,7 @@
DEFINE_STATIC_LOCAL(String, WebKitUserStyleSheetLocation, (ASCIILiteral("WebKitUserStyleSheetLocation")));
DEFINE_STATIC_LOCAL(String, WebKitWebSocketsEnabled, (ASCIILiteral("WebKitWebSocketsEnabled")));
DEFINE_STATIC_LOCAL(String, WebKitXSSAuditorEnabled, (ASCIILiteral("WebKitXSSAuditorEnabled")));
+DEFINE_STATIC_LOCAL(String, WebKitTextAutosizingEnabled, (ASCIILiteral("WebKitTextAutosizingEnabled")));
static HashSet<String>* s_supportedObjectMIMETypes;
@@ -200,6 +201,7 @@
settings->m_private->setInteger(WebKitMaximumPagesInCache, 0);
settings->m_private->setInteger(WebKitMinimumFontSize, 8);
settings->m_private->setBoolean(WebKitWebSocketsEnabled, true);
+ settings->m_private->setBoolean(WebKitTextAutosizingEnabled, false);
settings->m_private->setString(WebKitFixedFontFamily, BlackBerry::Platform::FontInfo::instance()->fontFamily("-webkit-monospace", ""));
settings->m_private->setString(WebKitSansSeriffFontFamily, BlackBerry::Platform::FontInfo::instance()->fontFamily("-webkit-sans-serif", ""));
@@ -843,5 +845,15 @@
m_private->setBoolean(BlackBerryApplyDeviceScaleFactorInCompositor, applyDeviceScaleFactorInCompositor);
}
+bool WebSettings::isTextAutosizingEnabled() const
+{
+ return m_private->getBoolean(WebKitTextAutosizingEnabled);
+}
+
+void WebSettings::setTextAutosizingEnabled(bool textAutosizingEnabled)
+{
+ m_private->setBoolean(WebKitTextAutosizingEnabled, textAutosizingEnabled);
+}
+
} // namespace WebKit
} // namespace BlackBerry
Modified: trunk/Source/WebKit/blackberry/Api/WebSettings.h (149637 => 149638)
--- trunk/Source/WebKit/blackberry/Api/WebSettings.h 2013-05-06 20:48:36 UTC (rev 149637)
+++ trunk/Source/WebKit/blackberry/Api/WebSettings.h 2013-05-06 20:56:10 UTC (rev 149638)
@@ -244,6 +244,9 @@
bool applyDeviceScaleFactorInCompositor() const;
void setApplyDeviceScaleFactorInCompositor(bool);
+ bool isTextAutosizingEnabled() const;
+ void setTextAutosizingEnabled(bool);
+
private:
WebSettingsPrivate* m_private;
WebSettings();
Modified: trunk/Source/WebKit/blackberry/ChangeLog (149637 => 149638)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-05-06 20:48:36 UTC (rev 149637)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-05-06 20:56:10 UTC (rev 149638)
@@ -1,3 +1,21 @@
+2013-05-06 Mike Lattanzio <[email protected]>
+
+ [BlackBerry] Enable and Expose Text Autosizing through BlackBerry::WebKit::WebSettings
+ https://bugs.webkit.org/show_bug.cgi?id=113808
+
+ Reviewed by Rob Buis.
+
+ Create a WebSetting for text autosizing. The default is off.
+
+ * Api/WebPage.cpp:
+ (BlackBerry::WebKit::WebPagePrivate::didChangeSettings):
+ * Api/WebSettings.cpp:
+ (WebKit):
+ (BlackBerry::WebKit::WebSettings::standardSettings):
+ (BlackBerry::WebKit::WebSettings::isTextAutosizingEnabled):
+ (BlackBerry::WebKit::WebSettings::setTextAutosizingEnabled):
+ * Api/WebSettings.h:
+
2013-05-06 Nima Ghanavatian <[email protected]>
[BlackBerry] Ensure document is attached before accessing its FrameSelection
Modified: trunk/Source/cmake/OptionsBlackBerry.cmake (149637 => 149638)
--- trunk/Source/cmake/OptionsBlackBerry.cmake 2013-05-06 20:48:36 UTC (rev 149637)
+++ trunk/Source/cmake/OptionsBlackBerry.cmake 2013-05-06 20:56:10 UTC (rev 149638)
@@ -190,6 +190,7 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHARED_WORKERS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SMOOTH_SCROLLING ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_STYLE_SCOPED ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TEXT_AUTOSIZING ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_SLIDER ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIBRATION ON)
Modified: trunk/Tools/ChangeLog (149637 => 149638)
--- trunk/Tools/ChangeLog 2013-05-06 20:48:36 UTC (rev 149637)
+++ trunk/Tools/ChangeLog 2013-05-06 20:56:10 UTC (rev 149638)
@@ -1,3 +1,15 @@
+2013-05-06 Mike Lattanzio <[email protected]>
+
+ [BlackBerry] Enable and Expose Text Autosizing through BlackBerry::WebKit::WebSettings
+ https://bugs.webkit.org/show_bug.cgi?id=113808
+
+ Reviewed by Rob Buis.
+
+ Modify FeatureList.pm and set ENABLE_TEXT_AUTOSIZING to default
+ to true for BlackBerry.
+
+ * Scripts/webkitperl/FeatureList.pm:
+
2013-05-06 Jessie Berlin <[email protected]>
check-webkit-style should complain about a layering violation if platform-specific guards are
Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (149637 => 149638)
--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2013-05-06 20:48:36 UTC (rev 149637)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2013-05-06 20:56:10 UTC (rev 149638)
@@ -437,7 +437,7 @@
define => "ENABLE_TEMPLATE_ELEMENT", default => (isEfl() || isGtk()), value => \$templateElementSupport },
{ option => "text-autosizing", desc => "Toggle Text Autosizing support",
- define => "ENABLE_TEXT_AUTOSIZING", default => 0, value => \$textAutosizingSupport },
+ define => "ENABLE_TEXT_AUTOSIZING", default => isBlackBerry(), value => \$textAutosizingSupport },
{ option => "tiled-backing-store", desc => "Toggle Tiled Backing Store support",
define => "WTF_USE_TILED_BACKING_STORE", default => (isQt() || isEfl()), value => \$tiledBackingStoreSupport },
