Diff
Modified: trunk/LayoutTests/ChangeLog (139015 => 139016)
--- trunk/LayoutTests/ChangeLog 2013-01-08 00:59:08 UTC (rev 139015)
+++ trunk/LayoutTests/ChangeLog 2013-01-08 01:00:44 UTC (rev 139016)
@@ -1,3 +1,19 @@
+2013-01-07 Tony Chang <t...@chromium.org>
+
+ Remove more internals.settings that are autogenerated
+ https://bugs.webkit.org/show_bug.cgi?id=106253
+
+ Reviewed by Adam Barth.
+
+ These tests were manually trying to reset setMediaPlaybackRequiresUserGesture
+ when the test ended because they weren't using the InternalSettings::Backup to
+ save/restore the prefs. The autogenerated code will properly reset these prefs
+ before the next test.
+
+ * media/no-autoplay-with-user-gesture-requirement.html:
+ * media/video-load-require-user-gesture.html:
+ * media/video-play-require-user-gesture.html:
+
2013-01-07 Emil A Eklund <e...@chromium.org>
REGRESSION(SUBPIXEL_LAYOUT): el.offsetWidth < el.clientWidth for elements of a certain size
Modified: trunk/LayoutTests/media/no-autoplay-with-user-gesture-requirement.html (139015 => 139016)
--- trunk/LayoutTests/media/no-autoplay-with-user-gesture-requirement.html 2013-01-08 00:59:08 UTC (rev 139015)
+++ trunk/LayoutTests/media/no-autoplay-with-user-gesture-requirement.html 2013-01-08 01:00:44 UTC (rev 139016)
@@ -7,22 +7,14 @@
if (window.internals)
window.internals.settings.setMediaPlaybackRequiresUserGesture(true);
- function cleanGestureRequirement()
- {
- if (window.internals)
- window.internals.settings.setMediaPlaybackRequiresUserGesture(false);
- }
-
function testPlay()
{
- cleanGestureRequirement();
failTest("play event should not fire without user gesture.");
}
function testPaused()
{
testExpected("video.paused", true);
- cleanGestureRequirement();
endTest();
}
Modified: trunk/LayoutTests/media/video-load-require-user-gesture.html (139015 => 139016)
--- trunk/LayoutTests/media/video-load-require-user-gesture.html 2013-01-08 00:59:08 UTC (rev 139015)
+++ trunk/LayoutTests/media/video-load-require-user-gesture.html 2013-01-08 01:00:44 UTC (rev 139016)
@@ -11,9 +11,6 @@
function finishTest(success)
{
- if (window.internals)
- window.internals.settings.setMediaPlaybackRequiresUserGesture(false);
-
if (success)
endTest();
else
Modified: trunk/LayoutTests/media/video-play-require-user-gesture.html (139015 => 139016)
--- trunk/LayoutTests/media/video-play-require-user-gesture.html 2013-01-08 00:59:08 UTC (rev 139015)
+++ trunk/LayoutTests/media/video-play-require-user-gesture.html 2013-01-08 01:00:44 UTC (rev 139016)
@@ -9,11 +9,6 @@
if (window.internals)
window.internals.settings.setMediaPlaybackRequiresUserGesture(true);
- function cleanGestureRequirement() {
- if (window.internals)
- window.internals.settings.setMediaPlaybackRequiresUserGesture(false);
- }
-
function click()
{
if (window.eventSender) {
@@ -21,7 +16,6 @@
try {
playCoords = mediaControlsButtonCoordinates(video, "play-button");
} catch (exception) {
- cleanGestureRequirement();
failTest(exception.description);
return;
}
@@ -38,7 +32,6 @@
function playing()
{
if (userGestureInitiated == 0) {
- cleanGestureRequirement();
failTest("Should not play without user gesture.");
} else {
run("video.pause()");
@@ -54,10 +47,8 @@
try {
run("video.webkitEnterFullScreen()");
} catch(ex) {
- cleanGestureRequirement();
failTest("video.webkitEnterFullScreen() still requires user gesture.");
}
- cleanGestureRequirement();
endTest();
}
Modified: trunk/Source/WebCore/ChangeLog (139015 => 139016)
--- trunk/Source/WebCore/ChangeLog 2013-01-08 00:59:08 UTC (rev 139015)
+++ trunk/Source/WebCore/ChangeLog 2013-01-08 01:00:44 UTC (rev 139016)
@@ -1,3 +1,22 @@
+2013-01-07 Tony Chang <t...@chromium.org>
+
+ Remove more internals.settings that are autogenerated
+ https://bugs.webkit.org/show_bug.cgi?id=106253
+
+ Reviewed by Adam Barth.
+
+ Remove 8 methods that are autogenerated by Settings.in.
+
+ No new tests, this is a refactor and is convered by existing tests.
+
+ * testing/InternalSettings.cpp:
+ (WebCore::InternalSettings::Backup::Backup): Remove backup.
+ (WebCore::InternalSettings::Backup::restoreTo): Remove restore.
+ * testing/InternalSettings.h:
+ (Backup): Remove member variables and functions.
+ (InternalSettings):
+ * testing/InternalSettings.idl: Remove functions.
+
2013-01-07 Ryosuke Niwa <rn...@webkit.org>
Another incremental build fix after r139013.
Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (139015 => 139016)
--- trunk/Source/WebCore/testing/InternalSettings.cpp 2013-01-08 00:59:08 UTC (rev 139015)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp 2013-01-08 01:00:44 UTC (rev 139016)
@@ -63,8 +63,7 @@
namespace WebCore {
InternalSettings::Backup::Backup(Settings* settings)
- : m_originalFixedElementsLayoutRelativeToFrame(settings->fixedElementsLayoutRelativeToFrame())
- , m_originalCSSExclusionsEnabled(RuntimeEnabledFeatures::cssExclusionsEnabled())
+ : m_originalCSSExclusionsEnabled(RuntimeEnabledFeatures::cssExclusionsEnabled())
, m_originalCSSVariablesEnabled(settings->cssVariablesEnabled())
#if ENABLE(SHADOW_DOM)
, m_originalShadowDOMEnabled(RuntimeEnabledFeatures::shadowDOMEnabled())
@@ -75,11 +74,6 @@
#endif
, m_originalEditingBehavior(settings->editingBehaviorType())
, m_originalUnifiedSpellCheckerEnabled(settings->unifiedTextCheckerEnabled())
- , m_originalFixedPositionCreatesStackingContext(settings->fixedPositionCreatesStackingContext())
- , m_originalSyncXHRInDocumentsEnabled(settings->syncXHRInDocumentsEnabled())
- , m_originalWindowFocusRestricted(settings->windowFocusRestricted())
- , m_originalDeviceSupportsTouch(settings->deviceSupportsTouch())
- , m_originalDeviceSupportsMouse(settings->deviceSupportsMouse())
#if ENABLE(TEXT_AUTOSIZING)
, m_originalTextAutosizingEnabled(settings->textAutosizingEnabled())
, m_originalTextAutosizingWindowSizeOverride(settings->textAutosizingWindowSizeOverride())
@@ -104,7 +98,6 @@
void InternalSettings::Backup::restoreTo(Settings* settings)
{
- settings->setFixedElementsLayoutRelativeToFrame(m_originalFixedElementsLayoutRelativeToFrame);
RuntimeEnabledFeatures::setCSSExclusionsEnabled(m_originalCSSExclusionsEnabled);
settings->setCSSVariablesEnabled(m_originalCSSVariablesEnabled);
#if ENABLE(SHADOW_DOM)
@@ -116,11 +109,6 @@
#endif
settings->setEditingBehaviorType(m_originalEditingBehavior);
settings->setUnifiedTextCheckerEnabled(m_originalUnifiedSpellCheckerEnabled);
- settings->setFixedPositionCreatesStackingContext(m_originalFixedPositionCreatesStackingContext);
- settings->setSyncXHRInDocumentsEnabled(m_originalSyncXHRInDocumentsEnabled);
- settings->setWindowFocusRestricted(m_originalWindowFocusRestricted);
- settings->setDeviceSupportsTouch(m_originalDeviceSupportsTouch);
- settings->setDeviceSupportsMouse(m_originalDeviceSupportsMouse);
#if ENABLE(TEXT_AUTOSIZING)
settings->setTextAutosizingEnabled(m_originalTextAutosizingEnabled);
settings->setTextAutosizingWindowSizeOverride(m_originalTextAutosizingWindowSizeOverride);
@@ -202,12 +190,6 @@
settings()->setMockScrollbarsEnabled(enabled);
}
-void InternalSettings::setFixedElementsLayoutRelativeToFrame(bool enabled, ExceptionCode& ec)
-{
- InternalSettingsGuardForSettings();
- settings()->setFixedElementsLayoutRelativeToFrame(enabled);
-}
-
void InternalSettings::setUnifiedTextCheckingEnabled(bool enabled, ExceptionCode& ec)
{
InternalSettingsGuardForSettings();
@@ -262,18 +244,6 @@
#endif
}
-void InternalSettings::setDeviceSupportsTouch(bool enabled, ExceptionCode& ec)
-{
- InternalSettingsGuardForSettings();
- settings()->setDeviceSupportsTouch(enabled);
-}
-
-void InternalSettings::setDeviceSupportsMouse(bool enabled, ExceptionCode& ec)
-{
- InternalSettingsGuardForSettings();
- settings()->setDeviceSupportsMouse(enabled);
-}
-
typedef void (Settings::*SetFontFamilyFunction)(const AtomicString&, UScriptCode);
static void setFontFamily(Settings* settings, const String& family, const String& script, SetFontFamilyFunction setter)
{
@@ -417,12 +387,6 @@
m_page->setCanStartMedia(enabled);
}
-void InternalSettings::setMediaPlaybackRequiresUserGesture(bool enabled, ExceptionCode& ec)
-{
- InternalSettingsGuardForSettings();
- settings()->setMediaPlaybackRequiresUserGesture(enabled);
-}
-
void InternalSettings::setEditingBehavior(const String& editingBehavior, ExceptionCode& ec)
{
InternalSettingsGuardForSettings();
@@ -436,24 +400,6 @@
ec = SYNTAX_ERR;
}
-void InternalSettings::setFixedPositionCreatesStackingContext(bool creates, ExceptionCode& ec)
-{
- InternalSettingsGuardForSettings();
- settings()->setFixedPositionCreatesStackingContext(creates);
-}
-
-void InternalSettings::setSyncXHRInDocumentsEnabled(bool enabled, ExceptionCode& ec)
-{
- InternalSettingsGuardForSettings();
- settings()->setSyncXHRInDocumentsEnabled(enabled);
-}
-
-void InternalSettings::setWindowFocusRestricted(bool restricted, ExceptionCode& ec)
-{
- InternalSettingsGuardForSettings();
- settings()->setWindowFocusRestricted(restricted);
-}
-
void InternalSettings::setDialogElementEnabled(bool enabled, ExceptionCode& ec)
{
UNUSED_PARAM(ec);
@@ -503,12 +449,6 @@
#endif
}
-void InternalSettings::setMemoryInfoEnabled(bool enabled, ExceptionCode& ec)
-{
- InternalSettingsGuardForSettings();
- settings()->setMemoryInfoEnabled(enabled);
-}
-
void InternalSettings::setStorageBlockingPolicy(const String& mode, ExceptionCode& ec)
{
InternalSettingsGuardForSettings();
Modified: trunk/Source/WebCore/testing/InternalSettings.h (139015 => 139016)
--- trunk/Source/WebCore/testing/InternalSettings.h 2013-01-08 00:59:08 UTC (rev 139015)
+++ trunk/Source/WebCore/testing/InternalSettings.h 2013-01-08 01:00:44 UTC (rev 139016)
@@ -49,7 +49,6 @@
explicit Backup(Settings*);
void restoreTo(Settings*);
- bool m_originalFixedElementsLayoutRelativeToFrame;
bool m_originalCSSExclusionsEnabled;
bool m_originalCSSVariablesEnabled;
#if ENABLE(SHADOW_DOM)
@@ -61,11 +60,6 @@
#endif
EditingBehaviorType m_originalEditingBehavior;
bool m_originalUnifiedSpellCheckerEnabled;
- bool m_originalFixedPositionCreatesStackingContext;
- bool m_originalSyncXHRInDocumentsEnabled;
- bool m_originalWindowFocusRestricted;
- bool m_originalDeviceSupportsTouch;
- bool m_originalDeviceSupportsMouse;
#if ENABLE(TEXT_AUTOSIZING)
bool m_originalTextAutosizingEnabled;
IntSize m_originalTextAutosizingWindowSizeOverride;
@@ -100,12 +94,9 @@
void setMockScrollbarsEnabled(bool enabled, ExceptionCode&);
void setUsesOverlayScrollbars(bool enabled, ExceptionCode&);
- void setFixedElementsLayoutRelativeToFrame(bool, ExceptionCode&);
void setUnifiedTextCheckingEnabled(bool, ExceptionCode&);
bool unifiedTextCheckingEnabled(ExceptionCode&);
void setTouchEventEmulationEnabled(bool enabled, ExceptionCode&);
- void setDeviceSupportsTouch(bool enabled, ExceptionCode&);
- void setDeviceSupportsMouse(bool enabled, ExceptionCode&);
void setShadowDOMEnabled(bool enabled, ExceptionCode&);
void setAuthorShadowDOMForAnyElementEnabled(bool);
void setStyleScopedEnabled(bool);
@@ -127,15 +118,10 @@
void setCSSVariablesEnabled(bool enabled, ExceptionCode&);
bool cssVariablesEnabled(ExceptionCode&);
void setCanStartMedia(bool, ExceptionCode&);
- void setMediaPlaybackRequiresUserGesture(bool, ExceptionCode&);
void setEditingBehavior(const String&, ExceptionCode&);
- void setFixedPositionCreatesStackingContext(bool, ExceptionCode&);
- void setSyncXHRInDocumentsEnabled(bool, ExceptionCode&);
- void setWindowFocusRestricted(bool, ExceptionCode&);
void setDialogElementEnabled(bool, ExceptionCode&);
void setShouldDisplayTrackKind(const String& kind, bool enabled, ExceptionCode&);
bool shouldDisplayTrackKind(const String& kind, ExceptionCode&);
- void setMemoryInfoEnabled(bool, ExceptionCode&);
void setStorageBlockingPolicy(const String&, ExceptionCode&);
void setLangAttributeAwareFormControlUIEnabled(bool);
void setImagesEnabled(bool enabled, ExceptionCode&);
Modified: trunk/Source/WebCore/testing/InternalSettings.idl (139015 => 139016)
--- trunk/Source/WebCore/testing/InternalSettings.idl 2013-01-08 00:59:08 UTC (rev 139015)
+++ trunk/Source/WebCore/testing/InternalSettings.idl 2013-01-08 01:00:44 UTC (rev 139016)
@@ -28,12 +28,9 @@
JSGenerateToJSObject
] interface InternalSettings : InternalSettingsGenerated {
void setMockScrollbarsEnabled(in boolean enabled) raises(DOMException);
- void setFixedElementsLayoutRelativeToFrame(in boolean enabled) raises(DOMException);
void setUnifiedTextCheckingEnabled(in boolean enabled) raises (DOMException);
boolean unifiedTextCheckingEnabled() raises (DOMException);
void setTouchEventEmulationEnabled(in boolean enabled) raises(DOMException);
- void setDeviceSupportsTouch(in boolean enabled) raises(DOMException);
- void setDeviceSupportsMouse(in boolean enabled) raises(DOMException);
void setShadowDOMEnabled(in boolean enabled) raises(DOMException);
void setAuthorShadowDOMForAnyElementEnabled(in boolean isEnabled);
void setStyleScopedEnabled(in boolean isEnabled);
@@ -55,17 +52,12 @@
void setCSSVariablesEnabled(in boolean enabled) raises(DOMException);
boolean cssVariablesEnabled() raises(DOMException);
void setCanStartMedia(in boolean enabled) raises(DOMException);
- void setMediaPlaybackRequiresUserGesture(in boolean enabled) raises(DOMException);
void setEditingBehavior(in DOMString behavior) raises(DOMException);
- void setFixedPositionCreatesStackingContext(in boolean creates) raises(DOMException);
- void setSyncXHRInDocumentsEnabled(in boolean enabled) raises(DOMException);
- void setWindowFocusRestricted(in boolean restricted) raises(DOMException);
void setDialogElementEnabled(in boolean enabled) raises(DOMException);
void setLangAttributeAwareFormControlUIEnabled(in boolean enabled);
[Conditional=VIDEO_TRACK] void setShouldDisplayTrackKind(in DOMString kind, in boolean enabled) raises (DOMException);
[Conditional=VIDEO_TRACK] boolean shouldDisplayTrackKind(in DOMString trackKind) raises (DOMException);
- void setMemoryInfoEnabled(in boolean enabled) raises(DOMException);
void setStorageBlockingPolicy(in DOMString policy) raises(DOMException);
void setImagesEnabled(in boolean enabled) raises(DOMException);
};
