Title: [89501] trunk/Source/WebKit/mac
- Revision
- 89501
- Author
- [email protected]
- Date
- 2011-06-22 17:17:08 -0700 (Wed, 22 Jun 2011)
Log Message
Roll out r89469 (Add preference for setting the html parser depth limit)
The preference is not needed at this time, so there is no reason to expose it.
* WebView/WebPreferenceKeysPrivate.h:
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]):
* WebView/WebPreferencesPrivate.h:
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (89500 => 89501)
--- trunk/Source/WebKit/mac/ChangeLog 2011-06-23 00:16:03 UTC (rev 89500)
+++ trunk/Source/WebKit/mac/ChangeLog 2011-06-23 00:17:08 UTC (rev 89501)
@@ -1,5 +1,18 @@
2011-06-22 Sam Weinig <[email protected]>
+ Roll out r89469 (Add preference for setting the html parser depth limit)
+
+ The preference is not needed at this time, so there is no reason to expose it.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+
+2011-06-22 Sam Weinig <[email protected]>
+
Reviewed by Adam Barth.
Add preference for setting the html parser depth limit
Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (89500 => 89501)
--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2011-06-23 00:16:03 UTC (rev 89500)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2011-06-23 00:17:08 UTC (rev 89501)
@@ -120,7 +120,6 @@
#define WebKitTextDirectionSubmenuInclusionBehaviorPreferenceKey @"WebKitTextDirectionSubmenuInclusionBehaviorPreferenceKey"
#define WebKitEditingBehaviorPreferenceKey @"WebKitEditingBehavior"
#define WebKitUsePreHTML5ParserQuirksKey @"WebKitUsePreHTML5ParserQuirks"
-#define WebKitMaximumHTMLParserDOMTreeDepthKey @"WebKitMaximumHTMLParserDOMTreeDepth"
// CoreGraphics deferred updates are disabled if WebKitEnableCoalescedUpdatesPreferenceKey is set
// to NO, or has no value. For compatibility with Mac OS X 10.4.6, deferred updates are OFF by
Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (89500 => 89501)
--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2011-06-23 00:16:03 UTC (rev 89500)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2011-06-23 00:17:08 UTC (rev 89501)
@@ -39,7 +39,6 @@
#import "WebNSDictionaryExtras.h"
#import "WebNSURLExtras.h"
#import <WebCore/ApplicationCacheStorage.h>
-#import <WebCore/Settings.h>
NSString *WebPreferencesChangedNotification = @"WebPreferencesChangedNotification";
NSString *WebPreferencesRemovedNotification = @"WebPreferencesRemovedNotification";
@@ -376,7 +375,6 @@
[NSNumber numberWithBool:NO], WebKitMemoryInfoEnabledPreferenceKey,
[NSNumber numberWithBool:YES], WebKitHyperlinkAuditingEnabledPreferenceKey,
[NSNumber numberWithBool:NO], WebKitUsePreHTML5ParserQuirksKey,
- [NSNumber numberWithUnsignedInt:WebCore::Settings::defaultMaximumHTMLParserDOMTreeDepth], WebKitMaximumHTMLParserDOMTreeDepthKey,
[NSNumber numberWithBool:YES], WebKitAVFoundationEnabledKey,
[NSNumber numberWithLongLong:WebCore::ApplicationCacheStorage::noQuota()], WebKitApplicationCacheTotalQuota,
[NSNumber numberWithLongLong:WebCore::ApplicationCacheStorage::noQuota()], WebKitApplicationCacheDefaultOriginQuota,
@@ -1410,16 +1408,6 @@
[self _setBoolValue:flag forKey:WebKitUsePreHTML5ParserQuirksKey];
}
-- (void)setMaximumHTMLParserDOMTreeDepth:(unsigned)depth
-{
- [self _setIntegerValue:depth forKey:WebKitMaximumHTMLParserDOMTreeDepthKey];
-}
-
-- (unsigned)maximumHTMLParserDOMTreeDepth
-{
- return [self _integerValueForKey:WebKitMaximumHTMLParserDOMTreeDepthKey];
-}
-
- (void)didRemoveFromWebView
{
ASSERT(_private->numWebViews);
Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (89500 => 89501)
--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2011-06-23 00:16:03 UTC (rev 89500)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2011-06-23 00:17:08 UTC (rev 89501)
@@ -238,9 +238,6 @@
- (void)setUsePreHTML5ParserQuirks:(BOOL)flag;
- (BOOL)usePreHTML5ParserQuirks;
-- (void)setMaximumHTMLParserDOMTreeDepth:(unsigned)depth;
-- (unsigned)maximumHTMLParserDOMTreeDepth;
-
- (void)setLoadsSiteIconsIgnoringImageLoadingPreference: (BOOL)flag;
- (BOOL)loadsSiteIconsIgnoringImageLoadingPreference;
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (89500 => 89501)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2011-06-23 00:16:03 UTC (rev 89500)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2011-06-23 00:17:08 UTC (rev 89501)
@@ -1570,7 +1570,6 @@
settings->setMemoryInfoEnabled([preferences memoryInfoEnabled]);
settings->setHyperlinkAuditingEnabled([preferences hyperlinkAuditingEnabled]);
settings->setUsePreHTML5ParserQuirks([self _needsPreHTML5ParserQuirks]);
- settings->setMaximumHTMLParserDOMTreeDepth([preferences maximumHTMLParserDOMTreeDepth]);
settings->setCrossOriginCheckInGetMatchedCSSRulesDisabled([self _needsUnrestrictedGetMatchedCSSRules]);
settings->setInteractiveFormValidationEnabled([self interactiveFormValidationEnabled]);
settings->setValidationMessageTimerMagnification([self validationMessageTimerMagnification]);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
