diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-18 14:03:11 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-18 14:03:11 +0200 |
commit | 8d473cf9743f1d30a16a27114e93bd5af5648d23 (patch) | |
tree | cdca40d0353886b3ca52f33a2d7b8f1c0011aafc /Source/WebKit/blackberry/Api/WebSettings.cpp | |
parent | 1b914638db989aaa98631a1c1e02c7b2d44805d8 (diff) | |
download | qtwebkit-8d473cf9743f1d30a16a27114e93bd5af5648d23.tar.gz |
Imported WebKit commit 1350e72f7345ced9da2bd9980deeeb5a8d62fab4 (http://svn.webkit.org/repository/webkit/trunk@117578)
Weekly snapshot
Diffstat (limited to 'Source/WebKit/blackberry/Api/WebSettings.cpp')
-rw-r--r-- | Source/WebKit/blackberry/Api/WebSettings.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Source/WebKit/blackberry/Api/WebSettings.cpp b/Source/WebKit/blackberry/Api/WebSettings.cpp index a9967e9ad..396e9a668 100644 --- a/Source/WebKit/blackberry/Api/WebSettings.cpp +++ b/Source/WebKit/blackberry/Api/WebSettings.cpp @@ -54,6 +54,7 @@ DEFINE_STATIC_LOCAL(String, BlackBerryUserAgentString, ("BlackBerryUserAgentStri DEFINE_STATIC_LOCAL(String, BlackBerryUserScalableEnabled, ("BlackBerryUserScalableEnabled")); DEFINE_STATIC_LOCAL(String, BlackBerryViewportWidth, ("BlackBerryViewportWidth")); DEFINE_STATIC_LOCAL(String, BlackBerryZoomToFitOnLoadEnabled, ("BlackBerryZoomToFitOnLoadEnabled")); +DEFINE_STATIC_LOCAL(String, BlackBerryFullScreenVideoCapable, ("BlackBerryFullScreenVideoCapable")); DEFINE_STATIC_LOCAL(String, SpatialNavigationEnabled, ("SpatialNavigationEnabled")); DEFINE_STATIC_LOCAL(String, WebKitDatabasePath, ("WebKitDatabasePath")); DEFINE_STATIC_LOCAL(String, WebKitDatabasesEnabled, ("WebKitDatabasesEnabled")); @@ -162,21 +163,18 @@ WebSettings* WebSettings::standardSettings() settings->m_private->setBoolean(BlackBerryUseWebKitCache, true); settings->m_private->setBoolean(BlackBerryUserScalableEnabled, true); settings->m_private->setBoolean(BlackBerryZoomToFitOnLoadEnabled, true); + settings->m_private->setBoolean(BlackBerryFullScreenVideoCapable, false); settings->m_private->setInteger(WebKitDefaultFontSize, 16); settings->m_private->setInteger(WebKitDefaultFixedFontSize, 13); settings->m_private->setString(WebKitDefaultTextEncodingName, "iso-8859-1"); settings->m_private->setBoolean(WebKitDownloadableBinaryFontsEnabled, true); settings->m_private->setInteger(WebKitFirstScheduledLayoutDelay, 250); // Match Document::cLayoutScheduleThreshold. - settings->m_private->setString(WebKitFixedFontFamily, "Courier New"); settings->m_private->setBoolean(WebKitJavaScriptEnabled, true); settings->m_private->setBoolean(WebKitLoadsImagesAutomatically, true); settings->m_private->setUnsignedLongLong(WebKitLocalStorageQuota, 5 * 1024 * 1024); settings->m_private->setInteger(WebKitMaximumPagesInCache, 0); settings->m_private->setInteger(WebKitMinimumFontSize, 8); - settings->m_private->setString(WebKitSansSeriffFontFamily, "Arial"); - settings->m_private->setString(WebKitSeriffFontFamily, "Times New Roman"); - settings->m_private->setString(WebKitStandardFontFamily, "Times New Roman"); settings->m_private->setBoolean(WebKitWebSocketsEnabled, true); return settings; @@ -753,5 +751,15 @@ void WebSettings::setSpatialNavigationEnabled(bool enable) m_private->setBoolean(SpatialNavigationEnabled, enable); } +bool WebSettings::fullScreenVideoCapable() const +{ + return m_private->getBoolean(BlackBerryFullScreenVideoCapable); +} + +void WebSettings::setFullScreenVideoCapable(bool enable) +{ + m_private->setBoolean(BlackBerryFullScreenVideoCapable, enable); +} + } // namespace WebKit } // namespace BlackBerry |