Diff
Modified: trunk/Source/WTF/ChangeLog (120986 => 120987)
--- trunk/Source/WTF/ChangeLog 2012-06-22 00:53:48 UTC (rev 120986)
+++ trunk/Source/WTF/ChangeLog 2012-06-22 01:18:31 UTC (rev 120987)
@@ -1,3 +1,15 @@
+2012-06-21 Parth Patel <[email protected]>
+
+ [Blackberry] BlackBerry::Platform::Settings::get() rename to BlackBerry::Platform::Settings::instance() to make it consistent with our other singletons
+ https://bugs.webkit.org/show_bug.cgi?id=89684
+
+ Reviewed by Yong Li.
+
+ Update setting instance access to use instance() instead of get().
+
+ * wtf/ThreadingPthreads.cpp:
+ (WTF::createThreadInternal):
+
2012-06-21 Kalev Lember <[email protected]>
[GTK] Fix NPAPI plugins on Windows
Modified: trunk/Source/WTF/wtf/ThreadingPthreads.cpp (120986 => 120987)
--- trunk/Source/WTF/wtf/ThreadingPthreads.cpp 2012-06-22 00:53:48 UTC (rev 120986)
+++ trunk/Source/WTF/wtf/ThreadingPthreads.cpp 2012-06-22 01:18:31 UTC (rev 120987)
@@ -178,7 +178,7 @@
if (pthread_attr_getstack(&attr, &stackAddr, &stackSize))
LOG_ERROR("pthread_attr_getstack() failed: %d", errno);
else {
- stackSize = BlackBerry::Platform::Settings::get()->secondaryThreadStackSize();
+ stackSize = BlackBerry::Platform::Settings::instance()->secondaryThreadStackSize();
if (pthread_attr_setstack(&attr, stackAddr, stackSize))
LOG_ERROR("pthread_attr_getstack() failed: %d", errno);
}
Modified: trunk/Source/WebKit/blackberry/Api/BlackBerryGlobal.cpp (120986 => 120987)
--- trunk/Source/WebKit/blackberry/Api/BlackBerryGlobal.cpp 2012-06-22 00:53:48 UTC (rev 120986)
+++ trunk/Source/WebKit/blackberry/Api/BlackBerryGlobal.cpp 2012-06-22 01:18:31 UTC (rev 120987)
@@ -75,7 +75,7 @@
CacheClientBlackBerry::get()->initialize();
- BlackBerry::Platform::Settings* settings = BlackBerry::Platform::Settings::get();
+ BlackBerry::Platform::Settings* settings = BlackBerry::Platform::Settings::instance();
ImageSource::setMaxPixelsPerDecodedImage(settings->maxPixelsPerDecodedImage());
}
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (120986 => 120987)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-06-22 00:53:48 UTC (rev 120986)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-06-22 01:18:31 UTC (rev 120987)
@@ -549,7 +549,7 @@
m_mainFrame->init();
#if ENABLE(WEBGL)
- Platform::Settings* settings = Platform::Settings::get();
+ Platform::Settings* settings = Platform::Settings::instance();
m_page->settings()->setWebGLEnabled(settings && settings->isWebGLSupported());
#endif
#if ENABLE(ACCELERATED_2D_CANVAS)
@@ -1335,7 +1335,7 @@
// NOTE: Care must be exercised in the use of this option, as it bypasses
// the sanity provided in 'isLoadingInAPISense()' below.
//
- static const bool unrestrictedResizeEvents = Platform::Settings::get()->unrestrictedResizeEvents();
+ static const bool unrestrictedResizeEvents = Platform::Settings::instance()->unrestrictedResizeEvents();
if (unrestrictedResizeEvents)
return true;
Modified: trunk/Source/WebKit/blackberry/ChangeLog (120986 => 120987)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-06-22 00:53:48 UTC (rev 120986)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-06-22 01:18:31 UTC (rev 120987)
@@ -1,3 +1,30 @@
+2012-06-21 Parth Patel <[email protected]>
+
+ [Blackberry] BlackBerry::Platform::Settings::get() rename to BlackBerry::Platform::Settings::instance() to make it consistent with our other singletons
+ https://bugs.webkit.org/show_bug.cgi?id=89684
+
+ Reviewed by Yong Li.
+
+ Update setting instance access to use instance() instead of get().
+
+ * Api/BlackBerryGlobal.cpp:
+ (BlackBerry::WebKit::globalInitialize):
+ * Api/WebPage.cpp:
+ (BlackBerry::WebKit::WebPagePrivate::init):
+ (BlackBerry::WebKit::WebPagePrivate::shouldSendResizeEvent):
+ * WebCoreSupport/AboutData.cpp:
+ (WebCore::configPage):
+ * WebCoreSupport/CacheClientBlackBerry.cpp:
+ (WebCore::CacheClientBlackBerry::updateCacheCapacity):
+ * WebKitSupport/FatFingers.cpp:
+ (BlackBerry::WebKit::FatFingers::getPaddings):
+ * WebKitSupport/InputHandler.cpp:
+ (BlackBerry::WebKit::InputHandler::isInputModeEnabled):
+ (BlackBerry::WebKit::InputHandler::setInputModeEnabled):
+ (BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):
+ * WebKitSupport/SurfacePool.cpp:
+ (BlackBerry::WebKit::SurfacePool::initialize):
+
2012-06-21 Genevieve Mak <[email protected]>
Add a parameter to handletTouchPoint to bypass FatFingers
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/AboutData.cpp (120986 => 120987)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/AboutData.cpp 2012-06-22 00:53:48 UTC (rev 120986)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/AboutData.cpp 2012-06-22 01:18:31 UTC (rev 120987)
@@ -99,7 +99,7 @@
#endif
+ "</td></tr>";
- BlackBerry::Platform::Settings* settings = BlackBerry::Platform::Settings::get();
+ BlackBerry::Platform::Settings* settings = BlackBerry::Platform::Settings::instance();
page += String("</table><h2>Platform Settings</h2><table>");
page += numberToHTMLTr("isRSSFilteringEnabled", settings->isRSSFilteringEnabled());
page += numberToHTMLTr("secondaryThreadStackSize", settings->secondaryThreadStackSize());
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/CacheClientBlackBerry.cpp (120986 => 120987)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/CacheClientBlackBerry.cpp 2012-06-22 00:53:48 UTC (rev 120986)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/CacheClientBlackBerry.cpp 2012-06-22 01:18:31 UTC (rev 120987)
@@ -56,7 +56,7 @@
#if ENABLE(BLACKBERRY_DEBUG_MEMORY)
// We're debugging memory usage. So keep it disabled.
#else
- unsigned cacheCapacity = BlackBerry::Platform::Settings::get()->getSuggestedCacheCapacity(memoryCache()->totalSize());
+ unsigned cacheCapacity = BlackBerry::Platform::Settings::instance()->getSuggestedCacheCapacity(memoryCache()->totalSize());
if (m_lastCapacity == cacheCapacity) {
// Suggested capacity hasn't been changed.
return;
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/FatFingers.cpp (120986 => 120987)
--- trunk/Source/WebKit/blackberry/WebKitSupport/FatFingers.cpp 2012-06-22 00:53:48 UTC (rev 120986)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/FatFingers.cpp 2012-06-22 01:18:31 UTC (rev 120987)
@@ -450,10 +450,10 @@
void FatFingers::getPaddings(unsigned& top, unsigned& right, unsigned& bottom, unsigned& left) const
{
- static unsigned topPadding = Platform::Settings::get()->topFatFingerPadding();
- static unsigned rightPadding = Platform::Settings::get()->rightFatFingerPadding();
- static unsigned bottomPadding = Platform::Settings::get()->bottomFatFingerPadding();
- static unsigned leftPadding = Platform::Settings::get()->leftFatFingerPadding();
+ static unsigned topPadding = Platform::Settings::instance()->topFatFingerPadding();
+ static unsigned rightPadding = Platform::Settings::instance()->rightFatFingerPadding();
+ static unsigned bottomPadding = Platform::Settings::instance()->bottomFatFingerPadding();
+ static unsigned leftPadding = Platform::Settings::instance()->leftFatFingerPadding();
double currentScale = m_webPage->currentScale();
top = topPadding / currentScale;
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (120986 => 120987)
--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp 2012-06-22 00:53:48 UTC (rev 120986)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp 2012-06-22 01:18:31 UTC (rev 120987)
@@ -435,14 +435,14 @@
bool InputHandler::isInputModeEnabled() const
{
// Input mode is enabled when set, or when dump render tree or always show keyboard setting is enabled.
- return m_inputModeEnabled || m_webPage->m_dumpRenderTree || Platform::Settings::get()->alwaysShowKeyboardOnFocus();
+ return m_inputModeEnabled || m_webPage->m_dumpRenderTree || Platform::Settings::intsance()->alwaysShowKeyboardOnFocus();
}
void InputHandler::setInputModeEnabled(bool active)
{
FocusLog(LogLevelInfo, "InputHandler::setInputModeEnabled '%s', override is '%s'"
, active ? "true" : "false"
- , m_webPage->m_dumpRenderTree || Platform::Settings::get()->alwaysShowKeyboardOnFocus() ? "true" : "false");
+ , m_webPage->m_dumpRenderTree || Platform::Settings::instance()->alwaysShowKeyboardOnFocus() ? "true" : "false");
m_inputModeEnabled = active;
@@ -556,7 +556,7 @@
if (!isActiveTextEdit() || !isInputModeEnabled() || !m_currentFocusElement->document())
return;
- if (!Platform::Settings::get()->allowCenterScrollAdjustmentForInputFields() && scrollType != EdgeIfNeeded)
+ if (!Platform::Settings::instance()->allowCenterScrollAdjustmentForInputFields() && scrollType != EdgeIfNeeded)
return;
Frame* elementFrame = m_currentFocusElement->document()->frame();
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SurfacePool.cpp (120986 => 120987)
--- trunk/Source/WebKit/blackberry/WebKitSupport/SurfacePool.cpp 2012-06-22 00:53:48 UTC (rev 120986)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SurfacePool.cpp 2012-06-22 01:18:31 UTC (rev 120987)
@@ -69,8 +69,8 @@
return;
m_initialized = true;
- const unsigned numberOfTiles = BlackBerry::Platform::Settings::get()->numberOfBackingStoreTiles();
- const unsigned maxNumberOfTiles = BlackBerry::Platform::Settings::get()->maximumNumberOfBackingStoreTilesAcrossProcesses();
+ const unsigned numberOfTiles = BlackBerry::Platform::Settings::instance()->numberOfBackingStoreTiles();
+ const unsigned maxNumberOfTiles = BlackBerry::Platform::Settings::instance()->maximumNumberOfBackingStoreTilesAcrossProcesses();
if (numberOfTiles) { // Only allocate if we actually use a backingstore.
unsigned byteLimit = (maxNumberOfTiles /*pool*/ + 2 /*visible tile buffer, backbuffer*/) * tileSize.width() * tileSize.height() * 4;
