Attachment 123269 Details for Bug 76424 – Patch

[patch] Patch

bug-76424-20120120182406.patch (text/plain), 92.55 KB, created by Hajime Morrita on 2012-01-20 01:24:08 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Hajime Morrita

Created: 2012-01-20 01:24:08 PST

Size: 92.55 KB

patch

obsolete

>Subversion Revision: 105469
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 1fc22e9b54921220438bfc616de05acf26f3b1f5..b9ace71760f91a59a2bf366604460c8bacbe1ed8 100755
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,62 @@
>+2012-01-20  Hajime Morrita  <morrita@chromium.org>
>+
>+        [Refactoring][Internals] Should have InternalSettings
>+        https://bugs.webkit.org/show_bug.cgi?id=76424
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        - Invoked Internals::reset() in the constructor to employ Document object.
>+        - Moved setting and configuration related Internals methods to
>+          newly introduced InternalSettings object.
>+
>+        No new tests, covered by existing tests.
>+
>+        * DerivedSources.make:
>+        * DerivedSources.pri:
>+        * GNUmakefile.list.am:
>+        * Target.pri:
>+        * WebCore.gypi:
>+        * WebCore.vcproj/WebCoreTestSupport.vcproj:
>+        * WebCore.xcodeproj/project.pbxproj:
>+        * testing/InternalSettings.cpp: Added.
>+        (WebCore::InternalSettings::create):
>+        (WebCore::InternalSettings::~InternalSettings):
>+        (WebCore::InternalSettings::InternalSettings):
>+        (WebCore::InternalSettings::settings):
>+        (WebCore::InternalSettings::document):
>+        (WebCore::InternalSettings::page):
>+        (WebCore::InternalSettings::setInspectorResourcesDataSizeLimits):
>+        (WebCore::InternalSettings::setForceCompositingMode):
>+        (WebCore::InternalSettings::setEnableCompositingForFixedPosition):
>+        (WebCore::InternalSettings::setEnableCompositingForScrollableFrames):
>+        (WebCore::InternalSettings::setAcceleratedDrawingEnabled):
>+        (WebCore::InternalSettings::setAcceleratedFiltersEnabled):
>+        (WebCore::InternalSettings::setEnableScrollAnimator):
>+        (WebCore::InternalSettings::setZoomAnimatorTransform):
>+        (WebCore::InternalSettings::setZoomParameters):
>+        (WebCore::InternalSettings::setMockScrollbarsEnabled):
>+        (WebCore::InternalSettings::setPasswordEchoEnabled):
>+        (WebCore::InternalSettings::setPasswordEchoDurationInSeconds):
>+        (WebCore::InternalSettings::setShouldLayoutFixedElementsRelativeToFrame):
>+        (WebCore::InternalSettings::setUnifiedTextCheckingEnabled):
>+        (WebCore::InternalSettings::unifiedTextCheckingEnabled):
>+        (WebCore::InternalSettings::pageScaleFactor):
>+        (WebCore::InternalSettings::setPageScaleFactor):
>+        (WebCore::InternalSettings::setPerTileDrawingEnabled):
>+        * testing/InternalSettings.h: Added.
>+        * testing/InternalSettings.idl: Added.
>+        * testing/Internals.cpp:
>+        (WebCore::Internals::create):
>+        (WebCore::Internals::Internals):
>+        (WebCore::Internals::reset):
>+        * testing/Internals.h:
>+        (WebCore::Internals::settings):
>+        * testing/Internals.idl:
>+        * testing/js/WebCoreTestSupport.cpp:
>+        (WebCoreTestSupport::injectInternalsObject):
>+        * testing/v8/WebCoreTestSupport.cpp:
>+        (WebCoreTestSupport::injectInternalsObject):
>+
> 2012-01-19  Cary Clark  <caryclark@google.com>
> 
>         [Skia Mac] Match style of platform error underline for misspellings
>diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make
>index f3add0ce6963313776b45aa3093d480e0c943b6c..2d1b0a137ecec6e97dc4e4cb40600b5a27335bd2 100644
>--- a/Source/WebCore/DerivedSources.make
>+++ b/Source/WebCore/DerivedSources.make
>@@ -523,6 +523,7 @@ BINDING_IDLS = \
>     $(WebCore)/svg/SVGZoomAndPan.idl \
>     $(WebCore)/svg/SVGZoomEvent.idl \
>     $(WebCore)/testing/Internals.idl \
>+    $(WebCore)/testing/InternalSettings.idl \
>     $(WebCore)/webaudio/AudioBuffer.idl \
>     $(WebCore)/webaudio/AudioBufferCallback.idl \
>     $(WebCore)/webaudio/AudioBufferSourceNode.idl \
>diff --git a/Source/WebCore/DerivedSources.pri b/Source/WebCore/DerivedSources.pri
>index 297b6bf179e5473dd99fb6d03b6f8e1d69fda42a..560e9a832f5cf7a6784ca666bb61f0b71c9cc8fa 100644
>--- a/Source/WebCore/DerivedSources.pri
>+++ b/Source/WebCore/DerivedSources.pri
>@@ -400,6 +400,7 @@ IDL_BINDINGS += \
>     $$PWD/storage/SQLTransactionSync.idl \
>     $$PWD/storage/SQLTransactionSyncCallback.idl \
>     $$PWD/testing/Internals.idl \
>+    $$PWD/testing/InternalSettings.idl \
>     $$PWD/webaudio/AudioBuffer.idl \
>     $$PWD/webaudio/AudioBufferSourceNode.idl \
>     $$PWD/webaudio/AudioChannelMerger.idl \
>diff --git a/Source/WebCore/GNUmakefile.list.am b/Source/WebCore/GNUmakefile.list.am
>index bbb2659672f1111db1d53ceabf85c151c0ac4227..adcdbfc09f0554577287efcc970aece74cbdbacd 100644
>--- a/Source/WebCore/GNUmakefile.list.am
>+++ b/Source/WebCore/GNUmakefile.list.am
>@@ -909,6 +909,7 @@ dom_binding_idls += \
> 	$(WebCore)/storage/Storage.idl \
> 	$(WebCore)/storage/StorageEvent.idl \
> 	$(WebCore)/testing/Internals.idl \
>+	$(WebCore)/testing/InternalSettings.idl \
> 	$(WebCore)/webaudio/AudioContext.idl \
> 	$(WebCore)/webaudio/AudioPannerNode.idl \
> 	$(WebCore)/webaudio/DynamicsCompressorNode.idl \
>diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri
>index 457db0ce0bceb8b07dc4494446c7f18691fe655b..97d7c15062da4c9f5166b9795193b9c02cd62181 100644
>--- a/Source/WebCore/Target.pri
>+++ b/Source/WebCore/Target.pri
>@@ -1300,6 +1300,7 @@ SOURCES += \
>     storage/StorageSyncManager.cpp \
>     storage/StorageTracker.cpp \
>     testing/Internals.cpp \
>+    testing/InternalSettings.cpp \
>     xml/DOMParser.cpp \
>     xml/NativeXPathNSResolver.cpp \
>     xml/XMLHttpRequest.cpp \
>@@ -2711,6 +2712,7 @@ HEADERS += \
>     svg/SVGZoomAndPan.h \
>     svg/SVGZoomEvent.h \
>     testing/Internals.h \
>+    testing/InternalSettings.h \
>     workers/AbstractWorker.h \
>     workers/DedicatedWorkerContext.h \
>     workers/DedicatedWorkerThread.h \
>diff --git a/Source/WebCore/WebCore.gypi b/Source/WebCore/WebCore.gypi
>index 7b517d4399108b26eed16499930a2f0449dac2ba..c1849150ef3e137e526b9d2be9d64e988e4453a2 100644
>--- a/Source/WebCore/WebCore.gypi
>+++ b/Source/WebCore/WebCore.gypi
>@@ -6375,6 +6375,7 @@
>         ],
>         'webcore_test_support_idl_files': [
>           'testing/Internals.idl',
>+          'testing/InternalSettings.idl',
>         ],
>         'webcore_test_support_files': [
>             'testing/v8/V8InternalsCustom.cpp',
>@@ -6385,6 +6386,8 @@
>             'testing/js/WebCoreTestSupport.h',
>             'testing/Internals.cpp',
>             'testing/Internals.h',
>+            'testing/InternalSettings.cpp',
>+            'testing/InternalSettings.h',
>         ],
>         'webcore_resource_files': [
>             'English.lproj/Localizable.strings',
>diff --git a/Source/WebCore/WebCore.vcproj/WebCoreTestSupport.vcproj b/Source/WebCore/WebCore.vcproj/WebCoreTestSupport.vcproj
>index 3fc2b54ee8713b462aced491de40d6d4bec4c9f8..34be414acabf5f73a4f87291e6746c2392488822 100644
>--- a/Source/WebCore/WebCore.vcproj/WebCoreTestSupport.vcproj
>+++ b/Source/WebCore/WebCore.vcproj/WebCoreTestSupport.vcproj
>@@ -347,6 +347,7 @@
> 		<Filter
> 			Name="DerivedSources"
> 			>
>+
> 			<File
> 				RelativePath="$(ConfigurationBuildDir)\obj\WebCore\DerivedSources\JSInternals.cpp"
> 				>
>@@ -415,6 +416,74 @@
> 				RelativePath="$(ConfigurationBuildDir)\obj\WebCore\DerivedSources\JSInternals.h"
> 				>
> 			</File>
>+			<File
>+				RelativePath="$(ConfigurationBuildDir)\obj\WebCore\DerivedSources\JSInternalSettings.cpp"
>+				>
>+				<FileConfiguration
>+					Name="Debug|Win32"
>+					>
>+					<Tool
>+						Name="VCCLCompilerTool"
>+						UsePrecompiledHeader="0"
>+						DisableSpecificWarnings="4065;4273;4565;4701;4702"
>+						ForcedIncludeFiles="$(NOINHERIT)"
>+					/>
>+				</FileConfiguration>
>+				<FileConfiguration
>+					Name="Release|Win32"
>+					>
>+					<Tool
>+						Name="VCCLCompilerTool"
>+						UsePrecompiledHeader="0"
>+						DisableSpecificWarnings="4065;4273;4565;4701;4702"
>+						ForcedIncludeFiles="$(NOINHERIT)"
>+					/>
>+				</FileConfiguration>
>+				<FileConfiguration
>+					Name="Debug_Cairo_CFLite|Win32"
>+					>
>+					<Tool
>+						Name="VCCLCompilerTool"
>+						UsePrecompiledHeader="0"
>+						DisableSpecificWarnings="4065;4273;4565;4701;4702"
>+						ForcedIncludeFiles="$(NOINHERIT)"
>+					/>
>+				</FileConfiguration>
>+				<FileConfiguration
>+					Name="Release_Cairo_CFLite|Win32"
>+					>
>+					<Tool
>+						Name="VCCLCompilerTool"
>+						UsePrecompiledHeader="0"
>+						DisableSpecificWarnings="4065;4273;4565;4701;4702"
>+						ForcedIncludeFiles="$(NOINHERIT)"
>+					/>
>+				</FileConfiguration>
>+				<FileConfiguration
>+					Name="Debug_All|Win32"
>+					>
>+					<Tool
>+						Name="VCCLCompilerTool"
>+						UsePrecompiledHeader="0"
>+						DisableSpecificWarnings="4065;4273;4565;4701;4702"
>+						ForcedIncludeFiles="$(NOINHERIT)"
>+					/>
>+				</FileConfiguration>
>+				<FileConfiguration
>+					Name="Production|Win32"
>+					>
>+					<Tool
>+						Name="VCCLCompilerTool"
>+						UsePrecompiledHeader="0"
>+						DisableSpecificWarnings="4065;4273;4565;4701;4702"
>+						ForcedIncludeFiles="$(NOINHERIT)"
>+					/>
>+				</FileConfiguration>
>+			</File>
>+			<File
>+				RelativePath="$(ConfigurationBuildDir)\obj\WebCore\DerivedSources\JSInternalSettings.h"
>+				>
>+			</File>
> 		</Filter>
> 		<Filter
> 			Name="testing"
>@@ -488,6 +557,74 @@
> 				>
> 			</File>
> 			<File
>+				RelativePath="..\testing\InternalSettings.cpp"
>+				>
>+				<FileConfiguration
>+					Name="Debug|Win32"
>+					>
>+					<Tool
>+						Name="VCCLCompilerTool"
>+						UsePrecompiledHeader="0"
>+						DisableSpecificWarnings="4065;4273;4565;4701;4702"
>+						ForcedIncludeFiles="$(NOINHERIT)"
>+					/>
>+				</FileConfiguration>
>+				<FileConfiguration
>+					Name="Release|Win32"
>+					>
>+					<Tool
>+						Name="VCCLCompilerTool"
>+						UsePrecompiledHeader="0"
>+						DisableSpecificWarnings="4065;4273;4565;4701;4702"
>+						ForcedIncludeFiles="$(NOINHERIT)"
>+					/>
>+				</FileConfiguration>
>+				<FileConfiguration
>+					Name="Debug_Cairo_CFLite|Win32"
>+					>
>+					<Tool
>+						Name="VCCLCompilerTool"
>+						UsePrecompiledHeader="0"
>+						DisableSpecificWarnings="4065;4273;4565;4701;4702"
>+						ForcedIncludeFiles="$(NOINHERIT)"
>+					/>
>+				</FileConfiguration>
>+				<FileConfiguration
>+					Name="Release_Cairo_CFLite|Win32"
>+					>
>+					<Tool
>+						Name="VCCLCompilerTool"
>+						UsePrecompiledHeader="0"
>+						DisableSpecificWarnings="4065;4273;4565;4701;4702"
>+						ForcedIncludeFiles="$(NOINHERIT)"
>+					/>
>+				</FileConfiguration>
>+				<FileConfiguration
>+					Name="Debug_All|Win32"
>+					>
>+					<Tool
>+						Name="VCCLCompilerTool"
>+						UsePrecompiledHeader="0"
>+						DisableSpecificWarnings="4065;4273;4565;4701;4702"
>+						ForcedIncludeFiles="$(NOINHERIT)"
>+					/>
>+				</FileConfiguration>
>+				<FileConfiguration
>+					Name="Production|Win32"
>+					>
>+					<Tool
>+						Name="VCCLCompilerTool"
>+						UsePrecompiledHeader="0"
>+						DisableSpecificWarnings="4065;4273;4565;4701;4702"
>+						ForcedIncludeFiles="$(NOINHERIT)"
>+					/>
>+				</FileConfiguration>
>+			</File>
>+			<File
>+				RelativePath="..\testing\InternalSettings.h"
>+				>
>+			</File>
>+			<File
> 				RelativePath="..\testing\js\WebCoreTestSupport.cpp"
> 				>
> 				<FileConfiguration
>diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>index 75b2b9ec7b4f45a475301212c3b45c7793b80bd3..9ee41b2337ebb17aad61fe96fafb063bc729aea8 100644
>--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>@@ -3518,6 +3518,8 @@
> 		A723F77B1484CA4C008C6DBE /* PlatformExportMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = A723F77A1484CA4C008C6DBE /* PlatformExportMacros.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		A73F95FE12C97BFE0031AAF9 /* RoundedRect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A73F95FC12C97BFE0031AAF9 /* RoundedRect.cpp */; };
> 		A73F95FF12C97BFE0031AAF9 /* RoundedRect.h in Headers */ = {isa = PBXBuildFile; fileRef = A73F95FD12C97BFE0031AAF9 /* RoundedRect.h */; settings = {ATTRIBUTES = (Private, ); }; };
>+		A740B5A514C935AB00A77FA4 /* JSInternalSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = A7B4EA7914C9348400C8F5BF /* JSInternalSettings.h */; };
>+		A740B5A714C935AF00A77FA4 /* JSInternalSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7B4EA7814C9348400C8F5BF /* JSInternalSettings.cpp */; };
> 		A74BB76B13BDA86300FF7BF0 /* ExceptionCodePlaceholder.h in Headers */ = {isa = PBXBuildFile; fileRef = A74BB76A13BDA86300FF7BF0 /* ExceptionCodePlaceholder.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		A75E497610752ACB00C9B896 /* SerializedScriptValue.h in Headers */ = {isa = PBXBuildFile; fileRef = A75E497410752ACB00C9B896 /* SerializedScriptValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		A75E497710752ACB00C9B896 /* SerializedScriptValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A75E497510752ACB00C9B896 /* SerializedScriptValue.cpp */; };
>@@ -3553,6 +3555,8 @@
> 		A7B6E69F0B291A9600D0529F /* DragData.h in Headers */ = {isa = PBXBuildFile; fileRef = A7B6E69D0B291A9600D0529F /* DragData.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		A7BBE26611AFB3F20005EA03 /* JSHTMLMeterElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7BBE26411AFB3F20005EA03 /* JSHTMLMeterElement.cpp */; };
> 		A7BBE26711AFB3F20005EA03 /* JSHTMLMeterElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A7BBE26511AFB3F20005EA03 /* JSHTMLMeterElement.h */; };
>+		A7BF7EDF14C9175A0014489D /* InternalSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7BF7EDC14C9175A0014489D /* InternalSettings.cpp */; };
>+		A7BF7EE014C9175A0014489D /* InternalSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = A7BF7EDD14C9175A0014489D /* InternalSettings.h */; };
> 		A7C9ABF81357A3BF00F5503F /* DetailsMarkerControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7C9ABF61357A3BF00F5503F /* DetailsMarkerControl.cpp */; };
> 		A7C9ABF91357A3BF00F5503F /* DetailsMarkerControl.h in Headers */ = {isa = PBXBuildFile; fileRef = A7C9ABF71357A3BF00F5503F /* DetailsMarkerControl.h */; };
> 		A7CA595D0B27BD9E00FA021D /* DragController.h in Headers */ = {isa = PBXBuildFile; fileRef = A7CA595B0B27BD9E00FA021D /* DragController.h */; settings = {ATTRIBUTES = (Private, ); }; };
>@@ -10378,9 +10382,14 @@
> 		A7AD2F860EC89D07008AB002 /* LinkHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinkHash.h; sourceTree = "<group>"; };
> 		A7B070D0130A409C00A3763C /* FrameActionScheduler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FrameActionScheduler.cpp; sourceTree = "<group>"; };
> 		A7B070D1130A409C00A3763C /* FrameActionScheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FrameActionScheduler.h; sourceTree = "<group>"; };
>+		A7B4EA7814C9348400C8F5BF /* JSInternalSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSInternalSettings.cpp; sourceTree = "<group>"; };
>+		A7B4EA7914C9348400C8F5BF /* JSInternalSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSInternalSettings.h; sourceTree = "<group>"; };
> 		A7B6E69D0B291A9600D0529F /* DragData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DragData.h; sourceTree = "<group>"; };
> 		A7BBE26411AFB3F20005EA03 /* JSHTMLMeterElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLMeterElement.cpp; sourceTree = "<group>"; };
> 		A7BBE26511AFB3F20005EA03 /* JSHTMLMeterElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSHTMLMeterElement.h; sourceTree = "<group>"; };
>+		A7BF7EDC14C9175A0014489D /* InternalSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InternalSettings.cpp; sourceTree = "<group>"; };
>+		A7BF7EDD14C9175A0014489D /* InternalSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InternalSettings.h; sourceTree = "<group>"; };
>+		A7BF7EDE14C9175A0014489D /* InternalSettings.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = InternalSettings.idl; sourceTree = "<group>"; };
> 		A7C9ABF61357A3BF00F5503F /* DetailsMarkerControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DetailsMarkerControl.cpp; sourceTree = "<group>"; };
> 		A7C9ABF71357A3BF00F5503F /* DetailsMarkerControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DetailsMarkerControl.h; sourceTree = "<group>"; };
> 		A7CA595B0B27BD9E00FA021D /* DragController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DragController.h; sourceTree = "<group>"; };
>@@ -14268,6 +14277,9 @@
> 				417DA4CF13734326007C57FB /* Internals.cpp */,
> 				417DA4CE13734326007C57FB /* Internals.h */,
> 				41813F9113818AD60057AAA4 /* Internals.idl */,
>+				A7BF7EDC14C9175A0014489D /* InternalSettings.cpp */,
>+				A7BF7EDD14C9175A0014489D /* InternalSettings.h */,
>+				A7BF7EDE14C9175A0014489D /* InternalSettings.idl */,
> 			);
> 			path = testing;
> 			sourceTree = "<group>";
>@@ -14275,6 +14287,8 @@
> 		417DA71213735D90007C57FB /* Testing */ = {
> 			isa = PBXGroup;
> 			children = (
>+				A7B4EA7814C9348400C8F5BF /* JSInternalSettings.cpp */,
>+				A7B4EA7914C9348400C8F5BF /* JSInternalSettings.h */,
> 				417DA71B13735DFA007C57FB /* JSInternals.cpp */,
> 				417DA71C13735DFA007C57FB /* JSInternals.h */,
> 			);
>@@ -20929,6 +20943,8 @@
> 				417DA6DA13734E6E007C57FB /* Internals.h in Headers */,
> 				417DA71E13735DFA007C57FB /* JSInternals.h in Headers */,
> 				41815C1F138319830057AAA4 /* WebCoreTestSupport.h in Headers */,
>+				A7BF7EE014C9175A0014489D /* InternalSettings.h in Headers */,
>+				A740B5A514C935AB00A77FA4 /* JSInternalSettings.h in Headers */,
> 			);
> 			runOnlyForDeploymentPostprocessing = 0;
> 		};
>@@ -24381,6 +24397,8 @@
> 				417DA71D13735DFA007C57FB /* JSInternals.cpp in Sources */,
> 				41815C1E138319830057AAA4 /* WebCoreTestSupport.cpp in Sources */,
> 				07230CBC14C10ED900F6B702 /* JSInternalsCustom.cpp in Sources */,
>+				A7BF7EDF14C9175A0014489D /* InternalSettings.cpp in Sources */,
>+				A740B5A714C935AF00A77FA4 /* JSInternalSettings.cpp in Sources */,
> 			);
> 			runOnlyForDeploymentPostprocessing = 0;
> 		};
>diff --git a/Source/WebCore/testing/InternalSettings.cpp b/Source/WebCore/testing/InternalSettings.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..326b753898b791dfa15395038ffc4e7db0050378
>--- /dev/null
>+++ b/Source/WebCore/testing/InternalSettings.cpp
>@@ -0,0 +1,304 @@
>+/*
>+ * Copyright (C) 2011 Google Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ *
>+ * 1.  Redistributions of source code must retain the above copyright
>+ *     notice, this list of conditions and the following disclaimer.
>+ * 2.  Redistributions in binary form must reproduce the above copyright
>+ *     notice, this list of conditions and the following disclaimer in the
>+ *     documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
>+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
>+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#include "config.h"
>+#include "InternalSettings.h"
>+
>+#include "CachedResourceLoader.h"
>+#include "Document.h"
>+#include "ExceptionCode.h"
>+#include "Frame.h"
>+#include "FrameView.h"
>+#include "InspectorController.h"
>+#include "Language.h"
>+#include "Page.h"
>+#include "Settings.h"
>+
>+#if ENABLE(GESTURE_EVENTS)
>+#include "PlatformGestureEvent.h"
>+#endif
>+
>+#if ENABLE(SMOOTH_SCROLLING)
>+#include "ScrollAnimator.h"
>+#endif
>+
>+#if ENABLE(INPUT_COLOR)
>+#include "ColorChooser.h"
>+#endif
>+
>+namespace WebCore {
>+
>+
>+PassRefPtr<InternalSettings> InternalSettings::create(Frame* frame, InternalSettings* old)
>+{
>+    return adoptRef(new InternalSettings(frame, old));
>+}
>+
>+InternalSettings::~InternalSettings()
>+{
>+}
>+
>+InternalSettings::InternalSettings(Frame* frame, InternalSettings* old)
>+    : FrameDestructionObserver(frame)
>+    , m_passwordEchoDurationInSecondsBackup(0)
>+    , m_passwordEchoDurationInSecondsBackedUp(false)
>+    , m_passwordEchoEnabledBackedUp(false)
>+{
>+    if (old && settings()) {
>+        if (old->m_passwordEchoDurationInSecondsBackedUp)
>+            settings()->setPasswordEchoDurationInSeconds(old->m_passwordEchoDurationInSecondsBackup);
>+        if (old->m_passwordEchoEnabledBackedUp)
>+            settings()->setPasswordEchoEnabled(old->m_passwordEchoEnabledBackup);
>+    }
>+}
>+
>+Settings* InternalSettings::settings() const
>+{
>+    if (!frame() || !frame()->page())
>+        return 0;
>+    return frame()->page()->settings();
>+}
>+
>+Document* InternalSettings::document() const
>+{
>+    return frame() ? frame()->document() : 0;
>+}
>+
>+Page* InternalSettings::page() const
>+{
>+    return document() ? document()->page() : 0;
>+}
>+
>+void InternalSettings::setInspectorResourcesDataSizeLimits(int maximumResourcesContentSize, int maximumSingleResourceContentSize, ExceptionCode& ec)
>+{
>+#if ENABLE(INSPECTOR)
>+    if (!page() || !page()->inspectorController()) {
>+        ec = INVALID_ACCESS_ERR;
>+        return;
>+    }
>+    page()->inspectorController()->setResourcesDataSizeLimitsFromInternals(maximumResourcesContentSize, maximumSingleResourceContentSize);
>+#else
>+    UNUSED_PARAM(maximumResourcesContentSize);
>+    UNUSED_PARAM(maximumSingleResourceContentSize);
>+    UNUSED_PARAM(ec);
>+#endif
>+}
>+
>+
>+void InternalSettings::setForceCompositingMode(bool enabled, ExceptionCode& ec)
>+{
>+    if (!settings()) {
>+        ec = INVALID_ACCESS_ERR;
>+        return;
>+    }
>+
>+    settings()->setForceCompositingMode(enabled);
>+}
>+
>+void InternalSettings::setEnableCompositingForFixedPosition(bool enabled, ExceptionCode& ec)
>+{
>+    if (!settings()) {
>+        ec = INVALID_ACCESS_ERR;
>+        return;
>+    }
>+
>+    settings()->setAcceleratedCompositingForFixedPositionEnabled(enabled);
>+}
>+
>+void InternalSettings::setEnableCompositingForScrollableFrames(bool enabled, ExceptionCode& ec)
>+{
>+    if (!settings()) {
>+        ec = INVALID_ACCESS_ERR;
>+        return;
>+    }
>+
>+    settings()->setAcceleratedCompositingForScrollableFramesEnabled(enabled);
>+}
>+
>+void InternalSettings::setAcceleratedDrawingEnabled(bool enabled, ExceptionCode& ec)
>+{
>+    if (!settings()) {
>+        ec = INVALID_ACCESS_ERR;
>+        return;
>+    }
>+
>+    settings()->setAcceleratedDrawingEnabled(enabled);
>+}
>+
>+void InternalSettings::setAcceleratedFiltersEnabled(bool enabled, ExceptionCode& ec)
>+{
>+    if (!settings()) {
>+        ec = INVALID_ACCESS_ERR;
>+        return;
>+    }
>+
>+    settings()->setAcceleratedFiltersEnabled(enabled);
>+}
>+
>+void InternalSettings::setEnableScrollAnimator(bool enabled, ExceptionCode& ec)
>+{
>+    if (!settings()) {
>+        ec = INVALID_ACCESS_ERR;
>+        return;
>+    }
>+
>+#if ENABLE(SMOOTH_SCROLLING)
>+    settings()->setEnableScrollAnimator(enabled);
>+#else
>+    UNUSED_PARAM(enabled);
>+#endif
>+}
>+
>+void InternalSettings::setZoomAnimatorTransform(float scale, float tx, float ty, ExceptionCode& ec)
>+{
>+    if (!frame()) {
>+        ec = INVALID_ACCESS_ERR;
>+        return;
>+    }
>+
>+#if ENABLE(GESTURE_EVENTS)
>+    PlatformGestureEvent pge(PlatformEvent::GestureDoubleTap, IntPoint(tx, ty), IntPoint(tx, ty), 0, scale, 0.f, 0, 0, 0, 0);
>+    frame()->eventHandler()->handleGestureEvent(pge);
>+#else
>+    UNUSED_PARAM(scale);
>+    UNUSED_PARAM(tx);
>+    UNUSED_PARAM(ty);
>+#endif
>+}
>+
>+void InternalSettings::setZoomParameters(float scale, float x, float y, ExceptionCode& ec)
>+{
>+    if (!frame() || !frame()->view()) {
>+        ec = INVALID_ACCESS_ERR;
>+        return;
>+    }
>+
>+#if ENABLE(SMOOTH_SCROLLING)
>+    frame()->view()->scrollAnimator()->setZoomParametersForTest(scale, x, y);
>+#else
>+    UNUSED_PARAM(scale);
>+    UNUSED_PARAM(x);
>+    UNUSED_PARAM(y);
>+#endif
>+}
>+
>+void InternalSettings::setMockScrollbarsEnabled(bool enabled, ExceptionCode& ec)
>+{
>+    if (!settings()) {
>+        ec = INVALID_ACCESS_ERR;
>+        return;
>+    }
>+
>+    settings()->setMockScrollbarsEnabled(enabled);
>+}
>+
>+void InternalSettings::setPasswordEchoEnabled(bool enabled, ExceptionCode& ec)
>+{
>+    if (!settings()) {
>+        ec = INVALID_ACCESS_ERR;
>+        return;
>+    }
>+
>+    if (!m_passwordEchoEnabledBackedUp) {
>+        m_passwordEchoEnabledBackup = settings()->passwordEchoEnabled();
>+        m_passwordEchoEnabledBackedUp = true;
>+    }
>+    settings()->setPasswordEchoEnabled(enabled);
>+}
>+
>+void InternalSettings::setPasswordEchoDurationInSeconds(double durationInSeconds, ExceptionCode& ec)
>+{
>+    if (!settings()) {
>+        ec = INVALID_ACCESS_ERR;
>+        return;
>+    }
>+
>+    if (!m_passwordEchoDurationInSecondsBackedUp) {
>+        m_passwordEchoDurationInSecondsBackup = settings()->passwordEchoDurationInSeconds();
>+        m_passwordEchoDurationInSecondsBackedUp = true;
>+    }
>+    settings()->setPasswordEchoDurationInSeconds(durationInSeconds);
>+}
>+
>+void InternalSettings::setShouldLayoutFixedElementsRelativeToFrame(bool enabled, ExceptionCode& ec)
>+{
>+    if (!frame() || !frame()->view()) {
>+        ec = INVALID_ACCESS_ERR;
>+        return;
>+    }
>+
>+    frame()->view()->setShouldLayoutFixedElementsRelativeToFrame(enabled);
>+}
>+
>+void InternalSettings::setUnifiedTextCheckingEnabled(bool enabled, ExceptionCode& ec)
>+{
>+    if (!settings()) {
>+        ec = INVALID_ACCESS_ERR;
>+        return;
>+    }
>+    
>+    settings()->setUnifiedTextCheckerEnabled(enabled);
>+}
>+
>+bool InternalSettings::unifiedTextCheckingEnabled(ExceptionCode& ec)
>+{
>+    if (!settings()) {
>+        ec = INVALID_ACCESS_ERR;
>+        return false;
>+    }
>+
>+    return settings()->unifiedTextCheckerEnabled();
>+}
>+
>+float InternalSettings::pageScaleFactor(ExceptionCode& ec)
>+{
>+    if (!page()) {
>+        ec = INVALID_ACCESS_ERR;
>+        return 0;
>+    }
>+
>+    return page()->pageScaleFactor();
>+}
>+
>+void InternalSettings::setPageScaleFactor(float scaleFactor, int x, int y, ExceptionCode& ec)
>+{
>+    if (!page()) {
>+        ec = INVALID_ACCESS_ERR;
>+        return;
>+    }
>+    page()->setPageScaleFactor(scaleFactor, IntPoint(x, y));
>+}
>+
>+void InternalSettings::setPerTileDrawingEnabled(bool enabled, ExceptionCode& ec)
>+{
>+    if (!settings()) {
>+        ec = INVALID_ACCESS_ERR;
>+        return;
>+    }
>+
>+    settings()->setPerTileDrawingEnabled(enabled);
>+}
>+
>+}
>diff --git a/Source/WebCore/testing/InternalSettings.h b/Source/WebCore/testing/InternalSettings.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..49b764979fb8bff03feff48fa66d16326ed155c5
>--- /dev/null
>+++ b/Source/WebCore/testing/InternalSettings.h
>@@ -0,0 +1,83 @@
>+/*
>+ * Copyright (C) 2011 Google Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ *
>+ * 1.  Redistributions of source code must retain the above copyright
>+ *     notice, this list of conditions and the following disclaimer.
>+ * 2.  Redistributions in binary form must reproduce the above copyright
>+ *     notice, this list of conditions and the following disclaimer in the
>+ *     documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
>+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
>+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#ifndef InternalSettings_h
>+#define InternalSettings_h
>+
>+#include "FrameDestructionObserver.h"
>+#include <wtf/PassRefPtr.h>
>+#include <wtf/RefCounted.h>
>+#include <wtf/text/WTFString.h>
>+
>+namespace WebCore {
>+
>+typedef int ExceptionCode;
>+
>+class Frame;
>+class Document;
>+class Page;
>+class Settings;
>+
>+class InternalSettings : public RefCounted<InternalSettings>,
>+                         public FrameDestructionObserver {
>+public:
>+    static PassRefPtr<InternalSettings> create(Frame*, InternalSettings* old);
>+    virtual ~InternalSettings();
>+
>+    void setInspectorResourcesDataSizeLimits(int maximumResourcesContentSize, int maximumSingleResourceContentSize, ExceptionCode&);
>+    void setForceCompositingMode(bool enabled, ExceptionCode&);
>+    void setEnableCompositingForFixedPosition(bool enabled, ExceptionCode&);
>+    void setEnableCompositingForScrollableFrames(bool enabled, ExceptionCode&);
>+    void setAcceleratedDrawingEnabled(bool enabled, ExceptionCode&);
>+    void setAcceleratedFiltersEnabled(bool enabled, ExceptionCode&);
>+    void setEnableScrollAnimator(bool enabled, ExceptionCode&);
>+    void setZoomAnimatorTransform(float scale, float tx, float ty, ExceptionCode&);
>+    void setZoomParameters(float scale, float x, float y, ExceptionCode&);
>+    void setMockScrollbarsEnabled(bool enabled, ExceptionCode&);
>+    void setPasswordEchoEnabled(bool enabled, ExceptionCode&);
>+    void setPasswordEchoDurationInSeconds(double durationInSeconds, ExceptionCode&);
>+    void setShouldLayoutFixedElementsRelativeToFrame(bool, ExceptionCode&);
>+    void setUnifiedTextCheckingEnabled(bool, ExceptionCode&);
>+    bool unifiedTextCheckingEnabled(ExceptionCode&);
>+    float pageScaleFactor(ExceptionCode&);
>+    void setPageScaleFactor(float scaleFactor, int x, int y, ExceptionCode&);
>+    void setPerTileDrawingEnabled(bool enabled, ExceptionCode&);
>+
>+private:
>+    InternalSettings(Frame*, InternalSettings* old);
>+
>+    Settings* settings() const;
>+    Document* document() const;
>+    Page* page() const;
>+
>+    double m_passwordEchoDurationInSecondsBackup;
>+    bool m_passwordEchoEnabledBackup : 1;
>+    bool m_passwordEchoDurationInSecondsBackedUp : 1;
>+    bool m_passwordEchoEnabledBackedUp : 1;
>+};
>+
>+} // namespace WebCore
>+
>+#endif
>diff --git a/Source/WebCore/testing/InternalSettings.idl b/Source/WebCore/testing/InternalSettings.idl
>new file mode 100644
>index 0000000000000000000000000000000000000000..4a4e72a95643920981a800b1b367107b618d5877
>--- /dev/null
>+++ b/Source/WebCore/testing/InternalSettings.idl
>@@ -0,0 +1,49 @@
>+/*
>+ * Copyright (C) 2011 Google Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ *
>+ * 1.  Redistributions of source code must retain the above copyright
>+ *     notice, this list of conditions and the following disclaimer.
>+ * 2.  Redistributions in binary form must reproduce the above copyright
>+ *     notice, this list of conditions and the following disclaimer in the
>+ *     documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
>+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
>+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
>+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+module window {
>+    interface [
>+        OmitConstructor
>+    ] InternalSettings {
>+        void setInspectorResourcesDataSizeLimits(in long maximumResourcesContentSize, in long maximumSingleResourceContentSize) raises(DOMException);
>+        void setForceCompositingMode(in boolean enabled) raises(DOMException);
>+        void setEnableCompositingForFixedPosition(in boolean enabled) raises(DOMException);
>+        void setEnableCompositingForScrollableFrames(in boolean enabled) raises(DOMException);
>+        void setAcceleratedDrawingEnabled(in boolean enabled) raises(DOMException);
>+        void setAcceleratedFiltersEnabled(in boolean enabled) raises(DOMException);
>+        void setEnableScrollAnimator(in boolean enabled) raises(DOMException);
>+        void setZoomAnimatorTransform(in float scale, in float tx, in float ty) raises(DOMException);
>+        void setZoomParameters(in float scale, in float x, in float y) raises(DOMException);
>+        void setMockScrollbarsEnabled(in boolean enabled) raises(DOMException);
>+        void setPasswordEchoEnabled(in boolean enabled) raises(DOMException);
>+        void setPasswordEchoDurationInSeconds(in double durationInSeconds) raises(DOMException);
>+        void setShouldLayoutFixedElementsRelativeToFrame(in boolean enabled) raises(DOMException);
>+        void setUnifiedTextCheckingEnabled(in boolean enabled) raises (DOMException);
>+        boolean unifiedTextCheckingEnabled() raises (DOMException);
>+        float pageScaleFactor() raises(DOMException);
>+        void setPageScaleFactor(in float scaleFactor, in long x, in long y) raises(DOMException);
>+    };
>+}
>+
>diff --git a/Source/WebCore/testing/Internals.cpp b/Source/WebCore/testing/Internals.cpp
>index 8c3185a324dd24fbe6163556dbe159b1fa9ff882..4c62a7f292d38939126b0c94d04fa59d6b738e1a 100644
>--- a/Source/WebCore/testing/Internals.cpp
>+++ b/Source/WebCore/testing/Internals.cpp
>@@ -40,6 +40,7 @@
> #include "HTMLNames.h"
> #include "HTMLTextAreaElement.h"
> #include "InspectorController.h"
>+#include "InternalSettings.h"
> #include "IntRect.h"
> #include "Language.h"
> #include "NodeRenderingContext.h"
>@@ -104,21 +105,19 @@ static SpellChecker* spellchecker(Document* document)
> 
> const char* Internals::internalsId = "internals";
> 
>-PassRefPtr<Internals> Internals::create()
>+PassRefPtr<Internals> Internals::create(Document* document)
> {
>-    return adoptRef(new Internals);
>+    return adoptRef(new Internals(document));
> }
> 
> Internals::~Internals()
> {
> }
> 
>-Internals::Internals()
>+Internals::Internals(Document* document)
>     : FrameDestructionObserver(0)
>-    , m_passwordEchoDurationInSecondsBackup(0)
>-    , m_passwordEchoDurationInSecondsBackedUp(false)
>-    , m_passwordEchoEnabledBackedUp(false)
> {
>+    reset(document);
> }
> 
> bool Internals::isPreloaded(Document* document, const String& url)
>@@ -226,17 +225,6 @@ void Internals::selectColorInColorChooser(Element* element, const String& colorV
> }
> #endif
> 
>-#if ENABLE(INSPECTOR)
>-void Internals::setInspectorResourcesDataSizeLimits(Document* document, int maximumResourcesContentSize, int maximumSingleResourceContentSize, ExceptionCode& ec)
>-{
>-    if (!document || !document->page() || !document->page()->inspectorController()) {
>-        ec = INVALID_ACCESS_ERR;
>-        return;
>-    }
>-    document->page()->inspectorController()->setResourcesDataSizeLimitsFromInternals(maximumResourcesContentSize, maximumSingleResourceContentSize);
>-}
>-#endif
>-
> PassRefPtr<ClientRect> Internals::boundingBox(Element* element, ExceptionCode& ec)
> {
>     if (!element) {
>@@ -286,141 +274,6 @@ PassRefPtr<Range> Internals::markerRangeForNode(Node* node, const String& marker
>     return Range::create(node->document(), node, markers[index]->startOffset(), node, markers[index]->endOffset());
> }
> 
>-void Internals::setForceCompositingMode(Document* document, bool enabled, ExceptionCode& ec)
>-{
>-    if (!document || !document->settings()) {
>-        ec = INVALID_ACCESS_ERR;
>-        return;
>-    }
>-
>-    document->settings()->setForceCompositingMode(enabled);
>-}
>-
>-void Internals::setEnableCompositingForFixedPosition(Document* document, bool enabled, ExceptionCode& ec)
>-{
>-    if (!document || !document->settings()) {
>-        ec = INVALID_ACCESS_ERR;
>-        return;
>-    }
>-
>-    document->settings()->setAcceleratedCompositingForFixedPositionEnabled(enabled);
>-}
>-
>-void Internals::setEnableCompositingForScrollableFrames(Document* document, bool enabled, ExceptionCode& ec)
>-{
>-    if (!document || !document->settings()) {
>-        ec = INVALID_ACCESS_ERR;
>-        return;
>-    }
>-
>-    document->settings()->setAcceleratedCompositingForScrollableFramesEnabled(enabled);
>-}
>-
>-void Internals::setAcceleratedDrawingEnabled(Document* document, bool enabled, ExceptionCode& ec)
>-{
>-    if (!document || !document->settings()) {
>-        ec = INVALID_ACCESS_ERR;
>-        return;
>-    }
>-
>-    document->settings()->setAcceleratedDrawingEnabled(enabled);
>-}
>-
>-void Internals::setAcceleratedFiltersEnabled(Document* document, bool enabled, ExceptionCode& ec)
>-{
>-    if (!document || !document->settings()) {
>-        ec = INVALID_ACCESS_ERR;
>-        return;
>-    }
>-
>-    document->settings()->setAcceleratedFiltersEnabled(enabled);
>-}
>-
>-void Internals::setEnableScrollAnimator(Document* document, bool enabled, ExceptionCode& ec)
>-{
>-    if (!document || !document->settings()) {
>-        ec = INVALID_ACCESS_ERR;
>-        return;
>-    }
>-
>-#if ENABLE(SMOOTH_SCROLLING)
>-    document->settings()->setEnableScrollAnimator(enabled);
>-#else
>-    UNUSED_PARAM(enabled);
>-#endif
>-}
>-
>-void Internals::setZoomAnimatorTransform(Document *document, float scale, float tx, float ty, ExceptionCode& ec)
>-{
>-    if (!document || !document->view() || !document->view()->frame()) {
>-        ec = INVALID_ACCESS_ERR;
>-        return;
>-    }
>-
>-#if ENABLE(GESTURE_EVENTS)
>-    PlatformGestureEvent pge(PlatformEvent::GestureDoubleTap, IntPoint(tx, ty), IntPoint(tx, ty), 0, scale, 0.f, 0, 0, 0, 0);
>-    document->view()->frame()->eventHandler()->handleGestureEvent(pge);
>-#else
>-    UNUSED_PARAM(scale);
>-    UNUSED_PARAM(tx);
>-    UNUSED_PARAM(ty);
>-#endif
>-}
>-
>-void Internals::setZoomParameters(Document* document, float scale, float x, float y, ExceptionCode& ec)
>-{
>-    if (!document || !document->view() || !document->view()->frame()) {
>-        ec = INVALID_ACCESS_ERR;
>-        return;
>-    }
>-
>-#if ENABLE(SMOOTH_SCROLLING)
>-    document->view()->scrollAnimator()->setZoomParametersForTest(scale, x, y);
>-#else
>-    UNUSED_PARAM(scale);
>-    UNUSED_PARAM(x);
>-    UNUSED_PARAM(y);
>-#endif
>-}
>-
>-void Internals::setMockScrollbarsEnabled(Document* document, bool enabled, ExceptionCode& ec)
>-{
>-    if (!document || !document->settings()) {
>-        ec = INVALID_ACCESS_ERR;
>-        return;
>-    }
>-
>-    document->settings()->setMockScrollbarsEnabled(enabled);
>-}
>-
>-void Internals::setPasswordEchoEnabled(Document* document, bool enabled, ExceptionCode& ec)
>-{
>-    if (!document || !document->settings()) {
>-        ec = INVALID_ACCESS_ERR;
>-        return;
>-    }
>-
>-    if (!m_passwordEchoEnabledBackedUp) {
>-        m_passwordEchoEnabledBackup = document->settings()->passwordEchoEnabled();
>-        m_passwordEchoEnabledBackedUp = true;
>-    }
>-    document->settings()->setPasswordEchoEnabled(enabled);
>-}
>-
>-void Internals::setPasswordEchoDurationInSeconds(Document* document, double durationInSeconds, ExceptionCode& ec)
>-{
>-    if (!document || !document->settings()) {
>-        ec = INVALID_ACCESS_ERR;
>-        return;
>-    }
>-
>-    if (!m_passwordEchoDurationInSecondsBackedUp) {
>-        m_passwordEchoDurationInSecondsBackup = document->settings()->passwordEchoDurationInSeconds();
>-        m_passwordEchoDurationInSecondsBackedUp = true;
>-    }
>-    document->settings()->setPasswordEchoDurationInSeconds(durationInSeconds);
>-}
>-
> void Internals::setScrollViewPosition(Document* document, long x, long y, ExceptionCode& ec)
> {
>     if (!document || !document->view()) {
>@@ -469,17 +322,7 @@ void Internals::reset(Document* document)
>         return;
> 
>     observeFrame(document->frame());
>-
>-    if (m_passwordEchoDurationInSecondsBackedUp) {
>-        document->settings()->setPasswordEchoDurationInSeconds(m_passwordEchoDurationInSecondsBackup);
>-        m_passwordEchoDurationInSecondsBackedUp = false;
>-    }
>-
>-    if (m_passwordEchoEnabledBackedUp) {
>-        document->settings()->setPasswordEchoEnabled(m_passwordEchoEnabledBackup);
>-        m_passwordEchoEnabledBackedUp = false;
>-    }
>-
>+    m_settings = InternalSettings::create(document->frame(), m_settings.get());
>     if (Page* page = document->page())
>         page->setPagination(Page::Pagination());
> }
>@@ -591,56 +434,6 @@ unsigned Internals::lengthFromRange(Element* scope, const Range* range, Exceptio
>     return length;
> }
> 
>-void Internals::setShouldLayoutFixedElementsRelativeToFrame(Document* document, bool enabled, ExceptionCode& ec)
>-{
>-    if (!document || !document->view()) {
>-        ec = INVALID_ACCESS_ERR;
>-        return;
>-    }
>-
>-    FrameView* frameView = document->view();
>-    frameView->setShouldLayoutFixedElementsRelativeToFrame(enabled);
>-}
>-
>-void Internals::setUnifiedTextCheckingEnabled(Document* document, bool enabled, ExceptionCode& ec)
>-{
>-    if (!document || !document->frame() || !document->frame()->settings()) {
>-        ec = INVALID_ACCESS_ERR;
>-        return;
>-    }
>-
>-    document->frame()->settings()->setUnifiedTextCheckerEnabled(enabled);
>-}
>-
>-bool Internals::unifiedTextCheckingEnabled(Document* document, ExceptionCode& ec)
>-{
>-    if (!document || !document->frame() || !document->frame()->settings()) {
>-        ec = INVALID_ACCESS_ERR;
>-        return false;
>-    }
>-
>-    return document->frame()->settings()->unifiedTextCheckerEnabled();
>-}
>-
>-float Internals::pageScaleFactor(Document *document, ExceptionCode& ec)
>-{
>-    if (!document || !document->page()) {
>-        ec = INVALID_ACCESS_ERR;
>-        return 0;
>-    }
>-
>-    return document->page()->pageScaleFactor();
>-}
>-
>-void Internals::setPageScaleFactor(Document* document, float scaleFactor, int x, int y, ExceptionCode& ec)
>-{
>-    if (!document || !document->page()) {
>-        ec = INVALID_ACCESS_ERR;
>-        return;
>-    }
>-    document->page()->setPageScaleFactor(scaleFactor, IntPoint(x, y));
>-}
>-
> int Internals::lastSpellCheckRequestSequence(Document* document, ExceptionCode& ec)
> {
>     SpellChecker* checker = spellchecker(document);
>@@ -665,16 +458,6 @@ int Internals::lastSpellCheckProcessedSequence(Document* document, ExceptionCode
>     return checker->lastProcessedSequence();
> }
> 
>-void Internals::setPerTileDrawingEnabled(Document* document, bool enabled, ExceptionCode& ec)
>-{
>-    if (!document || !document->settings()) {
>-        ec = INVALID_ACCESS_ERR;
>-        return;
>-    }
>-
>-    document->settings()->setPerTileDrawingEnabled(enabled);
>-}
>-
> Vector<String> Internals::userPreferredLanguages() const
> {
>     return WebCore::userPreferredLanguages();
>diff --git a/Source/WebCore/testing/Internals.h b/Source/WebCore/testing/Internals.h
>index f58cc4c170c7538b5cf7cc9529a771014c8e3b3f..8c85b686c8a678e4c5d29533554eaad386875b44 100644
>--- a/Source/WebCore/testing/Internals.h
>+++ b/Source/WebCore/testing/Internals.h
>@@ -37,6 +37,7 @@ namespace WebCore {
> class ClientRect;
> class Document;
> class Element;
>+class InternalSettings;
> class Node;
> class Range;
> 
>@@ -45,7 +46,7 @@ typedef int ExceptionCode;
> class Internals : public RefCounted<Internals>,
>                   public FrameDestructionObserver {
> public:
>-    static PassRefPtr<Internals> create();
>+    static PassRefPtr<Internals> create(Document*);
>     virtual ~Internals();
> 
>     void reset(Document*);
>@@ -66,32 +67,11 @@ public:
>     void selectColorInColorChooser(Element*, const String& colorValue);
> #endif
> 
>-#if ENABLE(INSPECTOR)
>-    void setInspectorResourcesDataSizeLimits(Document*, int maximumResourcesContentSize, int maximumSingleResourceContentSize, ExceptionCode&);
>-#else
>-    void setInspectorResourcesDataSizeLimits(Document*, int maximumResourcesContentSize, int maximumSingleResourceContentSize, ExceptionCode&) { }
>-#endif
>-
>     PassRefPtr<ClientRect> boundingBox(Element*, ExceptionCode&);
> 
>     unsigned markerCountForNode(Node*, const String&, ExceptionCode&);
>     PassRefPtr<Range> markerRangeForNode(Node*, const String&, unsigned, ExceptionCode&);
> 
>-    void setForceCompositingMode(Document*, bool enabled, ExceptionCode&);
>-    void setEnableCompositingForFixedPosition(Document*, bool enabled, ExceptionCode&);
>-    void setEnableCompositingForScrollableFrames(Document*, bool enabled, ExceptionCode&);
>-    void setAcceleratedDrawingEnabled(Document*, bool enabled, ExceptionCode&);
>-    void setAcceleratedFiltersEnabled(Document*, bool enabled, ExceptionCode&);
>-
>-    void setEnableScrollAnimator(Document*, bool enabled, ExceptionCode&);
>-    void setZoomAnimatorTransform(Document*, float scale, float tx, float ty, ExceptionCode&);
>-    void setZoomParameters(Document*, float scale, float x, float y, ExceptionCode&);
>-
>-    void setMockScrollbarsEnabled(Document*, bool enabled, ExceptionCode&);
>-
>-    void setPasswordEchoEnabled(Document*, bool enabled, ExceptionCode&);
>-    void setPasswordEchoDurationInSeconds(Document*, double durationInSeconds, ExceptionCode&);
>-
>     void setScrollViewPosition(Document*, long x, long y, ExceptionCode&);
> 
>     void setPagination(Document*, const String& mode, int gap, ExceptionCode&);
>@@ -106,31 +86,21 @@ public:
>     PassRefPtr<Range> rangeFromLocationAndLength(Element* scope, int rangeLocation, int rangeLength, ExceptionCode&);
>     unsigned locationFromRange(Element* scope, const Range*, ExceptionCode&);
>     unsigned lengthFromRange(Element* scope, const Range*, ExceptionCode&);
>-    void setShouldLayoutFixedElementsRelativeToFrame(Document*, bool, ExceptionCode&);
>-
>-    void setUnifiedTextCheckingEnabled(Document*, bool, ExceptionCode&);
>-    bool unifiedTextCheckingEnabled(Document*, ExceptionCode&);
> 
>     int lastSpellCheckRequestSequence(Document*, ExceptionCode&);
>     int lastSpellCheckProcessedSequence(Document*, ExceptionCode&);
>     
>-    float pageScaleFactor(Document*,  ExceptionCode&);
>-    void setPageScaleFactor(Document*, float scaleFactor, int x, int y, ExceptionCode&);
>-
>-    void setPerTileDrawingEnabled(Document*, bool enabled, ExceptionCode&);
>-
>     Vector<String> userPreferredLanguages() const;
>     void setUserPreferredLanguages(const Vector<String>&);
> 
>     static const char* internalsId;
> 
>+    InternalSettings* settings() const { return m_settings.get(); }
>+
> private:
>-    Internals();
>+    explicit Internals(Document*);
> 
>-    double m_passwordEchoDurationInSecondsBackup;
>-    bool m_passwordEchoEnabledBackup : 1;
>-    bool m_passwordEchoDurationInSecondsBackedUp : 1;
>-    bool m_passwordEchoEnabledBackedUp : 1;
>+    RefPtr<InternalSettings> m_settings;
> };
> 
> } // namespace WebCore
>diff --git a/Source/WebCore/testing/Internals.idl b/Source/WebCore/testing/Internals.idl
>index 66c9ea5199c8cbff8782e5c5dc258f95a7856103..5619d6425c75db5324a44e4a53e652b66141d7f3 100644
>--- a/Source/WebCore/testing/Internals.idl
>+++ b/Source/WebCore/testing/Internals.idl
>@@ -42,25 +42,10 @@ module window {
>         void selectColorInColorChooser(in Element element, in DOMString colorValue);
> #endif
> 
>-        void setInspectorResourcesDataSizeLimits(in Document document, in long maximumResourcesContentSize, in long maximumSingleResourceContentSize) raises(DOMException);
>-
>         ClientRect boundingBox(in Element element) raises(DOMException);
>         unsigned long markerCountForNode(in Node node, in DOMString markerType) raises(DOMException);
>         Range markerRangeForNode(in Node node, in DOMString markerType, in unsigned long index) raises(DOMException);
> 
>-        void setForceCompositingMode(in Document document, in boolean enabled) raises(DOMException);
>-        void setEnableCompositingForFixedPosition(in Document document, in boolean enabled) raises(DOMException);
>-        void setEnableCompositingForScrollableFrames(in Document document, in boolean enabled) raises(DOMException);
>-        void setAcceleratedDrawingEnabled(in Document document, in boolean enabled) raises(DOMException);
>-        void setAcceleratedFiltersEnabled(in Document document, in boolean enabled) raises(DOMException);
>-        void setEnableScrollAnimator(in Document document, in boolean enabled) raises(DOMException);
>-        void setZoomAnimatorTransform(in Document document, in float scale, in float tx, in float ty) raises(DOMException);
>-        void setZoomParameters(in Document document, in float scale, in float x, in float y) raises(DOMException);
>-        void setMockScrollbarsEnabled(in Document document, in boolean enabled) raises(DOMException);
>-
>-        void setPasswordEchoEnabled(in Document document, in boolean enabled) raises(DOMException);
>-        void setPasswordEchoDurationInSeconds(in Document document, in double durationInSeconds) raises(DOMException);
>-
>         void setScrollViewPosition(in Document document, in long x, in long y) raises(DOMException);
> 
>         void setPagination(in Document document, in DOMString mode, in long gap) raises(DOMException);
>@@ -77,17 +62,12 @@ module window {
>         unsigned long locationFromRange(in Element scope, in Range range) raises (DOMException);
>         unsigned long lengthFromRange(in Element scope, in Range range) raises (DOMException);
> 
>-        void setShouldLayoutFixedElementsRelativeToFrame(in Document document, in boolean enabled) raises(DOMException);
>-        void setUnifiedTextCheckingEnabled(in Document document, in boolean enabled) raises (DOMException);
>-        boolean unifiedTextCheckingEnabled(in Document document) raises (DOMException);
>-
>         long lastSpellCheckRequestSequence(in Document document) raises (DOMException);
>         long lastSpellCheckProcessedSequence(in Document document) raises (DOMException);
> 
>-        float pageScaleFactor(in Document document) raises(DOMException);
>-        void setPageScaleFactor(in Document document, in float scaleFactor, in long x, in long y) raises(DOMException);
>-
>         attribute [Custom] Array userPreferredLanguages;
>+
>+        readonly attribute InternalSettings settings;
>     };
> }
> 
>diff --git a/Source/WebCore/testing/js/WebCoreTestSupport.cpp b/Source/WebCore/testing/js/WebCoreTestSupport.cpp
>index 8a795bf2f6b3acc713e205b37c39ceb77f9a15da..1d2a4575b3777f88316b6ba5f9a3c8aabea107f5 100644
>--- a/Source/WebCore/testing/js/WebCoreTestSupport.cpp
>+++ b/Source/WebCore/testing/js/WebCoreTestSupport.cpp
>@@ -27,7 +27,6 @@
> #include "WebCoreTestSupport.h"
> 
> #include "Internals.h"
>-#include "JSDOMGlobalObject.h"
> #include "JSDocument.h"
> #include "JSInternals.h"
> #include <JavaScriptCore/APICast.h>
>@@ -43,7 +42,9 @@ void injectInternalsObject(JSContextRef context)
>     JSLock lock(SilenceAssertionsOnly);
>     ExecState* exec = toJS(context);
>     JSDOMGlobalObject* globalObject = static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject());
>-    globalObject->putDirect(exec->globalData(), Identifier(exec, Internals::internalsId), toJS(exec, globalObject, Internals::create()));
>+    ScriptExecutionContext* scriptContext = globalObject->scriptExecutionContext();
>+    Document* document = scriptContext->isDocument() ? static_cast<Document*>(scriptContext) : 0;
>+    globalObject->putDirect(exec->globalData(), Identifier(exec, Internals::internalsId), toJS(exec, globalObject, Internals::create(document)));
> }
> 
> void resetInternalsObject(JSContextRef context)
>diff --git a/Source/WebCore/testing/v8/WebCoreTestSupport.cpp b/Source/WebCore/testing/v8/WebCoreTestSupport.cpp
>index 76302ed82a69a000dd06c127538ed93f89013a04..28c3729f33349460bf0371a8dfda54dc6a9c8a3d 100644
>--- a/Source/WebCore/testing/v8/WebCoreTestSupport.cpp
>+++ b/Source/WebCore/testing/v8/WebCoreTestSupport.cpp
>@@ -42,7 +42,9 @@ void injectInternalsObject(v8::Local<v8::Context> context)
>     v8::Context::Scope contextScope(context);
>     v8::HandleScope scope;
> 
>-    context->Global()->Set(v8::String::New(Internals::internalsId), toV8(Internals::create()));
>+    ScriptExecutionContext* scriptContext = getScriptExecutionContext();
>+    Document* document = scriptContext->isDocument() ? static_cast<Document*>(scriptContext) : 0;
>+    context->Global()->Set(v8::String::New(Internals::internalsId), toV8(Internals::create(document)));
> }
> 
> void resetInternalsObject(v8::Local<v8::Context> context)
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index c5253b66014e3571f56ad178b6409c1e95f67339..399c9f75b0fed1821272224af7fa34c4dafb6a37 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,62 @@
>+2012-01-20  Hajime Morrita  <morrita@chromium.org>
>+
>+        [Refactoring][Internals] Should have InternalSettings
>+        https://bugs.webkit.org/show_bug.cgi?id=76424
>+
>+        Updated to follow API receiver change.
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * compositing/geometry/fixed-position-composited-page-scale-down.html:
>+        * compositing/geometry/fixed-position-composited-page-scale.html:
>+        * compositing/geometry/fixed-position-composited-switch.html:
>+        * compositing/geometry/fixed-position-iframe-composited-page-scale-down.html:
>+        * compositing/geometry/fixed-position-iframe-composited-page-scale.html:
>+        * compositing/geometry/fixed-position-transform-composited-page-scale-down.html:
>+        * compositing/geometry/fixed-position-transform-composited-page-scale.html:
>+        * compositing/iframes/resources/scrollgrandchild-inner.html:
>+        * compositing/resources/mock_scrollbars.js:
>+        * compositing/scaling/tiled-layer-recursion.html:
>+        * editing/input/resources/password-echo.js:
>+        (init):
>+        * editing/spelling/spellcheck-async-mutation.html:
>+        * editing/spelling/spellcheck-async.html:
>+        * editing/spelling/spelling-unified-emulation.html:
>+        * fast/dom/Element/scale-page-bounding-client-rect.html:
>+        * fast/dom/Element/scale-page-client-rects.html:
>+        * fast/dom/Range/scale-page-bounding-client-rect.html:
>+        * fast/dom/Range/scale-page-client-rects.html:
>+        * fast/events/scale-and-scroll-body.html:
>+        * fast/events/scale-and-scroll-iframe-body.html:
>+        * fast/events/scale-and-scroll-iframe-window.html:
>+        * fast/events/scale-and-scroll-window.html:
>+        * fast/events/script-tests/page-scaled-mouse-click-iframe.js:
>+        (iframeLoaded):
>+        * fast/events/script-tests/page-scaled-mouse-click.js:
>+        * fast/events/scroll-in-scaled-page-with-overflow-hidden.html:
>+        * fast/events/touch/page-scaled-touch-gesture-click.html:
>+        * fast/frames/frame-set-rotation-hit.html:
>+        * fast/frames/frame-set-scaling-hit.html:
>+        * fast/frames/iframe-double-scale-contents.html:
>+        * fast/repaint/background-scaling.html:
>+        * fast/repaint/fixed-in-page-scale.html:
>+        * fast/repaint/fixed-right-bottom-in-page-scale.html:
>+        * fast/repaint/fixed-right-in-page-scale.html:
>+        * fast/repaint/scale-page-shrink.html:
>+        * fast/transforms/selection-bounds-in-transformed-view.html:
>+        * http/tests/inspector/network-test.js:
>+        (resetInspectorResourcesData):
>+        * http/tests/inspector/network/network-content-replacement-embed.html:
>+        * http/tests/inspector/network/network-content-replacement-xhr.html:
>+        * platform/chromium/compositing/accelerated-drawing/alpha.html:
>+        * platform/chromium/compositing/accelerated-drawing/svg-filters.html:
>+        * platform/chromium/compositing/force-compositing-mode/force-composite-empty.html:
>+        * platform/chromium/compositing/force-compositing-mode/no-overflow-iframe-layer.html:
>+        * platform/chromium/compositing/force-compositing-mode/overflow-hidden-iframe-layer.html:
>+        * platform/chromium/compositing/force-compositing-mode/overflow-iframe-enter-compositing.html:
>+        * platform/chromium/compositing/force-compositing-mode/overflow-iframe-layer.html:
>+        * platform/chromium/compositing/force-compositing-mode/overflow-iframe-leave-compositing.html:
>+
> 2012-01-19  Cary Clark  <caryclark@google.com>
> 
>         [Skia Mac] Match style of platform error underline for misspellings
>diff --git a/LayoutTests/compositing/geometry/fixed-position-composited-page-scale-down.html b/LayoutTests/compositing/geometry/fixed-position-composited-page-scale-down.html
>index 3771f5e73e8acf06bc0ec7cb22f716b9c1a2bdf9..a8e84ac6c2e7f97191d3054901adece460fe618b 100644
>--- a/LayoutTests/compositing/geometry/fixed-position-composited-page-scale-down.html
>+++ b/LayoutTests/compositing/geometry/fixed-position-composited-page-scale-down.html
>@@ -19,8 +19,8 @@
> <script>
>   function scale() {
>     if (window.internals) {
>-      window.internals.setEnableCompositingForFixedPosition(document, true);
>-      window.internals.setPageScaleFactor(document, 0.5, 0, 0);
>+      window.internals.settings.setEnableCompositingForFixedPosition(true);
>+      window.internals.settings.setPageScaleFactor(0.5, 0, 0);
>     }
>     if (window.layoutTestController)
>       layoutTestController.dumpAsText(true);
>diff --git a/LayoutTests/compositing/geometry/fixed-position-composited-page-scale.html b/LayoutTests/compositing/geometry/fixed-position-composited-page-scale.html
>index 0c58541afc0712c998d8c4c9e09d9076969053ba..5327a18fac7dd560dc0af7db895c7f69d1733edf 100644
>--- a/LayoutTests/compositing/geometry/fixed-position-composited-page-scale.html
>+++ b/LayoutTests/compositing/geometry/fixed-position-composited-page-scale.html
>@@ -19,8 +19,8 @@
> <script>
>   function scale() {
>     if (window.internals) {
>-      window.internals.setEnableCompositingForFixedPosition(document, true);
>-      window.internals.setPageScaleFactor(document, 2, 0, 0);
>+      window.internals.settings.setEnableCompositingForFixedPosition(true);
>+      window.internals.settings.setPageScaleFactor(2, 0, 0);
>     }
>     if (window.layoutTestController)
>       layoutTestController.dumpAsText(true);
>diff --git a/LayoutTests/compositing/geometry/fixed-position-composited-switch.html b/LayoutTests/compositing/geometry/fixed-position-composited-switch.html
>index d1997e3b50ff319e5e6ffc1c7bf01de7d2af306b..daad9c9d22b9ac2596ca58538073cde15d551b0e 100644
>--- a/LayoutTests/compositing/geometry/fixed-position-composited-switch.html
>+++ b/LayoutTests/compositing/geometry/fixed-position-composited-switch.html
>@@ -19,7 +19,7 @@
>   </style>
>   <script type="text/javascript" charset="utf-8">
>     if (window.internals) 
>-      window.internals.setEnableCompositingForFixedPosition(document, true);
>+      window.internals.settings.setEnableCompositingForFixedPosition(true);
> 
>     function doTest()
>     {
>diff --git a/LayoutTests/compositing/geometry/fixed-position-iframe-composited-page-scale-down.html b/LayoutTests/compositing/geometry/fixed-position-iframe-composited-page-scale-down.html
>index 3c725dae141d5a3c57e5a64241c56901b408ff03..ea3023e7a04d9c6d8f97658ca52a99dc7b4053da 100644
>--- a/LayoutTests/compositing/geometry/fixed-position-iframe-composited-page-scale-down.html
>+++ b/LayoutTests/compositing/geometry/fixed-position-iframe-composited-page-scale-down.html
>@@ -19,8 +19,8 @@
> <script>
>   function test() {
>     if (window.internals) {
>-      window.internals.setEnableCompositingForFixedPosition(document, true);
>-      window.internals.setPageScaleFactor(document, 0.5, 0, 0);
>+      window.internals.settings.setEnableCompositingForFixedPosition(true);
>+      window.internals.settings.setPageScaleFactor(0.5, 0, 0);
>     }
>     if (window.layoutTestController)
>       layoutTestController.dumpAsText(true);
>diff --git a/LayoutTests/compositing/geometry/fixed-position-iframe-composited-page-scale.html b/LayoutTests/compositing/geometry/fixed-position-iframe-composited-page-scale.html
>index 16ab0751cbd030f24eccad1f576101f0854d6361..40dd74309d592117ba0922ee72050a6d694bcb0e 100644
>--- a/LayoutTests/compositing/geometry/fixed-position-iframe-composited-page-scale.html
>+++ b/LayoutTests/compositing/geometry/fixed-position-iframe-composited-page-scale.html
>@@ -19,8 +19,8 @@
> <script>
>   function test() {
>     if (window.internals) {
>-      window.internals.setEnableCompositingForFixedPosition(document, true);
>-      window.internals.setPageScaleFactor(document, 2, 0, 0);
>+      window.internals.settings.setEnableCompositingForFixedPosition(true);
>+      window.internals.settings.setPageScaleFactor(2, 0, 0);
>     }
>     if (window.layoutTestController)
>       layoutTestController.dumpAsText(true);
>diff --git a/LayoutTests/compositing/geometry/fixed-position-transform-composited-page-scale-down.html b/LayoutTests/compositing/geometry/fixed-position-transform-composited-page-scale-down.html
>index 45ce035f29229460e3342780cbf4c1fb56ec2366..c11eddb5cf83363b7c608d6c55a43dda5010d139 100644
>--- a/LayoutTests/compositing/geometry/fixed-position-transform-composited-page-scale-down.html
>+++ b/LayoutTests/compositing/geometry/fixed-position-transform-composited-page-scale-down.html
>@@ -21,8 +21,8 @@
> <script>
>   function scale() {
>     if (window.internals) {
>-      window.internals.setEnableCompositingForFixedPosition(document, true);
>-      window.internals.setPageScaleFactor(document, 0.5, 0, 0);
>+      window.internals.settings.setEnableCompositingForFixedPosition(true);
>+      window.internals.settings.setPageScaleFactor(0.5, 0, 0);
>     }
>     if (window.layoutTestController)
>       layoutTestController.dumpAsText(true);
>diff --git a/LayoutTests/compositing/geometry/fixed-position-transform-composited-page-scale.html b/LayoutTests/compositing/geometry/fixed-position-transform-composited-page-scale.html
>index df8667b1a24d93ed2319c9c495a15976cad8dadd..4e99c8eb3b279cdfdf4b294f98504cf844642f21 100644
>--- a/LayoutTests/compositing/geometry/fixed-position-transform-composited-page-scale.html
>+++ b/LayoutTests/compositing/geometry/fixed-position-transform-composited-page-scale.html
>@@ -21,8 +21,8 @@
> <script>
>   function scale() {
>     if (window.internals) {
>-      window.internals.setEnableCompositingForFixedPosition(document, true);
>-      window.internals.setPageScaleFactor(document, 2, 0, 0);
>+      window.internals.settings.setEnableCompositingForFixedPosition(true);
>+      window.internals.settings.setPageScaleFactor(2, 0, 0);
>     }
>     if (window.layoutTestController)
>       layoutTestController.dumpAsText(true);
>diff --git a/LayoutTests/compositing/iframes/resources/scrollgrandchild-inner.html b/LayoutTests/compositing/iframes/resources/scrollgrandchild-inner.html
>index c42a5f123fb635cc207074a1218a6ec2676a35a2..b0c103b73640f5ef607a9e51d2e478351c7f880a 100644
>--- a/LayoutTests/compositing/iframes/resources/scrollgrandchild-inner.html
>+++ b/LayoutTests/compositing/iframes/resources/scrollgrandchild-inner.html
>@@ -23,7 +23,7 @@
>   </style>
>   <script>
>     if (window.internals)
>-      window.internals.setMockScrollbarsEnabled(document, true);
>+      window.internals.settings.setMockScrollbarsEnabled(true);
>     if (window.layoutTestController) {
>       layoutTestController.dumpAsText(true);
>       layoutTestController.waitUntilDone();
>diff --git a/LayoutTests/compositing/resources/mock_scrollbars.js b/LayoutTests/compositing/resources/mock_scrollbars.js
>index 7428fbaa0ff9204023157a33d5b99224c7411c01..71bdf703d7ccbc1022d47e3b0aed6d7062d8c54f 100644
>--- a/LayoutTests/compositing/resources/mock_scrollbars.js
>+++ b/LayoutTests/compositing/resources/mock_scrollbars.js
>@@ -1,3 +1,3 @@
> if (window.internals) {
>-  window.internals.setMockScrollbarsEnabled(document, true);
>+  window.internals.settings.setMockScrollbarsEnabled(true);
> }
>diff --git a/LayoutTests/compositing/scaling/tiled-layer-recursion.html b/LayoutTests/compositing/scaling/tiled-layer-recursion.html
>index 399d0e0f046eb4aaf18a53f1ea3e10cd2ebbbf6e..fd321a38432c5ea22f637d087b03d71027027ce2 100644
>--- a/LayoutTests/compositing/scaling/tiled-layer-recursion.html
>+++ b/LayoutTests/compositing/scaling/tiled-layer-recursion.html
>@@ -17,7 +17,7 @@
>     function scalePage()
>     {
>       if (window.internals)
>-        window.internals.setPageScaleFactor(document, 1.50025, 0, 0);
>+        window.internals.settings.setPageScaleFactor(1.50025, 0, 0);
>     }
>   
>     window.addEventListener('load', scalePage, false);
>diff --git a/LayoutTests/editing/input/resources/password-echo.js b/LayoutTests/editing/input/resources/password-echo.js
>index 7945e105c409a4f9df1b996921d9d83b496ee963..a7641c078cc4d797b812a05a3baa393e50b6ca08 100644
>--- a/LayoutTests/editing/input/resources/password-echo.js
>+++ b/LayoutTests/editing/input/resources/password-echo.js
>@@ -80,8 +80,8 @@ function init(tests)
>         layoutTestController.dumpAsText();
>         layoutTestController.waitUntilDone();
>         if (window.internals) {
>-            window.internals.setPasswordEchoEnabled(document, true);
>-            window.internals.setPasswordEchoDurationInSeconds(document, 0.1);
>+            window.internals.settings.setPasswordEchoEnabled(true);
>+            window.internals.settings.setPasswordEchoDurationInSeconds(0.1);
>             testnode = document.getElementById('testnode');
>             run(tests, -1);
>         }
>diff --git a/LayoutTests/editing/spelling/spellcheck-async-mutation.html b/LayoutTests/editing/spelling/spellcheck-async-mutation.html
>index 1671402ea65fa268eecd6197deae4a5a1c317109..e6144a918b9bd53b0a223222069375329cd50fae 100644
>--- a/LayoutTests/editing/spelling/spellcheck-async-mutation.html
>+++ b/LayoutTests/editing/spelling/spellcheck-async-mutation.html
>@@ -36,7 +36,7 @@ if (window.layoutTestController) {
> }
> 
> if (window.internals)
>-    internals.setUnifiedTextCheckingEnabled(document, true);
>+    internals.settings.setUnifiedTextCheckingEnabled(true);
> 
> var sourceIds = ['source'];
> var destElems = ['textarea', 'input', 'contenteditable'];
>@@ -77,7 +77,7 @@ function doTestIfAny() {
>     removeAllChildren(document.getElementById('move-target'));
> 
>     if (window.internals)
>-        internals.setUnifiedTextCheckingEnabled(document, false);
>+        internals.settings.setUnifiedTextCheckingEnabled(false);
> 
>     if (window.layoutTestController) {
>         layoutTestController.setAsynchronousSpellCheckingEnabled(false);
>diff --git a/LayoutTests/editing/spelling/spellcheck-async.html b/LayoutTests/editing/spelling/spellcheck-async.html
>index 7270a3350850db55b79e04682593ed3060df0aed..61144d7d38a285d55602342e89bb78d34c473b2a 100644
>--- a/LayoutTests/editing/spelling/spellcheck-async.html
>+++ b/LayoutTests/editing/spelling/spellcheck-async.html
>@@ -27,7 +27,7 @@ if (window.layoutTestController) {
> }
> 
> if (window.internals)
>-    internals.setUnifiedTextCheckingEnabled(document, true);
>+    internals.settings.setUnifiedTextCheckingEnabled(true);
> 
> var container = document.getElementById('container');
> function removeChildren(node) {
>@@ -57,7 +57,7 @@ function doTestIfAny() {
>     // No more tests.
>     removeChildren(container);
>     if (window.internals)
>-        internals.setUnifiedTextCheckingEnabled(document, false);
>+        internals.settings.setUnifiedTextCheckingEnabled(false);
> 
>     if (window.layoutTestController) {
>         layoutTestController.setAsynchronousSpellCheckingEnabled(false);
>diff --git a/LayoutTests/editing/spelling/spelling-unified-emulation.html b/LayoutTests/editing/spelling/spelling-unified-emulation.html
>index 2a9eeb7bc2001ab8834e69ef88984e6315e6605e..48fcfcf0a352da71a751208a8c25eabf1fccf69a 100644
>--- a/LayoutTests/editing/spelling/spelling-unified-emulation.html
>+++ b/LayoutTests/editing/spelling/spelling-unified-emulation.html
>@@ -31,7 +31,7 @@ if (window.layoutTestController) {
> }
> 
> if (window.internals)
>-    internals.setUnifiedTextCheckingEnabled(document, true);
>+    internals.settings.setUnifiedTextCheckingEnabled(true);
> 
> var testData = [
>     { text: 'zz', marked: ['zz'] },
>@@ -85,7 +85,7 @@ for (var i = 0; i < testData.length; ++i) {
> }
> 
> if (window.internals)
>-    internals.setUnifiedTextCheckingEnabled(document, false);
>+    internals.settings.setUnifiedTextCheckingEnabled(false);
> 
> var successfullyParsed = true;
> </script>
>diff --git a/LayoutTests/fast/dom/Element/scale-page-bounding-client-rect.html b/LayoutTests/fast/dom/Element/scale-page-bounding-client-rect.html
>index 602289b33512915aeb9de652fee75829d099ca73..330b5577a91ae161d24410efaba35ebc31491e66 100644
>--- a/LayoutTests/fast/dom/Element/scale-page-bounding-client-rect.html
>+++ b/LayoutTests/fast/dom/Element/scale-page-bounding-client-rect.html
>@@ -9,7 +9,7 @@ function testRects()
>     
>     var div = document.getElementById("div");
>     var rect = div.getBoundingClientRect();
>-    window.internals.setPageScaleFactor(document, 2, 0, 0);
>+    window.internals.settings.setPageScaleFactor(2, 0, 0);
>     var scaledRect = div.getBoundingClientRect();
> 
>     var result = document.getElementById("result");
>diff --git a/LayoutTests/fast/dom/Element/scale-page-client-rects.html b/LayoutTests/fast/dom/Element/scale-page-client-rects.html
>index 8fa2a31105aa7688bc358e9b538d10348c7e8af3..176ac06914d1a749f4ecb0bba830257776b55a30 100644
>--- a/LayoutTests/fast/dom/Element/scale-page-client-rects.html
>+++ b/LayoutTests/fast/dom/Element/scale-page-client-rects.html
>@@ -9,7 +9,7 @@ function testRects()
>     
>     var div = document.getElementById("div");
>     var rectList = div.getClientRects();
>-    window.internals.setPageScaleFactor(document, 2, 0, 0);
>+    window.internals.settings.setPageScaleFactor(2, 0, 0);
>     var scaledRectList = div.getClientRects();
> 
>     var result = document.getElementById("result");
>diff --git a/LayoutTests/fast/dom/Range/scale-page-bounding-client-rect.html b/LayoutTests/fast/dom/Range/scale-page-bounding-client-rect.html
>index f12c0fd783183bc58bb84b08d6c087920a5e69e8..18bd6fa952302bb5855a646a4fda48a14389dbf9 100644
>--- a/LayoutTests/fast/dom/Range/scale-page-bounding-client-rect.html
>+++ b/LayoutTests/fast/dom/Range/scale-page-bounding-client-rect.html
>@@ -11,7 +11,7 @@ function testRects()
>     range.selectNodeContents(document.getElementById('div'));
>     var rect = range.getBoundingClientRect();
>    
>-    window.internals.setPageScaleFactor(document, 2, 0, 0);
>+    window.internals.settings.setPageScaleFactor(2, 0, 0);
>     var scaledRange = document.createRange();
>     scaledRange.selectNodeContents(document.getElementById('div'));
>     var scaledRect = scaledRange.getBoundingClientRect();
>diff --git a/LayoutTests/fast/dom/Range/scale-page-client-rects.html b/LayoutTests/fast/dom/Range/scale-page-client-rects.html
>index 3ef36795563223a8b743db20df804011d8fd0813..e4ced0f7a7eb14de3abc77f5de2d2fa6f9080915 100644
>--- a/LayoutTests/fast/dom/Range/scale-page-client-rects.html
>+++ b/LayoutTests/fast/dom/Range/scale-page-client-rects.html
>@@ -12,7 +12,7 @@ function testRects()
>     var rectList = range.getClientRects();
>     var rect = rectList[0];
>    
>-    window.internals.setPageScaleFactor(document, 2, 0, 0);
>+    window.internals.settings.setPageScaleFactor(2, 0, 0);
>     var scaledRange = document.createRange();
>     scaledRange.selectNodeContents(document.getElementById('div'));
>     var scaledRectList = scaledRange.getClientRects();
>diff --git a/LayoutTests/fast/events/scale-and-scroll-body.html b/LayoutTests/fast/events/scale-and-scroll-body.html
>index a570d7933f60ae68cc7f9ca0fd0d538c73a9eca3..9e6e005ee3c0f9e974001caa380aeaac0d01c382 100644
>--- a/LayoutTests/fast/events/scale-and-scroll-body.html
>+++ b/LayoutTests/fast/events/scale-and-scroll-body.html
>@@ -10,7 +10,7 @@
>       window.enablePixelTesting = true;
> 
>       function scroll() {
>-          // The page scale, as set by window.internals.setPageScaleFactor should not be apparent
>+          // The page scale, as set by window.internals.settings.setPageScaleFactor should not be apparent
>           // to javascript. So, we expect scrolling to (100,100) to be page coordinates, rather
>           // than device pixels.
>           document.body.scrollLeft = 100;
>@@ -26,7 +26,7 @@
>           var scaleFactor = 2.0;
>           var scaleOffset = 0;
>           if (window.internals) {
>-             window.internals.setPageScaleFactor(document, scaleFactor, scaleOffset, scaleOffset);
>+             window.internals.settings.setPageScaleFactor(scaleFactor, scaleOffset, scaleOffset);
>           }
>       }
> 
>diff --git a/LayoutTests/fast/events/scale-and-scroll-iframe-body.html b/LayoutTests/fast/events/scale-and-scroll-iframe-body.html
>index 8195b99fcaeefb8afea6a2ffbb262aaf7fc2a288..284002c5a2eafa145891893b292083bed3099195 100644
>--- a/LayoutTests/fast/events/scale-and-scroll-iframe-body.html
>+++ b/LayoutTests/fast/events/scale-and-scroll-iframe-body.html
>@@ -25,7 +25,7 @@
>             var scaleFactor = 0.5;
>             var scaleOffset = 0;
>             if (window.internals) {
>-                 window.internals.setPageScaleFactor(document, scaleFactor, scaleOffset, scaleOffset);
>+                 window.internals.settings.setPageScaleFactor(scaleFactor, scaleOffset, scaleOffset);
>             }
>         }
> 
>diff --git a/LayoutTests/fast/events/scale-and-scroll-iframe-window.html b/LayoutTests/fast/events/scale-and-scroll-iframe-window.html
>index 77935812a165012f8255662c9def0c627b206725..a7342b524220c50da8621f0e9b803b1129ec9127 100644
>--- a/LayoutTests/fast/events/scale-and-scroll-iframe-window.html
>+++ b/LayoutTests/fast/events/scale-and-scroll-iframe-window.html
>@@ -24,7 +24,7 @@
>             var scaleFactor = 0.5;
>             var scaleOffset = 0;
>             if (window.internals) {
>-                 window.internals.setPageScaleFactor(document, scaleFactor, scaleOffset, scaleOffset);
>+                 window.internals.settings.setPageScaleFactor(scaleFactor, scaleOffset, scaleOffset);
>             }
>         }
> 
>diff --git a/LayoutTests/fast/events/scale-and-scroll-window.html b/LayoutTests/fast/events/scale-and-scroll-window.html
>index 5c35e65cca18ea42722408d4242102aa055c56b1..9b4d34f5d12f516859e1c77aa59470bd8177aed6 100644
>--- a/LayoutTests/fast/events/scale-and-scroll-window.html
>+++ b/LayoutTests/fast/events/scale-and-scroll-window.html
>@@ -10,7 +10,7 @@
>       window.enablePixelTesting = true;
> 
>       function scroll() {
>-          // The page scale, as set by window.internals.setPageScaleFactor should not be apparent
>+          // The page scale, as set by window.internals.settings.setPageScaleFactor should not be apparent
>           // to javascript. So, we expect scrolling to (100,100) to be page coordinates, rather
>           // than device pixels.
>           window.scrollTo(100,100);
>@@ -25,7 +25,7 @@
>           var scaleFactor = 2.0;
>           var scaleOffset = 0;
>           if (window.internals) {
>-             window.internals.setPageScaleFactor(document, scaleFactor, scaleOffset, scaleOffset);
>+             window.internals.settings.setPageScaleFactor(scaleFactor, scaleOffset, scaleOffset);
>           }
>       }
> 
>diff --git a/LayoutTests/fast/events/script-tests/page-scaled-mouse-click-iframe.js b/LayoutTests/fast/events/script-tests/page-scaled-mouse-click-iframe.js
>index 397f8de37c87375cb94446f5024e5db794ea6122..df455a2f6edba6e710c6e20aa3bafd7e060bc800 100644
>--- a/LayoutTests/fast/events/script-tests/page-scaled-mouse-click-iframe.js
>+++ b/LayoutTests/fast/events/script-tests/page-scaled-mouse-click-iframe.js
>@@ -60,15 +60,15 @@ function iframeLoaded() {
> 
>     testEvents(0, "Unscaled", "click(10, 10)");
> 
>-    window.internals.setPageScaleFactor(document, 0.5, 0, 0);
>+    window.internals.settings.setPageScaleFactor(0.5, 0, 0);
>     testEvents(0, "setPageScale(0.5)", "click(20, 20)");
> 
>-    window.internals.setPageScaleFactor(document, 1.0, 0, 0);
>+    window.internals.settings.setPageScaleFactor(1.0, 0, 0);
>     html.style["-webkit-transform"] = "scale(0.5, 2.0)";
>     html.style["-webkit-transform-origin"] = "0 0";
>     testEvents(0, "CSS scale(0.5, 2.0)", "click(20, 5)");
> 
>-    window.internals.setPageScaleFactor(document, 0.5, 0, 0);
>+    window.internals.settings.setPageScaleFactor(0.5, 0, 0);
>     testEvents(0, "setPageScale(0.5), CSS scale(0.5, 2.0)", "click(40, 10)");
>   }
> 
>diff --git a/LayoutTests/fast/events/script-tests/page-scaled-mouse-click.js b/LayoutTests/fast/events/script-tests/page-scaled-mouse-click.js
>index 44e683cc64ee9bf7bf955a6cf0f706809d6f58c3..71bf27ad9b509cab38e7039a12127eeec4cbb75e 100644
>--- a/LayoutTests/fast/events/script-tests/page-scaled-mouse-click.js
>+++ b/LayoutTests/fast/events/script-tests/page-scaled-mouse-click.js
>@@ -50,6 +50,6 @@ if (window.eventSender && window.internals) {
>     // parts of the document are under the mouse.
>     testEvents(0, "Unscaled", "click(10, 10)");
> 
>-    window.internals.setPageScaleFactor(document, 0.5, 0, 0);
>+    window.internals.settings.setPageScaleFactor(0.5, 0, 0);
>     testEvents(0, "setPageScale(0.5)", "click(20, 20)");
> }
>diff --git a/LayoutTests/fast/events/scroll-in-scaled-page-with-overflow-hidden.html b/LayoutTests/fast/events/scroll-in-scaled-page-with-overflow-hidden.html
>index ff6d2c9909f692cf4e985ae696d23fcfbeb2906d..72c3cce2cbd87590206e36a1880c5344a8eb0d84 100644
>--- a/LayoutTests/fast/events/scroll-in-scaled-page-with-overflow-hidden.html
>+++ b/LayoutTests/fast/events/scroll-in-scaled-page-with-overflow-hidden.html
>@@ -23,7 +23,7 @@
>         document.body.offsetLeft;
> 
>         if (window.internals)
>-            window.internals.setPageScaleFactor(document, 2, 0, 0);
>+            window.internals.settings.setPageScaleFactor(2, 0, 0);
> 
>         shouldBe("window.document.body.scrollTop", "0");
> 
>diff --git a/LayoutTests/fast/events/touch/page-scaled-touch-gesture-click.html b/LayoutTests/fast/events/touch/page-scaled-touch-gesture-click.html
>index 0db955b00999eb7b9aee82aafc167810a47fd843..2e6dbddb85032443119a70a1cdf85a36a17bac83 100644
>--- a/LayoutTests/fast/events/touch/page-scaled-touch-gesture-click.html
>+++ b/LayoutTests/fast/events/touch/page-scaled-touch-gesture-click.html
>@@ -84,7 +84,7 @@ function endTest()
> 
> function runTest() {
>     if (window.internals) {
>-        window.internals.setPageScaleFactor(document, 0.5, 0, 0);
>+        window.internals.settings.setPageScaleFactor(0.5, 0, 0);
>     }
> 
>     var div = document.getElementById('touchtarget');
>diff --git a/LayoutTests/fast/frames/frame-set-rotation-hit.html b/LayoutTests/fast/frames/frame-set-rotation-hit.html
>index cc2c214ad226177f9a96d52ec941a63d4836e162..ad49a4ffcb43e3dcfd797fd2f400f95e678226bc 100644
>--- a/LayoutTests/fast/frames/frame-set-rotation-hit.html
>+++ b/LayoutTests/fast/frames/frame-set-rotation-hit.html
>@@ -7,7 +7,7 @@
>             if (!window.eventSender || !window.internals)
>                 return;
>             // Scale the page and resize the frames to verify hit testing on the frameset
>-            window.internals.setPageScaleFactor(document, 0.5, 0, 0);
>+            window.internals.settings.setPageScaleFactor(0.5, 0, 0);
>             var leftPanelWidth = window.innerWidth / 8;
>             eventSender.mouseMoveTo(window.innerWidth / 4, leftPanelWidth);
>             eventSender.mouseDown();
>diff --git a/LayoutTests/fast/frames/frame-set-scaling-hit.html b/LayoutTests/fast/frames/frame-set-scaling-hit.html
>index b2211b6b8b9ff6d9a1a30f3dfd6a936153d37100..25f3f60dd2f3ee571678f3141db1790f6f9d0f2e 100644
>--- a/LayoutTests/fast/frames/frame-set-scaling-hit.html
>+++ b/LayoutTests/fast/frames/frame-set-scaling-hit.html
>@@ -8,7 +8,7 @@
>                 return;
>             // Scale the page and resize the frames to verify hit testing on the frameset
>             var leftPanelWidth = window.innerWidth / 8;
>-            window.internals.setPageScaleFactor(document, 0.5, 0, 0);
>+            window.internals.settings.setPageScaleFactor(0.5, 0, 0);
>             eventSender.mouseMoveTo(leftPanelWidth, window.innerHeight / 4);
>             eventSender.mouseDown();
>             eventSender.mouseMoveTo(2 * leftPanelWidth, window.innerHeight / 4);
>diff --git a/LayoutTests/fast/frames/iframe-double-scale-contents.html b/LayoutTests/fast/frames/iframe-double-scale-contents.html
>index d3af5f697b0760f57d5f2075a104d2041675fb05..d2228acff4b907e9d5874a90c608393b93e63f03 100644
>--- a/LayoutTests/fast/frames/iframe-double-scale-contents.html
>+++ b/LayoutTests/fast/frames/iframe-double-scale-contents.html
>@@ -23,7 +23,7 @@
>       function scalePage(scaleFactor) {
>           var scaleOffset = 0;
>           if (window.internals) {
>-            window.internals.setPageScaleFactor(document, scaleFactor, scaleOffset, scaleOffset);
>+            window.internals.settings.setPageScaleFactor(scaleFactor, scaleOffset, scaleOffset);
>           }
>       }
> 
>diff --git a/LayoutTests/fast/repaint/background-scaling.html b/LayoutTests/fast/repaint/background-scaling.html
>index e8cff0d1656b55be868446250557133971387a3d..6bb911e608146e9eb8053d7db6fcccd3e205bee4 100644
>--- a/LayoutTests/fast/repaint/background-scaling.html
>+++ b/LayoutTests/fast/repaint/background-scaling.html
>@@ -5,7 +5,7 @@
>     function repaintTest()
>     {
>         if (window.internals)
>-            window.internals.setPageScaleFactor(document, 0.25, 0, 0);
>+            window.internals.settings.setPageScaleFactor(0.25, 0, 0);
>     }
> </script> 
> </head> 
>diff --git a/LayoutTests/fast/repaint/fixed-in-page-scale.html b/LayoutTests/fast/repaint/fixed-in-page-scale.html
>index a95c572868660c553b6887ae7085bfd415cb300b..b7657eff9dc8fe90c4bd5d187196749d32d88183 100644
>--- a/LayoutTests/fast/repaint/fixed-in-page-scale.html
>+++ b/LayoutTests/fast/repaint/fixed-in-page-scale.html
>@@ -9,7 +9,7 @@
>     <script>
>       window.enablePixelTesting = true;
>       if (window.internals)
>-          window.internals.setShouldLayoutFixedElementsRelativeToFrame(document, true);
>+          window.internals.settings.setShouldLayoutFixedElementsRelativeToFrame(true);
> 
>       function scroll() {
>           window.scrollTo(100,100);
>diff --git a/LayoutTests/fast/repaint/fixed-right-bottom-in-page-scale.html b/LayoutTests/fast/repaint/fixed-right-bottom-in-page-scale.html
>index 12fc45a7ca73381ee3c934ed618c7e219c71bd7b..961384964720edf80d077b12e652ff2c475f9775 100644
>--- a/LayoutTests/fast/repaint/fixed-right-bottom-in-page-scale.html
>+++ b/LayoutTests/fast/repaint/fixed-right-bottom-in-page-scale.html
>@@ -9,7 +9,7 @@
>     <script>
>       window.enablePixelTesting = true;
>       if (window.internals)
>-          window.internals.setShouldLayoutFixedElementsRelativeToFrame(document, true);
>+          window.internals.settings.setShouldLayoutFixedElementsRelativeToFrame(true);
> 
>       function scroll() {
>           window.scrollTo(100,100);
>diff --git a/LayoutTests/fast/repaint/fixed-right-in-page-scale.html b/LayoutTests/fast/repaint/fixed-right-in-page-scale.html
>index 90383e869b60eddca08225821f1f0ff450450a6e..a28c146cefe710fdb015c0eb903d694241e0448c 100644
>--- a/LayoutTests/fast/repaint/fixed-right-in-page-scale.html
>+++ b/LayoutTests/fast/repaint/fixed-right-in-page-scale.html
>@@ -9,7 +9,7 @@
>     <script>
>       window.enablePixelTesting = true;
>       if (window.internals)
>-          window.internals.setShouldLayoutFixedElementsRelativeToFrame(document, true);
>+          window.internals.settings.setShouldLayoutFixedElementsRelativeToFrame(true);
> 
>       function scroll() {
>           window.scrollTo(100,100);
>diff --git a/LayoutTests/fast/repaint/scale-page-shrink.html b/LayoutTests/fast/repaint/scale-page-shrink.html
>index 92f3e3d5f6f66e1c99e197bfe7e14faa02f0d040..09bd221831d7f6be96af740db9f971891667b269 100644
>--- a/LayoutTests/fast/repaint/scale-page-shrink.html
>+++ b/LayoutTests/fast/repaint/scale-page-shrink.html
>@@ -5,7 +5,7 @@
>     function repaintTest()
>     {
>         if (window.internals)
>-            window.internals.setPageScaleFactor(document, 0.25, 0, 0);
>+            window.internals.settings.setPageScaleFactor(0.25, 0, 0);
>     }
> </script>
> </head>
>diff --git a/LayoutTests/fast/transforms/selection-bounds-in-transformed-view.html b/LayoutTests/fast/transforms/selection-bounds-in-transformed-view.html
>index 10e26bb89172dbfb077070b6db01d000e2982071..ff2633909720b9dc5a225b208fc8fcd815308c83 100644
>--- a/LayoutTests/fast/transforms/selection-bounds-in-transformed-view.html
>+++ b/LayoutTests/fast/transforms/selection-bounds-in-transformed-view.html
>@@ -6,7 +6,7 @@
>     <script>
>         if (window.layoutTestController && window.internals) {
>             layoutTestController.dumpAsText();
>-            window.internals.setPageScaleFactor(document, 2, 0, 0);
>+            window.internals.settings.setPageScaleFactor(2, 0, 0);
>         }
> 
>         document.execCommand("FindString", false, "target");
>diff --git a/LayoutTests/http/tests/inspector/network-test.js b/LayoutTests/http/tests/inspector/network-test.js
>index 1413084c9883d36c7145168f13e3800dd7dd6627..3382fef24275b4ca7ac525b85c3ad6a6f3a89f44 100644
>--- a/LayoutTests/http/tests/inspector/network-test.js
>+++ b/LayoutTests/http/tests/inspector/network-test.js
>@@ -44,7 +44,7 @@ function resetInspectorResourcesData()
>     if (!window.internals)
>         return false;
> 
>-    internals.setInspectorResourcesDataSizeLimits(document, 10 * 1000 * 1000, 1000 * 1000);
>+    internals.settings.setInspectorResourcesDataSizeLimits(10 * 1000 * 1000, 1000 * 1000);
>     return true;
> }
> 
>diff --git a/LayoutTests/http/tests/inspector/network/network-content-replacement-embed.html b/LayoutTests/http/tests/inspector/network/network-content-replacement-embed.html
>index 1b742cbbce2f3d4b24393c8d0006a2deeb8b2331..e1d56980ab5e317ef1486933591c7d8e751ffa3e 100644
>--- a/LayoutTests/http/tests/inspector/network/network-content-replacement-embed.html
>+++ b/LayoutTests/http/tests/inspector/network/network-content-replacement-embed.html
>@@ -31,7 +31,7 @@ function loadURLs()
>     }
>     // Each '*' symbol in original data will use two bytes in String object
>     // after decoding, hence multiplying by two.
>-    internals.setInspectorResourcesDataSizeLimits(document, 2*300, 2*200);
>+    internals.settings.setInspectorResourcesDataSizeLimits(2*300, 2*200);
> 
>     // Here we test replacement logic. We save first two resources content,
>     // discard third resource content once we see its size exceeds limit,
>diff --git a/LayoutTests/http/tests/inspector/network/network-content-replacement-xhr.html b/LayoutTests/http/tests/inspector/network/network-content-replacement-xhr.html
>index fb475c1bf720cd08fc5f21a68afa5be1ff323fe8..a893d0961053236c0e0a3f456915e76d472031bf 100644
>--- a/LayoutTests/http/tests/inspector/network/network-content-replacement-xhr.html
>+++ b/LayoutTests/http/tests/inspector/network/network-content-replacement-xhr.html
>@@ -10,7 +10,7 @@ function loadData()
>         return;
>     }
>     // Each '*' symbol will use two bytes in String object, hence multiplying by two.
>-    internals.setInspectorResourcesDataSizeLimits(document, 2*300, 2*200);
>+    internals.settings.setInspectorResourcesDataSizeLimits(2*300, 2*200);
> 
>     // Here we test replacement logic. We save first two resources content,
>     // discard third resource content once we see its size exceeds limit,
>diff --git a/LayoutTests/platform/chromium/compositing/accelerated-drawing/alpha.html b/LayoutTests/platform/chromium/compositing/accelerated-drawing/alpha.html
>index ca6e8072103ca6cb261aa0ca6dc1597f2fcfde7e..8d43896f830a98a1791bb0f984ced6bca8636edf 100644
>--- a/LayoutTests/platform/chromium/compositing/accelerated-drawing/alpha.html
>+++ b/LayoutTests/platform/chromium/compositing/accelerated-drawing/alpha.html
>@@ -21,7 +21,7 @@
>     layoutTestController.dumpAsText(true); // This is only useful as pixel test.
> 
>   if (window.internals)
>-    window.internals.setAcceleratedDrawingEnabled(document, true);
>+    window.internals.settings.setAcceleratedDrawingEnabled(true);
> </script>
> </head>
> 
>diff --git a/LayoutTests/platform/chromium/compositing/accelerated-drawing/svg-filters.html b/LayoutTests/platform/chromium/compositing/accelerated-drawing/svg-filters.html
>index 3f1ce26b878c60db737aef651052e55530aa136a..5d27cb7f20a0b29f2d850fd631022c6af3c36b41 100644
>--- a/LayoutTests/platform/chromium/compositing/accelerated-drawing/svg-filters.html
>+++ b/LayoutTests/platform/chromium/compositing/accelerated-drawing/svg-filters.html
>@@ -6,7 +6,7 @@
>     layoutTestController.dumpAsText(true); // This is only useful as pixel test.
> 
>   if (window.internals)
>-    window.internals.setAcceleratedDrawingEnabled(document, true);
>+    window.internals.settings.setAcceleratedDrawingEnabled(true);
> </script>
> </head>
> 
>diff --git a/LayoutTests/platform/chromium/compositing/force-compositing-mode/force-composite-empty.html b/LayoutTests/platform/chromium/compositing/force-compositing-mode/force-composite-empty.html
>index 90981a67f680428a44dd09ffc43ec99e46cafd6d..8a1dc167615d5fe21a854f7c835b6800256d441e 100644
>--- a/LayoutTests/platform/chromium/compositing/force-compositing-mode/force-composite-empty.html
>+++ b/LayoutTests/platform/chromium/compositing/force-compositing-mode/force-composite-empty.html
>@@ -2,8 +2,8 @@
>   <head>
>     <script>
>       if (window.internals) {
>-        window.internals.setForceCompositingMode(document, true);
>-        window.internals.setEnableCompositingForScrollableFrames(document, true);
>+        window.internals.settings.setForceCompositingMode(true);
>+        window.internals.settings.setEnableCompositingForScrollableFrames(true);
>       }
>       function doTest() {
>         if (window.layoutTestController) {
>diff --git a/LayoutTests/platform/chromium/compositing/force-compositing-mode/no-overflow-iframe-layer.html b/LayoutTests/platform/chromium/compositing/force-compositing-mode/no-overflow-iframe-layer.html
>index d65ee80707313bc4c5a9ec21c3291c598b90f471..1738398562b18df687f5996411310c9b28cabb32 100644
>--- a/LayoutTests/platform/chromium/compositing/force-compositing-mode/no-overflow-iframe-layer.html
>+++ b/LayoutTests/platform/chromium/compositing/force-compositing-mode/no-overflow-iframe-layer.html
>@@ -16,8 +16,8 @@
>     }
>     window.addEventListener("load", doTest, false);
>     if (window.internals) {
>-      internals.setForceCompositingMode(document, true);
>-      internals.setEnableCompositingForScrollableFrames(document, true);
>+      internals.settings.setForceCompositingMode(true);
>+      internals.settings.setEnableCompositingForScrollableFrames(true);
>     }
>   </script>
> </head>
>diff --git a/LayoutTests/platform/chromium/compositing/force-compositing-mode/overflow-hidden-iframe-layer.html b/LayoutTests/platform/chromium/compositing/force-compositing-mode/overflow-hidden-iframe-layer.html
>index afe35e4112e3b937faa5c270b40a29e32651f0e6..6b85168009e60f7468f75e6532eff397d158e6eb 100644
>--- a/LayoutTests/platform/chromium/compositing/force-compositing-mode/overflow-hidden-iframe-layer.html
>+++ b/LayoutTests/platform/chromium/compositing/force-compositing-mode/overflow-hidden-iframe-layer.html
>@@ -8,8 +8,8 @@
>   </style>
>   <script>
>     if (window.internals) {
>-      internals.setForceCompositingMode(document, true);
>-      internals.setEnableCompositingForScrollableFrames(document, true);
>+      internals.settings.setForceCompositingMode(true);
>+      internals.settings.setEnableCompositingForScrollableFrames(true);
>     }
>     function doTest()
>     {
>diff --git a/LayoutTests/platform/chromium/compositing/force-compositing-mode/overflow-iframe-enter-compositing.html b/LayoutTests/platform/chromium/compositing/force-compositing-mode/overflow-iframe-enter-compositing.html
>index d3357fda4e7682176af3a8be1eac950c3961d058..af19c5a9735f94455d4dd1ab4fa47b4455f12c76 100644
>--- a/LayoutTests/platform/chromium/compositing/force-compositing-mode/overflow-iframe-enter-compositing.html
>+++ b/LayoutTests/platform/chromium/compositing/force-compositing-mode/overflow-iframe-enter-compositing.html
>@@ -8,8 +8,8 @@
>   </style>
>   <script>
>     if (window.internals) {
>-      internals.setForceCompositingMode(document, true);
>-      internals.setEnableCompositingForScrollableFrames(document, true);
>+      internals.settings.setForceCompositingMode(true);
>+      internals.settings.setEnableCompositingForScrollableFrames(true);
>     }
>     function doTest()
>     {
>diff --git a/LayoutTests/platform/chromium/compositing/force-compositing-mode/overflow-iframe-layer.html b/LayoutTests/platform/chromium/compositing/force-compositing-mode/overflow-iframe-layer.html
>index a4c4a22033686d2d4732cabe9f18460f25c03b63..42b2d702f11cfebf23d591ce2f804c40ca6b4451 100644
>--- a/LayoutTests/platform/chromium/compositing/force-compositing-mode/overflow-iframe-layer.html
>+++ b/LayoutTests/platform/chromium/compositing/force-compositing-mode/overflow-iframe-layer.html
>@@ -8,8 +8,8 @@
>   </style>
>   <script>
>     if (window.internals) {
>-      internals.setForceCompositingMode(document, true);
>-      internals.setEnableCompositingForScrollableFrames(document, true);
>+      internals.settings.setForceCompositingMode(true);
>+      internals.settings.setEnableCompositingForScrollableFrames(true);
>     }
>     function doTest()
>     {
>diff --git a/LayoutTests/platform/chromium/compositing/force-compositing-mode/overflow-iframe-leave-compositing.html b/LayoutTests/platform/chromium/compositing/force-compositing-mode/overflow-iframe-leave-compositing.html
>index bee3b0a91f3526359beed07508c04a751df57a9f..911c0a2f6d6705c7247acce193baceefde2522d4 100644
>--- a/LayoutTests/platform/chromium/compositing/force-compositing-mode/overflow-iframe-leave-compositing.html
>+++ b/LayoutTests/platform/chromium/compositing/force-compositing-mode/overflow-iframe-leave-compositing.html
>@@ -8,8 +8,8 @@
>   </style>
>   <script>
>     if (window.internals) {
>-      internals.setForceCompositingMode(document, true);
>-      internals.setEnableCompositingForScrollableFrames(document, true);
>+      internals.settings.setForceCompositingMode(true);
>+      internals.settings.setEnableCompositingForScrollableFrames(true);
>     }
>     function doTest()
>     {

Actions: View | Formatted Diff | Diff

Attachments on bug 76424: 123269 | 123283 | 123663 | 123760 | 123954