- Revision
- 151491
- Author
- [email protected]
- Date
- 2013-06-12 01:45:44 -0700 (Wed, 12 Jun 2013)
Log Message
Remove memoryInfoEnabled, quantizedMemoryInfoEnabled settings
https://bugs.webkit.org/show_bug.cgi?id=117512
Reviewed by Darin Adler.
Source/WebCore:
* page/Settings.in: Remove the memoryInfoEnabled and the quantizedMemoryInfoEnabled settings. These are not used
anywhere anymore after r151199 which simplified and moved the MemoryInfo interface under window.internals.
Source/WebKit/blackberry:
* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::init): Remove the call to Settings::setMemoryInfoEnabled, the setting is being removed.
Source/WebKit/mac:
* WebKit.order: Remove the memoryInfoEnabled entry.
* WebView/WebPreferenceKeysPrivate.h: Remove WebKitMemoryInfoEnabledPreferenceKey.
* WebView/WebPreferences.mm: Remove memoryInfoEnabled, setMemoryInfoEnabled methods.
(+[WebPreferences initialize]): Don't set the default value for the WebKitMemoryInfoEnabledPreferenceKey, the preference is being removed.
* WebView/WebPreferencesPrivate.h: Remove memoryInfoEnabled, setMemoryInfoEnabled method declarations.
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]): Remove the call to Settings::setMemoryInfoEnabled, the setting is being removed.
Source/WebKit/win:
* Interfaces/IWebPreferencesPrivate.idl: Remove memoryInfoEnabled, setMemoryInfoEnabled entries.
* WebPreferenceKeysPrivate.h: Remove the WebKitMemoryInfoEnabledPreferenceKey definition.
* WebPreferences.cpp: Remove the memoryInfo, setMemoryInfoEnabled methods.
(WebPreferences::initializeDefaultSettings): Remove the WebKitMemoryInfoEnabledPreferenceKey entry initialization.
* WebPreferences.h: Remove the memoryInfo, setMemoryInfoEnabled method declarations.
* WebView.cpp:
(WebView::notifyPreferencesChanged): Remove the Settings::setMemoryInfoEnabled call, the method is being removed.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (151490 => 151491)
--- trunk/Source/WebCore/ChangeLog 2013-06-12 08:36:39 UTC (rev 151490)
+++ trunk/Source/WebCore/ChangeLog 2013-06-12 08:45:44 UTC (rev 151491)
@@ -1,3 +1,13 @@
+2013-06-12 Zan Dobersek <[email protected]>
+
+ Remove memoryInfoEnabled, quantizedMemoryInfoEnabled settings
+ https://bugs.webkit.org/show_bug.cgi?id=117512
+
+ Reviewed by Darin Adler.
+
+ * page/Settings.in: Remove the memoryInfoEnabled and the quantizedMemoryInfoEnabled settings. These are not used
+ anywhere anymore after r151199 which simplified and moved the MemoryInfo interface under window.internals.
+
2013-06-12 Diego Pino Garcia <[email protected]>
[GTK] Parameter 'pseudoElement' from function 'webkit_dom_dom_window_get_computed_style' should be allowed to be NULL
Modified: trunk/Source/WebCore/page/Settings.in (151490 => 151491)
--- trunk/Source/WebCore/page/Settings.in 2013-06-12 08:36:39 UTC (rev 151490)
+++ trunk/Source/WebCore/page/Settings.in 2013-06-12 08:45:44 UTC (rev 151491)
@@ -118,8 +118,6 @@
paginateDuringLayoutEnabled initial=false
fullScreenEnabled initial=false, conditional=FULLSCREEN_API
asynchronousSpellCheckingEnabled initial=false
-memoryInfoEnabled initial=false
-quantizedMemoryInfoEnabled initial=false
# This feature requires an implementation of ValidationMessageClient.
interactiveFormValidationEnabled initial=false
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (151490 => 151491)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-06-12 08:36:39 UTC (rev 151490)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-06-12 08:45:44 UTC (rev 151491)
@@ -645,10 +645,6 @@
m_page->windowScreenDidChange((PlatformDisplayID)0);
#endif
-#if ENABLE(WEB_TIMING)
- m_page->settings()->setMemoryInfoEnabled(true);
-#endif
-
#if ENABLE(FILE_SYSTEM)
static bool localFileSystemInitialized = false;
if (!localFileSystemInitialized) {
Modified: trunk/Source/WebKit/blackberry/ChangeLog (151490 => 151491)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-06-12 08:36:39 UTC (rev 151490)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-06-12 08:45:44 UTC (rev 151491)
@@ -1,3 +1,13 @@
+2013-06-12 Zan Dobersek <[email protected]>
+
+ Remove memoryInfoEnabled, quantizedMemoryInfoEnabled settings
+ https://bugs.webkit.org/show_bug.cgi?id=117512
+
+ Reviewed by Darin Adler.
+
+ * Api/WebPage.cpp:
+ (BlackBerry::WebKit::WebPagePrivate::init): Remove the call to Settings::setMemoryInfoEnabled, the setting is being removed.
+
2013-06-06 Genevieve Mak <[email protected]>
[BlackBerry] Crash in InRegionScrollerPrivate::clearDocumentData
Modified: trunk/Source/WebKit/mac/ChangeLog (151490 => 151491)
--- trunk/Source/WebKit/mac/ChangeLog 2013-06-12 08:36:39 UTC (rev 151490)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-06-12 08:45:44 UTC (rev 151491)
@@ -1,3 +1,18 @@
+2013-06-12 Zan Dobersek <[email protected]>
+
+ Remove memoryInfoEnabled, quantizedMemoryInfoEnabled settings
+ https://bugs.webkit.org/show_bug.cgi?id=117512
+
+ Reviewed by Darin Adler.
+
+ * WebKit.order: Remove the memoryInfoEnabled entry.
+ * WebView/WebPreferenceKeysPrivate.h: Remove WebKitMemoryInfoEnabledPreferenceKey.
+ * WebView/WebPreferences.mm: Remove memoryInfoEnabled, setMemoryInfoEnabled methods.
+ (+[WebPreferences initialize]): Don't set the default value for the WebKitMemoryInfoEnabledPreferenceKey, the preference is being removed.
+ * WebView/WebPreferencesPrivate.h: Remove memoryInfoEnabled, setMemoryInfoEnabled method declarations.
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]): Remove the call to Settings::setMemoryInfoEnabled, the setting is being removed.
+
2013-06-06 Timothy Hatcher <[email protected]>
Update the framework bundle identifier for the Web Inspector.
Modified: trunk/Source/WebKit/mac/WebKit.order (151490 => 151491)
--- trunk/Source/WebKit/mac/WebKit.order 2013-06-12 08:36:39 UTC (rev 151490)
+++ trunk/Source/WebKit/mac/WebKit.order 2013-06-12 08:45:44 UTC (rev 151491)
@@ -418,7 +418,6 @@
-[WebPreferences(WebPrivate) paginateDuringLayoutEnabled]
-[WebPreferences(WebPrivate) fullScreenEnabled]
-[WebPreferences(WebPrivate) asynchronousSpellCheckingEnabled]
--[WebPreferences(WebPrivate) memoryInfoEnabled]
-[WebPreferences(WebPrivate) hyperlinkAuditingEnabled]
-[WebView(WebPrivate) _needsPreHTML5ParserQuirks]
-[WebPreferences(WebPrivate) usePreHTML5ParserQuirks]
Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (151490 => 151491)
--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2013-06-12 08:36:39 UTC (rev 151490)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2013-06-12 08:45:44 UTC (rev 151491)
@@ -110,7 +110,6 @@
#define WebKitDNSPrefetchingEnabledPreferenceKey @"WebKitDNSPrefetchingEnabled"
#define WebKitFullScreenEnabledPreferenceKey @"WebKitFullScreenEnabled"
#define WebKitAsynchronousSpellCheckingEnabledPreferenceKey @"WebKitAsynchronousSpellCheckingEnabled"
-#define WebKitMemoryInfoEnabledPreferenceKey @"WebKitMemoryInfoEnabled"
#define WebKitHyperlinkAuditingEnabledPreferenceKey @"WebKitHyperlinkAuditingEnabled"
#define WebKitAVFoundationEnabledKey @"WebKitAVFoundationEnabled"
#define WebKitHixie76WebSocketProtocolEnabledKey @"WebKitHixie76WebSocketProtocolEnabled"
Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (151490 => 151491)
--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2013-06-12 08:36:39 UTC (rev 151490)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2013-06-12 08:45:44 UTC (rev 151491)
@@ -387,7 +387,6 @@
[NSNumber numberWithBool:NO], WebKitDNSPrefetchingEnabledPreferenceKey,
[NSNumber numberWithBool:NO], WebKitFullScreenEnabledPreferenceKey,
[NSNumber numberWithBool:NO], WebKitAsynchronousSpellCheckingEnabledPreferenceKey,
- [NSNumber numberWithBool:NO], WebKitMemoryInfoEnabledPreferenceKey,
[NSNumber numberWithBool:YES], WebKitHyperlinkAuditingEnabledPreferenceKey,
[NSNumber numberWithBool:NO], WebKitUsePreHTML5ParserQuirksKey,
[NSNumber numberWithBool:YES], WebKitAVFoundationEnabledKey,
@@ -1492,16 +1491,6 @@
[self _setBoolValue:flag forKey:WebKitPaginateDuringLayoutEnabledPreferenceKey];
}
-- (BOOL)memoryInfoEnabled
-{
- return [self _boolValueForKey:WebKitMemoryInfoEnabledPreferenceKey];
-}
-
-- (void)setMemoryInfoEnabled:(BOOL)flag
-{
- [self _setBoolValue:flag forKey:WebKitMemoryInfoEnabledPreferenceKey];
-}
-
- (BOOL)hyperlinkAuditingEnabled
{
return [self _boolValueForKey:WebKitHyperlinkAuditingEnabledPreferenceKey];
Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (151490 => 151491)
--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2013-06-12 08:36:39 UTC (rev 151490)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2013-06-12 08:45:44 UTC (rev 151491)
@@ -217,9 +217,6 @@
- (BOOL)paginateDuringLayoutEnabled;
- (void)setPaginateDuringLayoutEnabled:(BOOL)flag;
-- (BOOL)memoryInfoEnabled;
-- (void)setMemoryInfoEnabled:(BOOL)enabled;
-
- (BOOL)hyperlinkAuditingEnabled;
- (void)setHyperlinkAuditingEnabled:(BOOL)enabled;
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (151490 => 151491)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2013-06-12 08:36:39 UTC (rev 151490)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2013-06-12 08:45:44 UTC (rev 151491)
@@ -1517,7 +1517,6 @@
settings->setFullScreenEnabled([preferences fullScreenEnabled]);
#endif
settings->setAsynchronousSpellCheckingEnabled([preferences asynchronousSpellCheckingEnabled]);
- settings->setMemoryInfoEnabled([preferences memoryInfoEnabled]);
settings->setHyperlinkAuditingEnabled([preferences hyperlinkAuditingEnabled]);
settings->setUsePreHTML5ParserQuirks([self _needsPreHTML5ParserQuirks]);
settings->setCrossOriginCheckInGetMatchedCSSRulesDisabled([self _needsUnrestrictedGetMatchedCSSRules]);
Modified: trunk/Source/WebKit/win/ChangeLog (151490 => 151491)
--- trunk/Source/WebKit/win/ChangeLog 2013-06-12 08:36:39 UTC (rev 151490)
+++ trunk/Source/WebKit/win/ChangeLog 2013-06-12 08:45:44 UTC (rev 151491)
@@ -1,3 +1,18 @@
+2013-06-12 Zan Dobersek <[email protected]>
+
+ Remove memoryInfoEnabled, quantizedMemoryInfoEnabled settings
+ https://bugs.webkit.org/show_bug.cgi?id=117512
+
+ Reviewed by Darin Adler.
+
+ * Interfaces/IWebPreferencesPrivate.idl: Remove memoryInfoEnabled, setMemoryInfoEnabled entries.
+ * WebPreferenceKeysPrivate.h: Remove the WebKitMemoryInfoEnabledPreferenceKey definition.
+ * WebPreferences.cpp: Remove the memoryInfo, setMemoryInfoEnabled methods.
+ (WebPreferences::initializeDefaultSettings): Remove the WebKitMemoryInfoEnabledPreferenceKey entry initialization.
+ * WebPreferences.h: Remove the memoryInfo, setMemoryInfoEnabled method declarations.
+ * WebView.cpp:
+ (WebView::notifyPreferencesChanged): Remove the Settings::setMemoryInfoEnabled call, the method is being removed.
+
2013-06-11 Brent Fulgham <[email protected]>
[Windows] Unreviewed build correction after r151440.
Modified: trunk/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl (151490 => 151491)
--- trunk/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl 2013-06-12 08:36:39 UTC (rev 151490)
+++ trunk/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl 2013-06-12 08:45:44 UTC (rev 151491)
@@ -116,9 +116,6 @@
HRESULT isDNSPrefetchingEnabled([out, retval] BOOL *enabled);
HRESULT setDNSPrefetchingEnabled([in] BOOL enabled);
- HRESULT memoryInfoEnabled([out, retval] BOOL *enabled);
- HRESULT setMemoryInfoEnabled([in] BOOL enabled);
-
HRESULT hyperlinkAuditingEnabled(BOOL *hyperlinkAuditingEnabled);
HRESULT setHyperlinkAuditingEnabled(BOOL hyperlinkAuditingEnabled);
Modified: trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h (151490 => 151491)
--- trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h 2013-06-12 08:36:39 UTC (rev 151490)
+++ trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h 2013-06-12 08:45:44 UTC (rev 151491)
@@ -153,8 +153,6 @@
#define WebKitDNSPrefetchingEnabledPreferenceKey "WebKitDNSPrefetchingEnabled"
-#define WebKitMemoryInfoEnabledPreferenceKey "WebKitMemoryInfoEnabled"
-
#define WebKitFullScreenEnabledPreferenceKey "WebKitFullScreenEnabled"
#define WebKitHixie76WebSocketProtocolEnabledPreferenceKey "WebKitHixie76WebSocketProtocolEnabled"
Modified: trunk/Source/WebKit/win/WebPreferences.cpp (151490 => 151491)
--- trunk/Source/WebKit/win/WebPreferences.cpp 2013-06-12 08:36:39 UTC (rev 151490)
+++ trunk/Source/WebKit/win/WebPreferences.cpp 2013-06-12 08:45:44 UTC (rev 151491)
@@ -267,7 +267,6 @@
CFDictionaryAddValue(defaults, CFSTR(WebKitDNSPrefetchingEnabledPreferenceKey), kCFBooleanFalse);
- CFDictionaryAddValue(defaults, CFSTR(WebKitMemoryInfoEnabledPreferenceKey), kCFBooleanFalse);
CFDictionaryAddValue(defaults, CFSTR(WebKitHyperlinkAuditingEnabledPreferenceKey), kCFBooleanTrue);
CFDictionaryAddValue(defaults, CFSTR(WebKitMediaPlaybackRequiresUserGesturePreferenceKey), kCFBooleanFalse);
@@ -1590,18 +1589,6 @@
return S_OK;
}
-HRESULT WebPreferences::memoryInfoEnabled(BOOL* enabled)
-{
- *enabled = boolValueForKey(CFSTR(WebKitMemoryInfoEnabledPreferenceKey));
- return S_OK;
-}
-
-HRESULT WebPreferences::setMemoryInfoEnabled(BOOL enabled)
-{
- setBoolValue(CFSTR(WebKitMemoryInfoEnabledPreferenceKey), enabled);
- return S_OK;
-}
-
HRESULT WebPreferences::isFullScreenEnabled(BOOL* enabled)
{
#if ENABLE(FULLSCREEN_API)
Modified: trunk/Source/WebKit/win/WebPreferences.h (151490 => 151491)
--- trunk/Source/WebKit/win/WebPreferences.h 2013-06-12 08:36:39 UTC (rev 151490)
+++ trunk/Source/WebKit/win/WebPreferences.h 2013-06-12 08:45:44 UTC (rev 151491)
@@ -453,9 +453,6 @@
virtual HRESULT STDMETHODCALLTYPE setDNSPrefetchingEnabled(BOOL);
virtual HRESULT STDMETHODCALLTYPE isDNSPrefetchingEnabled(BOOL*);
- virtual HRESULT STDMETHODCALLTYPE setMemoryInfoEnabled(BOOL);
- virtual HRESULT STDMETHODCALLTYPE memoryInfoEnabled(BOOL*);
-
virtual HRESULT STDMETHODCALLTYPE hyperlinkAuditingEnabled(BOOL*);
virtual HRESULT STDMETHODCALLTYPE setHyperlinkAuditingEnabled(BOOL);
Modified: trunk/Source/WebKit/win/WebView.cpp (151490 => 151491)
--- trunk/Source/WebKit/win/WebView.cpp 2013-06-12 08:36:39 UTC (rev 151490)
+++ trunk/Source/WebKit/win/WebView.cpp 2013-06-12 08:45:44 UTC (rev 151491)
@@ -4935,11 +4935,6 @@
return hr;
settings->setDNSPrefetchingEnabled(enabled);
- hr = prefsPrivate->memoryInfoEnabled(&enabled);
- if (FAILED(hr))
- return hr;
- settings->setMemoryInfoEnabled(enabled);
-
hr = prefsPrivate->hyperlinkAuditingEnabled(&enabled);
if (FAILED(hr))
return hr;
