Title: [164304] trunk/Source/WebKit2
- Revision
- 164304
- Author
- wei...@apple.com
- Date
- 2014-02-18 12:24:32 -0800 (Tue, 18 Feb 2014)
Log Message
Temporarily remove support for setting the maximumDecodedImageSize. It is causing assertions.
* Shared/WebPreferencesStore.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (164303 => 164304)
--- trunk/Source/WebKit2/ChangeLog 2014-02-18 20:13:16 UTC (rev 164303)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-18 20:24:32 UTC (rev 164304)
@@ -1,3 +1,11 @@
+2014-02-18 Sam Weinig <s...@webkit.org>
+
+ Temporarily remove support for setting the maximumDecodedImageSize. It is causing assertions.
+
+ * Shared/WebPreferencesStore.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
2014-02-18 Dan Bernstein <m...@apple.com>
[Cocoa] Implement -description in some API objects
Modified: trunk/Source/WebKit2/Shared/WebPreferencesStore.h (164303 => 164304)
--- trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2014-02-18 20:13:16 UTC (rev 164303)
+++ trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2014-02-18 20:24:32 UTC (rev 164304)
@@ -236,7 +236,6 @@
macro(InspectorAttachedHeight, inspectorAttachedHeight, UInt32, uint32_t, 300) \
macro(InspectorAttachedWidth, inspectorAttachedWidth, UInt32, uint32_t, 750) \
macro(InspectorAttachmentSide, inspectorAttachmentSide, UInt32, uint32_t, 0) \
- macro(MaximumDecodedImageSize, maximumDecodedImageSize, UInt32, uint32_t, 20 * 1024 * 1024) \
\
#if PLATFORM(COCOA)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (164303 => 164304)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-18 20:13:16 UTC (rev 164303)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-18 20:24:32 UTC (rev 164304)
@@ -2592,7 +2592,6 @@
settings.setLayoutInterval(std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::duration<double>(store.getDoubleValueForKey(WebPreferencesKey::layoutIntervalKey()))));
settings.setMaxParseDuration(store.getDoubleValueForKey(WebPreferencesKey::maxParseDurationKey()));
- settings.setMaximumDecodedImageSize(store.getUInt32ValueForKey(WebPreferencesKey::maximumDecodedImageSizeKey()));
if (store.getBoolValueForKey(WebPreferencesKey::pageVisibilityBasedProcessSuppressionEnabledKey())) {
if (m_processSuppressionDisabledByWebPreference.isActive())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
