Remove CSS_DEVICE_ADAPTATION
authorsimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Feb 2020 22:26:15 +0000 (22:26 +0000)
committersimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Feb 2020 22:26:15 +0000 (22:26 +0000)
https://bugs.webkit.org/show_bug.cgi?id=203479

Reviewed by Tim Horton.
Source/JavaScriptCore:

CSS Working Group resolved to remove @viewport <https://github.com/w3c/csswg-drafts/issues/4766>,
so remove the code.

* Configurations/FeatureDefines.xcconfig:

Source/WebCore:

CSS Working Group resolved to remove @viewport <https://github.com/w3c/csswg-drafts/issues/4766>,
so remove the code.

* CMakeLists.txt:
* Configurations/FeatureDefines.xcconfig:
* DerivedSources.make:
* Sources.txt:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSCSSRuleCustom.cpp:
(WebCore::toJSNewlyCreated):
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::valueForPropertyInStyle):
* css/CSSProperties.json:
* css/CSSProperty.cpp:
(WebCore::CSSProperty::isDescriptorOnly):
* css/CSSRule.cpp:
* css/CSSRule.h:
* css/CSSRule.idl:
* css/CSSValueKeywords.in:
* css/StyleRule.cpp:
(WebCore::StyleRuleBase::destroy):
(WebCore::StyleRuleBase::copy const):
(WebCore::StyleRuleBase::createCSSOMWrapper const):
(WebCore::StyleRuleViewport::StyleRuleViewport): Deleted.
(WebCore::StyleRuleViewport::mutableProperties): Deleted.
* css/StyleRule.h:
(WebCore::StyleRuleBase::isSupportsRule const):
(WebCore::StyleRuleBase::isViewportRule const): Deleted.
* css/StyleRuleType.h:
* css/StyleSheetContents.cpp:
(WebCore::traverseRulesInVector):
(WebCore::StyleSheetContents::traverseSubresources const):
* css/ViewportStyleResolver.cpp: Removed.
* css/ViewportStyleResolver.h: Removed.
* css/WebKitCSSViewportRule.cpp: Removed.
* css/WebKitCSSViewportRule.h: Removed.
* css/WebKitCSSViewportRule.idl: Removed.
* css/parser/CSSParserImpl.cpp:
(WebCore::CSSParserImpl::consumeAtRule):
(WebCore::CSSParserImpl::consumeViewportRule): Deleted.
* css/parser/CSSPropertyParser.cpp:
(WebCore::CSSPropertyParser::parseValue):
(WebCore::consumeSingleViewportDescriptor): Deleted.
(WebCore::CSSPropertyParser::parseViewportDescriptor): Deleted.
* dom/Document.cpp:
(WebCore::Document::initialViewportSize const): Deleted.
* dom/Document.h:
* page/FrameView.h:
* style/RuleData.cpp:
* style/RuleSet.cpp:
(WebCore::Style::RuleSet::addChildRules):
* style/StyleResolver.cpp:
(WebCore::Style::Resolver::Resolver):
(WebCore::Style::Resolver::appendAuthorStyleSheets):
(WebCore::Style::Resolver::~Resolver):
* style/StyleResolver.h:
(WebCore::Style::Resolver::viewportStyleResolver): Deleted.

Source/WebCore/PAL:

CSS Working Group resolved to remove @viewport <https://github.com/w3c/csswg-drafts/issues/4766>,
so remove the code.

* Configurations/FeatureDefines.xcconfig:

Source/WebKit:

CSS Working Group resolved to remove @viewport <https://github.com/w3c/csswg-drafts/issues/4766>,
so remove the code.

* Configurations/FeatureDefines.xcconfig:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::sendViewportAttributesChanged):

Source/WebKitLegacy/mac:

CSS Working Group resolved to remove @viewport <https://github.com/w3c/csswg-drafts/issues/4766>,
so remove the code.

* Configurations/FeatureDefines.xcconfig:
* DOM/DOMCSS.mm:
(kitClass):

Source/WTF:

CSS Working Group resolved to remove @viewport <https://github.com/w3c/csswg-drafts/issues/4766>,
so remove the code.

* wtf/PlatformEnable.h:

Tools:

CSS Working Group resolved to remove @viewport <https://github.com/w3c/csswg-drafts/issues/4766>,
so remove the code.

* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:

LayoutTests:

* css3/device-adapt/opera/cascading-001-expected.txt: Removed.
* css3/device-adapt/opera/cascading-001.xhtml: Removed.
* css3/device-adapt/opera/cascading-002-expected.txt: Removed.
* css3/device-adapt/opera/cascading-002.xhtml: Removed.
* css3/device-adapt/opera/cascading-003-expected.txt: Removed.
* css3/device-adapt/opera/cascading-003.xhtml: Removed.
* css3/device-adapt/opera/cascading-004-expected.txt: Removed.
* css3/device-adapt/opera/cascading-004.xhtml: Removed.
* css3/device-adapt/opera/constrain-001-expected.txt: Removed.
* css3/device-adapt/opera/constrain-001.xhtml: Removed.
* css3/device-adapt/opera/constrain-002-expected.txt: Removed.
* css3/device-adapt/opera/constrain-002.xhtml: Removed.
* css3/device-adapt/opera/constrain-003-expected.txt: Removed.
* css3/device-adapt/opera/constrain-003.xhtml: Removed.
* css3/device-adapt/opera/constrain-004-expected.txt: Removed.
* css3/device-adapt/opera/constrain-004.xhtml: Removed.
* css3/device-adapt/opera/constrain-005-expected.txt: Removed.
* css3/device-adapt/opera/constrain-005.xhtml: Removed.
* css3/device-adapt/opera/constrain-006-expected.txt: Removed.
* css3/device-adapt/opera/constrain-006.xhtml: Removed.
* css3/device-adapt/opera/constrain-007-expected.txt: Removed.
* css3/device-adapt/opera/constrain-007.xhtml: Removed.
* css3/device-adapt/opera/constrain-008-expected.txt: Removed.
* css3/device-adapt/opera/constrain-008.xhtml: Removed.
* css3/device-adapt/opera/constrain-009-expected.txt: Removed.
* css3/device-adapt/opera/constrain-009.xhtml: Removed.
* css3/device-adapt/opera/constrain-010-expected.txt: Removed.
* css3/device-adapt/opera/constrain-010.xhtml: Removed.
* css3/device-adapt/opera/constrain-011-expected.txt: Removed.
* css3/device-adapt/opera/constrain-011.xhtml: Removed.
* css3/device-adapt/opera/constrain-012-expected.txt: Removed.
* css3/device-adapt/opera/constrain-012.xhtml: Removed.
* css3/device-adapt/opera/constrain-013-expected.txt: Removed.
* css3/device-adapt/opera/constrain-013.xhtml: Removed.
* css3/device-adapt/opera/constrain-014-expected.txt: Removed.
* css3/device-adapt/opera/constrain-014.xhtml: Removed.
* css3/device-adapt/opera/constrain-015-expected.txt: Removed.
* css3/device-adapt/opera/constrain-015.xhtml: Removed.
* css3/device-adapt/opera/constrain-016-expected.txt: Removed.
* css3/device-adapt/opera/constrain-016.xhtml: Removed.
* css3/device-adapt/opera/constrain-017-expected.txt: Removed.
* css3/device-adapt/opera/constrain-017.xhtml: Removed.
* css3/device-adapt/opera/constrain-018-expected.txt: Removed.
* css3/device-adapt/opera/constrain-018.xhtml: Removed.
* css3/device-adapt/opera/constrain-019-expected.txt: Removed.
* css3/device-adapt/opera/constrain-019.xhtml: Removed.
* css3/device-adapt/opera/constrain-020-expected.txt: Removed.
* css3/device-adapt/opera/constrain-020.xhtml: Removed.
* css3/device-adapt/opera/constrain-021-expected.txt: Removed.
* css3/device-adapt/opera/constrain-021.xhtml: Removed.
* css3/device-adapt/opera/constrain-022-expected.txt: Removed.
* css3/device-adapt/opera/constrain-022.xhtml: Removed.
* css3/device-adapt/opera/constrain-023-expected.txt: Removed.
* css3/device-adapt/opera/constrain-023.xhtml: Removed.
* css3/device-adapt/opera/constrain-024-expected.txt: Removed.
* css3/device-adapt/opera/constrain-024.xhtml: Removed.
* css3/device-adapt/opera/cssom-001-expected.txt: Removed.
* css3/device-adapt/opera/cssom-001.xhtml: Removed.
* css3/device-adapt/opera/orientation-001-expected.txt: Removed.
* css3/device-adapt/opera/orientation-001.xhtml: Removed.
* css3/device-adapt/opera/orientation-002-expected.txt: Removed.
* css3/device-adapt/opera/orientation-002.xhtml: Removed.
* css3/device-adapt/opera/syntax-001-expected.txt: Removed.
* css3/device-adapt/opera/syntax-001.xhtml: Removed.
* css3/device-adapt/opera/syntax-002-expected.txt: Removed.
* css3/device-adapt/opera/syntax-002.xhtml: Removed.
* css3/device-adapt/opera/syntax-003-expected.txt: Removed.
* css3/device-adapt/opera/syntax-003.xhtml: Removed.
* css3/device-adapt/resources/check-contents-width.html: Removed.
* css3/device-adapt/resources/viewport-width-check-inner-width.html: Removed.
* css3/device-adapt/viewport-at-rule-parsing-expected.txt: Removed.
* css3/device-adapt/viewport-at-rule-parsing.html: Removed.
* css3/device-adapt/viewport-properties-validation-expected.txt: Removed.
* css3/device-adapt/viewport-properties-validation.html: Removed.
* css3/device-adapt/viewport-width-check-window-innerwidth-correct-expected.txt: Removed.
* css3/device-adapt/viewport-width-check-window-innerwidth-correct.html: Removed.
* css3/device-adapt/viewport-width-not-affecting-next-page-expected.txt: Removed.
* css3/device-adapt/viewport-width-not-affecting-next-page.html: Removed.
* platform/gtk/TestExpectations:
* platform/ios-wk1/TestExpectations:
* platform/ios/TestExpectations:
* platform/mac/TestExpectations:
* platform/win/TestExpectations:
* platform/wincairo/TestExpectations:
* platform/wpe/TestExpectations:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@256477 268f45cc-cd09-0410-ab3c-d52691b4dbfc

132 files changed:
LayoutTests/ChangeLog
LayoutTests/css3/device-adapt/opera/cascading-001-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/cascading-001.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/cascading-002-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/cascading-002.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/cascading-003-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/cascading-003.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/cascading-004-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/cascading-004.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-001-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-001.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-002-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-002.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-003-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-003.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-004-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-004.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-005-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-005.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-006-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-006.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-007-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-007.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-008-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-008.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-009-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-009.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-010-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-010.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-011-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-011.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-012-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-012.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-013-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-013.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-014-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-014.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-015-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-015.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-016-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-016.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-017-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-017.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-018-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-018.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-019-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-019.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-020-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-020.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-021-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-021.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-022-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-022.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-023-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-023.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-024-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/constrain-024.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/cssom-001-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/cssom-001.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/orientation-001-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/orientation-001.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/orientation-002-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/orientation-002.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/syntax-001-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/syntax-001.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/syntax-002-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/syntax-002.xhtml [deleted file]
LayoutTests/css3/device-adapt/opera/syntax-003-expected.txt [deleted file]
LayoutTests/css3/device-adapt/opera/syntax-003.xhtml [deleted file]
LayoutTests/css3/device-adapt/resources/check-contents-width.html [deleted file]
LayoutTests/css3/device-adapt/resources/viewport-width-check-inner-width.html [deleted file]
LayoutTests/css3/device-adapt/viewport-at-rule-parsing-expected.txt [deleted file]
LayoutTests/css3/device-adapt/viewport-at-rule-parsing.html [deleted file]
LayoutTests/css3/device-adapt/viewport-properties-validation-expected.txt [deleted file]
LayoutTests/css3/device-adapt/viewport-properties-validation.html [deleted file]
LayoutTests/css3/device-adapt/viewport-width-check-window-innerwidth-correct-expected.txt [deleted file]
LayoutTests/css3/device-adapt/viewport-width-check-window-innerwidth-correct.html [deleted file]
LayoutTests/css3/device-adapt/viewport-width-not-affecting-next-page-expected.txt [deleted file]
LayoutTests/css3/device-adapt/viewport-width-not-affecting-next-page.html [deleted file]
LayoutTests/platform/gtk/TestExpectations
LayoutTests/platform/ios-wk1/TestExpectations
LayoutTests/platform/ios/TestExpectations
LayoutTests/platform/mac/TestExpectations
LayoutTests/platform/win/TestExpectations
LayoutTests/platform/wincairo/TestExpectations
LayoutTests/platform/wpe/TestExpectations
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
Source/WTF/ChangeLog
Source/WTF/wtf/PlatformEnable.h
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/DerivedSources.make
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
Source/WebCore/Sources.txt
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/bindings/js/JSCSSRuleCustom.cpp
Source/WebCore/css/CSSComputedStyleDeclaration.cpp
Source/WebCore/css/CSSProperties.json
Source/WebCore/css/CSSProperty.cpp
Source/WebCore/css/CSSRule.cpp
Source/WebCore/css/CSSRule.h
Source/WebCore/css/CSSRule.idl
Source/WebCore/css/CSSValueKeywords.in
Source/WebCore/css/StyleRule.cpp
Source/WebCore/css/StyleRule.h
Source/WebCore/css/StyleRuleType.h
Source/WebCore/css/StyleSheetContents.cpp
Source/WebCore/css/ViewportStyleResolver.cpp [deleted file]
Source/WebCore/css/ViewportStyleResolver.h [deleted file]
Source/WebCore/css/WebKitCSSViewportRule.cpp [deleted file]
Source/WebCore/css/WebKitCSSViewportRule.h [deleted file]
Source/WebCore/css/WebKitCSSViewportRule.idl [deleted file]
Source/WebCore/css/parser/CSSParserImpl.cpp
Source/WebCore/css/parser/CSSPropertyParser.cpp
Source/WebCore/dom/Document.cpp
Source/WebCore/dom/Document.h
Source/WebCore/page/FrameView.h
Source/WebCore/style/RuleData.cpp
Source/WebCore/style/RuleSet.cpp
Source/WebCore/style/StyleResolver.cpp
Source/WebCore/style/StyleResolver.h
Source/WebKit/ChangeLog
Source/WebKit/Configurations/FeatureDefines.xcconfig
Source/WebKit/WebProcess/WebPage/WebPage.cpp
Source/WebKitLegacy/mac/ChangeLog
Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
Source/WebKitLegacy/mac/DOM/DOMCSS.mm
Tools/ChangeLog
Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig

index 95428be..f72aae7 100644 (file)
@@ -1,3 +1,96 @@
+2020-02-12  Simon Fraser  <simon.fraser@apple.com>
+
+        Remove CSS_DEVICE_ADAPTATION
+        https://bugs.webkit.org/show_bug.cgi?id=203479
+
+        Reviewed by Tim Horton.
+
+        * css3/device-adapt/opera/cascading-001-expected.txt: Removed.
+        * css3/device-adapt/opera/cascading-001.xhtml: Removed.
+        * css3/device-adapt/opera/cascading-002-expected.txt: Removed.
+        * css3/device-adapt/opera/cascading-002.xhtml: Removed.
+        * css3/device-adapt/opera/cascading-003-expected.txt: Removed.
+        * css3/device-adapt/opera/cascading-003.xhtml: Removed.
+        * css3/device-adapt/opera/cascading-004-expected.txt: Removed.
+        * css3/device-adapt/opera/cascading-004.xhtml: Removed.
+        * css3/device-adapt/opera/constrain-001-expected.txt: Removed.
+        * css3/device-adapt/opera/constrain-001.xhtml: Removed.
+        * css3/device-adapt/opera/constrain-002-expected.txt: Removed.
+        * css3/device-adapt/opera/constrain-002.xhtml: Removed.
+        * css3/device-adapt/opera/constrain-003-expected.txt: Removed.
+        * css3/device-adapt/opera/constrain-003.xhtml: Removed.
+        * css3/device-adapt/opera/constrain-004-expected.txt: Removed.
+        * css3/device-adapt/opera/constrain-004.xhtml: Removed.
+        * css3/device-adapt/opera/constrain-005-expected.txt: Removed.
+        * css3/device-adapt/opera/constrain-005.xhtml: Removed.
+        * css3/device-adapt/opera/constrain-006-expected.txt: Removed.
+        * css3/device-adapt/opera/constrain-006.xhtml: Removed.
+        * css3/device-adapt/opera/constrain-007-expected.txt: Removed.
+        * css3/device-adapt/opera/constrain-007.xhtml: Removed.
+        * css3/device-adapt/opera/constrain-008-expected.txt: Removed.
+        * css3/device-adapt/opera/constrain-008.xhtml: Removed.
+        * css3/device-adapt/opera/constrain-009-expected.txt: Removed.
+        * css3/device-adapt/opera/constrain-009.xhtml: Removed.
+        * css3/device-adapt/opera/constrain-010-expected.txt: Removed.
+        * css3/device-adapt/opera/constrain-010.xhtml: Removed.
+        * css3/device-adapt/opera/constrain-011-expected.txt: Removed.
+        * css3/device-adapt/opera/constrain-011.xhtml: Removed.
+        * css3/device-adapt/opera/constrain-012-expected.txt: Removed.
+        * css3/device-adapt/opera/constrain-012.xhtml: Removed.
+        * css3/device-adapt/opera/constrain-013-expected.txt: Removed.
+        * css3/device-adapt/opera/constrain-013.xhtml: Removed.
+        * css3/device-adapt/opera/constrain-014-expected.txt: Removed.
+        * css3/device-adapt/opera/constrain-014.xhtml: Removed.
+        * css3/device-adapt/opera/constrain-015-expected.txt: Removed.
+        * css3/device-adapt/opera/constrain-015.xhtml: Removed.
+        * css3/device-adapt/opera/constrain-016-expected.txt: Removed.
+        * css3/device-adapt/opera/constrain-016.xhtml: Removed.
+        * css3/device-adapt/opera/constrain-017-expected.txt: Removed.
+        * css3/device-adapt/opera/constrain-017.xhtml: Removed.
+        * css3/device-adapt/opera/constrain-018-expected.txt: Removed.
+        * css3/device-adapt/opera/constrain-018.xhtml: Removed.
+        * css3/device-adapt/opera/constrain-019-expected.txt: Removed.
+        * css3/device-adapt/opera/constrain-019.xhtml: Removed.
+        * css3/device-adapt/opera/constrain-020-expected.txt: Removed.
+        * css3/device-adapt/opera/constrain-020.xhtml: Removed.
+        * css3/device-adapt/opera/constrain-021-expected.txt: Removed.
+        * css3/device-adapt/opera/constrain-021.xhtml: Removed.
+        * css3/device-adapt/opera/constrain-022-expected.txt: Removed.
+        * css3/device-adapt/opera/constrain-022.xhtml: Removed.
+        * css3/device-adapt/opera/constrain-023-expected.txt: Removed.
+        * css3/device-adapt/opera/constrain-023.xhtml: Removed.
+        * css3/device-adapt/opera/constrain-024-expected.txt: Removed.
+        * css3/device-adapt/opera/constrain-024.xhtml: Removed.
+        * css3/device-adapt/opera/cssom-001-expected.txt: Removed.
+        * css3/device-adapt/opera/cssom-001.xhtml: Removed.
+        * css3/device-adapt/opera/orientation-001-expected.txt: Removed.
+        * css3/device-adapt/opera/orientation-001.xhtml: Removed.
+        * css3/device-adapt/opera/orientation-002-expected.txt: Removed.
+        * css3/device-adapt/opera/orientation-002.xhtml: Removed.
+        * css3/device-adapt/opera/syntax-001-expected.txt: Removed.
+        * css3/device-adapt/opera/syntax-001.xhtml: Removed.
+        * css3/device-adapt/opera/syntax-002-expected.txt: Removed.
+        * css3/device-adapt/opera/syntax-002.xhtml: Removed.
+        * css3/device-adapt/opera/syntax-003-expected.txt: Removed.
+        * css3/device-adapt/opera/syntax-003.xhtml: Removed.
+        * css3/device-adapt/resources/check-contents-width.html: Removed.
+        * css3/device-adapt/resources/viewport-width-check-inner-width.html: Removed.
+        * css3/device-adapt/viewport-at-rule-parsing-expected.txt: Removed.
+        * css3/device-adapt/viewport-at-rule-parsing.html: Removed.
+        * css3/device-adapt/viewport-properties-validation-expected.txt: Removed.
+        * css3/device-adapt/viewport-properties-validation.html: Removed.
+        * css3/device-adapt/viewport-width-check-window-innerwidth-correct-expected.txt: Removed.
+        * css3/device-adapt/viewport-width-check-window-innerwidth-correct.html: Removed.
+        * css3/device-adapt/viewport-width-not-affecting-next-page-expected.txt: Removed.
+        * css3/device-adapt/viewport-width-not-affecting-next-page.html: Removed.
+        * platform/gtk/TestExpectations:
+        * platform/ios-wk1/TestExpectations:
+        * platform/ios/TestExpectations:
+        * platform/mac/TestExpectations:
+        * platform/win/TestExpectations:
+        * platform/wincairo/TestExpectations:
+        * platform/wpe/TestExpectations:
+
 2020-02-12  Jason Lawrence  <lawrence.j@apple.com>
 
         [ iOS wk2 ] crypto/subtle/rsa-indexeddb-non-exportable-private.html is flaky timing out.
diff --git a/LayoutTests/css3/device-adapt/opera/cascading-001-expected.txt b/LayoutTests/css3/device-adapt/opera/cascading-001-expected.txt
deleted file mode 100644 (file)
index e4e5d90..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport cascading - last declaration wins 
-
diff --git a/LayoutTests/css3/device-adapt/opera/cascading-001.xhtml b/LayoutTests/css3/device-adapt/opera/cascading-001.xhtml
deleted file mode 100644 (file)
index 2dbee24..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport cascading - last declaration wins</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#the-viewport-rule"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="The last of two non-important declarations for the same descriptor wins."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { width: 300px; width: 500px }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport cascading - last declaration wins");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(viewport.actualWidth, 500);
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/cascading-002-expected.txt b/LayoutTests/css3/device-adapt/opera/cascading-002-expected.txt
deleted file mode 100644 (file)
index 82c8135..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport cascading - !important declaration wins 
-
diff --git a/LayoutTests/css3/device-adapt/opera/cascading-002.xhtml b/LayoutTests/css3/device-adapt/opera/cascading-002.xhtml
deleted file mode 100644 (file)
index 55cabda..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport cascading - !important declaration wins</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#the-viewport-rule"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="A preceeding !important declaration wins over a non-important descriptor."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { width: 300px !important; width: 500px }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport cascading - !important declaration wins");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(viewport.actualWidth, 300);
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/cascading-003-expected.txt b/LayoutTests/css3/device-adapt/opera/cascading-003-expected.txt
deleted file mode 100644 (file)
index cd0406b..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport cascading - descriptors cascaded separately 
-
diff --git a/LayoutTests/css3/device-adapt/opera/cascading-003.xhtml b/LayoutTests/css3/device-adapt/opera/cascading-003.xhtml
deleted file mode 100644 (file)
index c06d720..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport cascading - descriptors cascaded separately</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#the-viewport-rule"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="Descriptors are cascaded separately and may stem from different @viewport rules."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { width: 300px; height: 300px; } @-webkit-viewport { height: 500px; }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport cascading - descriptors cascaded separately");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(viewport.actualWidth, 300); assert_equals(viewport.actualHeight, 500);
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/cascading-004-expected.txt b/LayoutTests/css3/device-adapt/opera/cascading-004-expected.txt
deleted file mode 100644 (file)
index da29b5a..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport cascading - !important declaration from preceding rule wins 
-
diff --git a/LayoutTests/css3/device-adapt/opera/cascading-004.xhtml b/LayoutTests/css3/device-adapt/opera/cascading-004.xhtml
deleted file mode 100644 (file)
index 61d65b8..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport cascading - !important declaration from preceding rule wins</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#the-viewport-rule"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="A preceeding !important declaration from a preceding rule wins over a non-important descriptor."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { width: 300px !important; } @-webkit-viewport { width: 500px; }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport cascading - !important declaration from preceding rule wins");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(viewport.actualWidth, 300);
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-001-expected.txt b/LayoutTests/css3/device-adapt/opera/constrain-001-expected.txt
deleted file mode 100644 (file)
index 18a9da9..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport constrained - max-width 200px 
-
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-001.xhtml b/LayoutTests/css3/device-adapt/opera/constrain-001.xhtml
deleted file mode 100644 (file)
index 1fc3434..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport constrained - max-width 200px</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#constraining-procedure"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="Setting max-width in @viewport to a length smaller than the initial viewport width will set the actual viewport width to that length"/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { max-width: 200px }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport constrained - max-width 200px");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(viewport.actualWidth, 200);
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-002-expected.txt b/LayoutTests/css3/device-adapt/opera/constrain-002-expected.txt
deleted file mode 100644 (file)
index 2a78359..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport constrained - max-width 10000px 
-
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-002.xhtml b/LayoutTests/css3/device-adapt/opera/constrain-002.xhtml
deleted file mode 100644 (file)
index dcb9ddc..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport constrained - max-width 10000px</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#constraining-procedure"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="Setting max-width in @viewport to a length larger than the initial viewport width will not change the actual viewport width."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { max-width: 10000px }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport constrained - max-width 10000px");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(viewport.actualWidth, viewport.initialWidth);
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-003-expected.txt b/LayoutTests/css3/device-adapt/opera/constrain-003-expected.txt
deleted file mode 100644 (file)
index 11c9899..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport constrained - min-width 10px 
-
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-003.xhtml b/LayoutTests/css3/device-adapt/opera/constrain-003.xhtml
deleted file mode 100644 (file)
index 3d7820f..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport constrained - min-width 10px</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#constraining-procedure"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="Setting min-width in @viewport to a length smaller than the initial viewport width will not change the actual viewport width."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { min-width: 10px }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport constrained - min-width 10px");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(viewport.actualWidth, viewport.initialWidth);
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-004-expected.txt b/LayoutTests/css3/device-adapt/opera/constrain-004-expected.txt
deleted file mode 100644 (file)
index 3585d37..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport constrained - min-width 10000px 
-
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-004.xhtml b/LayoutTests/css3/device-adapt/opera/constrain-004.xhtml
deleted file mode 100644 (file)
index 2baf638..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport constrained - min-width 10000px</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#constraining-procedure"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="Setting min-width in @viewport to a length larger than the initial viewport width will set the actual viewport width to that length."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { min-width: 10000px }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport constrained - min-width 10000px");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(viewport.actualWidth, 10000);
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-005-expected.txt b/LayoutTests/css3/device-adapt/opera/constrain-005-expected.txt
deleted file mode 100644 (file)
index 808ddf2..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport constrained - min-width greater than max-width. 
-
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-005.xhtml b/LayoutTests/css3/device-adapt/opera/constrain-005.xhtml
deleted file mode 100644 (file)
index 1d6bf46..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport constrained - min-width greater than max-width.</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#constraining-procedure"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="If min-width is greater than max-width, min-width will overrule max-width."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { min-width: 10000px; max-width: 200px }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport constrained - min-width greater than max-width.");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(viewport.actualWidth, 10000);
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-006-expected.txt b/LayoutTests/css3/device-adapt/opera/constrain-006-expected.txt
deleted file mode 100644 (file)
index b03d3de..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport constrained - width 200% 
-
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-006.xhtml b/LayoutTests/css3/device-adapt/opera/constrain-006.xhtml
deleted file mode 100644 (file)
index 49e714d..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport constrained - width 200%</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#constraining-procedure"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="Setting width in @viewport to 200% will set the actual viewport width to twice the initial-width."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { width: 200% }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport constrained - width 200%");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(viewport.actualWidth, 2*viewport.initialWidth);
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-007-expected.txt b/LayoutTests/css3/device-adapt/opera/constrain-007-expected.txt
deleted file mode 100644 (file)
index f345051..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport constrained - width 50% 
-
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-007.xhtml b/LayoutTests/css3/device-adapt/opera/constrain-007.xhtml
deleted file mode 100644 (file)
index a6e0697..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport constrained - width 50%</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#constraining-procedure"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="Setting width in @viewport to 50% will set the actual viewport width to half the initial-width."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { width: 50% }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport constrained - width 50%");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(viewport.actualWidth, Math.floor(viewport.initialWidth/2));
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-008-expected.txt b/LayoutTests/css3/device-adapt/opera/constrain-008-expected.txt
deleted file mode 100644 (file)
index 8f2ec74..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport constrained - min-zoom greater than max-zoom 
-
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-008.xhtml b/LayoutTests/css3/device-adapt/opera/constrain-008.xhtml
deleted file mode 100644 (file)
index ea9e36a..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport constrained - min-zoom greater than max-zoom</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#constraining-procedure"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="If min-zoom is greater than max-zoom, min-zoom will overrule max-zoom."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { zoom: 100%; min-zoom: 200%; max-zoom: 50% }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport constrained - min-zoom greater than max-zoom");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(viewport.actualWidth, Math.floor(viewport.initialWidth/2));
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-009-expected.txt b/LayoutTests/css3/device-adapt/opera/constrain-009-expected.txt
deleted file mode 100644 (file)
index 817330a..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport constrained - width 20em 
-
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-009.xhtml b/LayoutTests/css3/device-adapt/opera/constrain-009.xhtml
deleted file mode 100644 (file)
index 74f99d1..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport constrained - width 20em</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#constraining-procedure"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="Setting width in @viewport to 20em will set the actual viewport width to 20 times the initial font-size."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { width: 20em }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport constrained - width 20em");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(viewport.actualWidth, 20*viewport.fontSize);
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-010-expected.txt b/LayoutTests/css3/device-adapt/opera/constrain-010-expected.txt
deleted file mode 100644 (file)
index 413264a..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport constrained - width 20rem 
-
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-010.xhtml b/LayoutTests/css3/device-adapt/opera/constrain-010.xhtml
deleted file mode 100644 (file)
index 04802df..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport constrained - width 20rem</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#constraining-procedure"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="Setting width in @viewport to 20rem will set the actual viewport width to 20 times the initial font-size."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { width: 20rem }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport constrained - width 20rem");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(viewport.actualWidth, 20*viewport.fontSize);
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-011-expected.txt b/LayoutTests/css3/device-adapt/opera/constrain-011-expected.txt
deleted file mode 100644 (file)
index b79f73d..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport constrained - width from zoom: 200% 
-
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-011.xhtml b/LayoutTests/css3/device-adapt/opera/constrain-011.xhtml
deleted file mode 100644 (file)
index 326855c..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport constrained - width from zoom: 200%</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#constraining-procedure"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="Setting zoom in @viewport to 200% will set the actual viewport width to half the initial-width."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { zoom: 200% }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport constrained - width from zoom: 200%");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(viewport.actualWidth, Math.floor(viewport.initialWidth/2));
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-012-expected.txt b/LayoutTests/css3/device-adapt/opera/constrain-012-expected.txt
deleted file mode 100644 (file)
index 7e5da2d..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport constrained - min-zoom not affecting width. 
-
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-012.xhtml b/LayoutTests/css3/device-adapt/opera/constrain-012.xhtml
deleted file mode 100644 (file)
index 8e34d3b..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport constrained - min-zoom not affecting width.</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#constraining-procedure"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="Setting min-zoom in @viewport to 200% will not affect width if zoom is auto."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { min-zoom: 200% }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport constrained - min-zoom not affecting width.");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(viewport.actualWidth, viewport.initialWidth);
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-013-expected.txt b/LayoutTests/css3/device-adapt/opera/constrain-013-expected.txt
deleted file mode 100644 (file)
index 881ca04..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport constrained - max-zoom affecting width. 
-
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-013.xhtml b/LayoutTests/css3/device-adapt/opera/constrain-013.xhtml
deleted file mode 100644 (file)
index f6bedb7..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport constrained - max-zoom affecting width.</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#constraining-procedure"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="Setting max-zoom in @viewport to 50% affect width if zoom is auto because of step 10 in the constraining procedure."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { max-zoom: 50% }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport constrained - max-zoom affecting width.");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(viewport.actualWidth, 2*viewport.initialWidth);
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-014-expected.txt b/LayoutTests/css3/device-adapt/opera/constrain-014-expected.txt
deleted file mode 100644 (file)
index f7880c3..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport constrained - zoom greater than max-zoom. 
-
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-014.xhtml b/LayoutTests/css3/device-adapt/opera/constrain-014.xhtml
deleted file mode 100644 (file)
index 1232cc5..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport constrained - zoom greater than max-zoom.</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#constraining-procedure"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="Setting zoom greater than max-zoom will set zoom to max-zoom."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { max-zoom: 50%; zoom: 150% }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport constrained - zoom greater than max-zoom.");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(viewport.actualWidth, 2*viewport.initialWidth);
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-015-expected.txt b/LayoutTests/css3/device-adapt/opera/constrain-015-expected.txt
deleted file mode 100644 (file)
index 03269e2..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport constrained - zoom less than min-zoom. 
-
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-015.xhtml b/LayoutTests/css3/device-adapt/opera/constrain-015.xhtml
deleted file mode 100644 (file)
index 613b1dc..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport constrained - zoom less than min-zoom.</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#constraining-procedure"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="Setting zoom less than min-zoom will set zoom to min-zoom."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { min-zoom: 200%; zoom: 50% }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport constrained - zoom less than min-zoom.");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(viewport.actualWidth, Math.floor(viewport.initialWidth/2));
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-016-expected.txt b/LayoutTests/css3/device-adapt/opera/constrain-016-expected.txt
deleted file mode 100644 (file)
index a41c4b8..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport constrained - height deduced from width and aspect ratio. 
-
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-016.xhtml b/LayoutTests/css3/device-adapt/opera/constrain-016.xhtml
deleted file mode 100644 (file)
index 7f52396..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport constrained - height deduced from width and aspect ratio.</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#constraining-procedure"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="Setting width and not height will set a height that makes the actual width/height and initial width/height have the same aspect ratio."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { width: 10000px }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport constrained - height deduced from width and aspect ratio.");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(viewport.actualWidth, 10000); assert_equals(viewport.actualHeight, Math.floor(10000*viewport.initialHeight/viewport.initialWidth));
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-017-expected.txt b/LayoutTests/css3/device-adapt/opera/constrain-017-expected.txt
deleted file mode 100644 (file)
index 3f6d08f..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport constrained - Large non-auto height not affecting width. 
-
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-017.xhtml b/LayoutTests/css3/device-adapt/opera/constrain-017.xhtml
deleted file mode 100644 (file)
index 7290995..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport constrained - Large non-auto height not affecting width.</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#constraining-procedure"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="Non-auto height does not affect width if zoom is auto."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { height: 10000px }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport constrained - Large non-auto height not affecting width.");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(viewport.actualHeight, 10000); assert_equals(viewport.actualWidth, viewport.initialWidth);
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-018-expected.txt b/LayoutTests/css3/device-adapt/opera/constrain-018-expected.txt
deleted file mode 100644 (file)
index 8de9b5b..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport constrained - Small non-auto height not affecting width. 
-
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-018.xhtml b/LayoutTests/css3/device-adapt/opera/constrain-018.xhtml
deleted file mode 100644 (file)
index 880c91d..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport constrained - Small non-auto height not affecting width.</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#constraining-procedure"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="Non-auto height does not affect width if zoom is auto."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { height: 1px }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport constrained - Small non-auto height not affecting width.");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(viewport.actualHeight, 1); assert_equals(viewport.actualWidth, viewport.initialWidth);
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-019-expected.txt b/LayoutTests/css3/device-adapt/opera/constrain-019-expected.txt
deleted file mode 100644 (file)
index 915bf88..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport constrained - Auto width from height and non-auto zoom. 
-
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-019.xhtml b/LayoutTests/css3/device-adapt/opera/constrain-019.xhtml
deleted file mode 100644 (file)
index 3f5520d..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport constrained - Auto width from height and non-auto zoom.</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#constraining-procedure"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="Non-auto height affects width if zoom is not auto."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { height: 10000px; zoom: 100% }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport constrained - Auto width from height and non-auto zoom.");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(viewport.actualHeight, 10000); assert_equals(viewport.actualWidth, Math.floor(10000*viewport.initialWidth/viewport.initialHeight));
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-020-expected.txt b/LayoutTests/css3/device-adapt/opera/constrain-020-expected.txt
deleted file mode 100644 (file)
index 5d35f2f..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport constrained - extended width and height for non-auto zoom. 
-
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-020.xhtml b/LayoutTests/css3/device-adapt/opera/constrain-020.xhtml
deleted file mode 100644 (file)
index a4971a7..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport constrained - extended width and height for non-auto zoom.</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#constraining-procedure"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="When zoom is non-auto, and the constrained width does not fill the viewport for the constrained zoom value, the width is extended to fill the viewport. Likewise for height."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { width: 1px; height: 1px; zoom: 50% }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport constrained - extended width and height for non-auto zoom.");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(viewport.actualWidth, 2*viewport.initialWidth); assert_approx_equals(viewport.actualHeight, 2*viewport.initialHeight, 1);
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-021-expected.txt b/LayoutTests/css3/device-adapt/opera/constrain-021-expected.txt
deleted file mode 100644 (file)
index 188a931..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport constrained - width is device-width. 
-
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-021.xhtml b/LayoutTests/css3/device-adapt/opera/constrain-021.xhtml
deleted file mode 100644 (file)
index 74768b3..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport constrained - width is device-width.</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#constraining-procedure"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="When width is set to device-width, the device-width media feature will match when the actual viewport width is the value."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { width: device-width }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport constrained - width is device-width.");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        var mq = window.matchMedia("(device-width: "+viewport.actualWidth+")"); assert_true(mq.matches);
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-022-expected.txt b/LayoutTests/css3/device-adapt/opera/constrain-022-expected.txt
deleted file mode 100644 (file)
index 01157df..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport constrained - height is device-height. 
-
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-022.xhtml b/LayoutTests/css3/device-adapt/opera/constrain-022.xhtml
deleted file mode 100644 (file)
index 9b0d69b..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport constrained - height is device-height.</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#constraining-procedure"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="When height is set to device-height, the device-height media feature will match when the actual viewport height is the value."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { width: device-height }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport constrained - height is device-height.");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        var mq = window.matchMedia("(device-height: "+viewport.actualHeight+")"); assert_true(mq.matches);
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-023-expected.txt b/LayoutTests/css3/device-adapt/opera/constrain-023-expected.txt
deleted file mode 100644 (file)
index af60de7..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport constrained - used width is positive. 
-
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-023.xhtml b/LayoutTests/css3/device-adapt/opera/constrain-023.xhtml
deleted file mode 100644 (file)
index 7d55e8b..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport constrained - used width is positive.</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#constraining-procedure"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="When constrained width is lower than 0.5px, rounding would make it 0px. Make sure the used width is then set to 1px."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { width: 0.01em }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport constrained - used width is positive.");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(viewport.actualWidth, 1);
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-024-expected.txt b/LayoutTests/css3/device-adapt/opera/constrain-024-expected.txt
deleted file mode 100644 (file)
index 409623f..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport constrained - used height is positive. 
-
diff --git a/LayoutTests/css3/device-adapt/opera/constrain-024.xhtml b/LayoutTests/css3/device-adapt/opera/constrain-024.xhtml
deleted file mode 100644 (file)
index 80f095a..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport constrained - used height is positive.</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#constraining-procedure"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="When constrained height is lower than 0.5px, rounding would make it 0px. Make sure the used height is then set to 1px."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { height: 0.01em }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport constrained - used height is positive.");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(viewport.actualHeight, 1);
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/cssom-001-expected.txt b/LayoutTests/css3/device-adapt/opera/cssom-001-expected.txt
deleted file mode 100644 (file)
index 9e4d0b5..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport CSSOM - CSSRule.WEBKIT_VIEWPORT_RULE 
-
diff --git a/LayoutTests/css3/device-adapt/opera/cssom-001.xhtml b/LayoutTests/css3/device-adapt/opera/cssom-001.xhtml
deleted file mode 100644 (file)
index 7a4960d..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport CSSOM - CSSRule.WEBKIT_VIEWPORT_RULE</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#dom-interfaces"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="CSSRule.WEBKIT_VIEWPORT_RULE has the value 15, and the stylesheet contains a CSSViewportRule with type value 15."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { width: auto 1200px; min-height: 700px; max-zoom: 100% }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport CSSOM - CSSRule.WEBKIT_VIEWPORT_RULE");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(CSSRule.WEBKIT_VIEWPORT_RULE, 15); assert_equals(testStyleSheet.cssRules.item(0).type, 15);
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/orientation-001-expected.txt b/LayoutTests/css3/device-adapt/opera/orientation-001-expected.txt
deleted file mode 100644 (file)
index bd717c2..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport orientation - portrait 
-
diff --git a/LayoutTests/css3/device-adapt/opera/orientation-001.xhtml b/LayoutTests/css3/device-adapt/opera/orientation-001.xhtml
deleted file mode 100644 (file)
index 3eb45b5..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport orientation - portrait</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#the-lsquoorientationrsquo-descriptor"/>
-  <meta name="flags" content="visual scroll dom should" />
-  <meta name="assert" content="Forced portrait orientation of the viewport."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { orientation: portrait }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport orientation - portrait");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_true(viewport.actualWidth <= viewport.actualHeight);
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/orientation-002-expected.txt b/LayoutTests/css3/device-adapt/opera/orientation-002-expected.txt
deleted file mode 100644 (file)
index 4ba79b6..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport orientation - landscape 
-
diff --git a/LayoutTests/css3/device-adapt/opera/orientation-002.xhtml b/LayoutTests/css3/device-adapt/opera/orientation-002.xhtml
deleted file mode 100644 (file)
index fff91b2..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport orientation - landscape</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#the-lsquoorientationrsquo-descriptor"/>
-  <meta name="flags" content="visual scroll dom should" />
-  <meta name="assert" content="Forced portrait orientation of the viewport."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { orientation: portrait }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport orientation - landscape");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_true(viewport.actualWidth >= viewport.actualHeight);
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/syntax-001-expected.txt b/LayoutTests/css3/device-adapt/opera/syntax-001-expected.txt
deleted file mode 100644 (file)
index dd06909..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport syntax - inside @media 
-
diff --git a/LayoutTests/css3/device-adapt/opera/syntax-001.xhtml b/LayoutTests/css3/device-adapt/opera/syntax-001.xhtml
deleted file mode 100644 (file)
index 1b626cb..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport syntax - inside @media</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#syntax"/>
-  <meta name="flags" content="visual scroll dom" />
-  <meta name="assert" content="@viewport is allowed inside @media."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @media all { @-webkit-viewport { width: 500px; } }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport syntax - inside @media");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(viewport.actualWidth, 500);
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/syntax-002-expected.txt b/LayoutTests/css3/device-adapt/opera/syntax-002-expected.txt
deleted file mode 100644 (file)
index b34fcbd..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport syntax - unknown descriptor 
-
diff --git a/LayoutTests/css3/device-adapt/opera/syntax-002.xhtml b/LayoutTests/css3/device-adapt/opera/syntax-002.xhtml
deleted file mode 100644 (file)
index 4e0dc2b..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport syntax - unknown descriptor</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#syntax"/>
-  <meta name="flags" content="visual scroll dom invalid" />
-  <meta name="assert" content="Descriptors after unknown descriptor declaration in @viewport is recognized."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { a: b; width: 500px }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport syntax - unknown descriptor");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(viewport.actualWidth, 500);
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/opera/syntax-003-expected.txt b/LayoutTests/css3/device-adapt/opera/syntax-003-expected.txt
deleted file mode 100644 (file)
index 4e8e35e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-PASS CSS Test: @viewport syntax - descriptor recovery 
-
diff --git a/LayoutTests/css3/device-adapt/opera/syntax-003.xhtml b/LayoutTests/css3/device-adapt/opera/syntax-003.xhtml
deleted file mode 100644 (file)
index f7f1d2a..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: @viewport syntax - descriptor recovery</title>
-  <link rel="author" title="Rune Lillesveen" href="mailto:rune@opera.com"/>
-  <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#syntax"/>
-  <meta name="flags" content="visual scroll dom invalid" />
-  <meta name="assert" content="@viewport supports forward compatible parsing for descriptors."/>
-  <script src="../../../resources/testharness.js" type="text/javascript" />
-  <script src="../../../resources/testharnessreport.js" type="text/javascript" />
-  <style type="text/css"><![CDATA[
-   body { margin: 0; }
-   html, body, #test { width: 100%; height: 100%; }
-   #log { padding: 1em; display: none; }
-   /* Reset viewport values to initial values to ignore UA stylesheet. */
-   @-webkit-viewport {
-    width: auto;
-    height: auto;
-    zoom: auto;
-    min-zoom: auto;
-    max-zoom: auto;
-    user-zoom: zoom;
-    orientation: auto;
-    resolution: auto;
-   }
-  ]]></style>
-  <style type="text/css"><![CDATA[
-   /* CSS for the test below. */
-   @-webkit-viewport { width: 500px; width: 200px x: { !important []}; height: 700px }
-   /* Set root element font-size to something different from the initial
-      font-size to make sure 'rem' and 'em' for @viewport is based on the
-      initial font-size, not the root element font-size. */
-   html { font-size: 2rem; }
-   body { font-size: 0.5rem; }
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
-   var test = async_test("CSS Test: @viewport syntax - descriptor recovery");
-   window.onload = function(){
-
-    var testStyleSheet = document.styleSheets.item(1);
-
-    /* Disable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = true;
-
-    /* Initialize an object to store viewport values to be used by the test
-       asserts. */
-    var viewport = new Object();
-
-    /* An element with the same size as the initial containing block. */
-    var testElm = document.getElementById("test");
-
-    /* Retrieve the initial viewport values before applying the @viewport to
-       test. */
-    viewport.initialWidth = testElm.offsetWidth;
-    viewport.initialHeight = testElm.offsetHeight;
-    viewport.fontSize = parseInt(getComputedStyle(testElm, "").fontSize);
-
-    /* Enable the stylesheet that contains the @viewport to test. */
-    testStyleSheet.disabled = false;
-
-    /* Retrieve the actual viewport values for the test. */
-    viewport.actualWidth = testElm.offsetWidth;
-    viewport.actualHeight = testElm.offsetHeight;
-    viewport.zoom = viewport.initialWidth / window.innerWidth;
-
-    /* Check viewport values. */
-    test.step(function(){
-        assert_equals(viewport.actualWidth, 500); assert_equals(viewport.actualHeight, 700);
-    });
-
-    /* Finished. Show the results. */
-    test.done();
-    testStyleSheet.disabled = true;
-    document.getElementById("log").style.display = "block";
-   }
-  ]]></script>
- </head>
- <body>
-  <div id="test">
-   <div id="log"></div>
-  </div>
- </body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/resources/check-contents-width.html b/LayoutTests/css3/device-adapt/resources/check-contents-width.html
deleted file mode 100644 (file)
index 88d2525..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <style>
-       body { margin: 0; }
-       html, body, #result { width: 100%; height: 100%; }
-    </style>
-    <script type="text/javascript">
-        setTimeout(function() {
-            var result = document.getElementById("result");
-            result.innerHTML = (result.offsetWidth == window.innerWidth) ? "PASS" : "FAIL";
-
-            if (window.testRunner)
-                testRunner.notifyDone();
-        }, 200); // Have to use timeout because of raise condition caused by WK2 IPC.
-    </script>
-</head>
-<body>
-    <div id="result">
-        </p>
-    </div>
-</body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/resources/viewport-width-check-inner-width.html b/LayoutTests/css3/device-adapt/resources/viewport-width-check-inner-width.html
deleted file mode 100644 (file)
index 711c33e..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <style type="text/css">
-        @-webkit-viewport {
-            width: 300px;
-        }
-    </style>
-    <script type="text/javascript">
-        function load() {
-            var result = document.getElementById("result");
-            result.innerHTML = "window.innerWidth should be equal to 300. Got ";
-            result.innerHTML += window.innerWidth;
-            if (window.testRunner)
-                testRunner.notifyDone();
-        }
-    </script>
-</head>
-<body onload="load()">
-    <div id="result">
-        </p>
-    </div>
-</body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/viewport-at-rule-parsing-expected.txt b/LayoutTests/css3/device-adapt/viewport-at-rule-parsing-expected.txt
deleted file mode 100644 (file)
index 9ceb1b4..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-
-PASS Empty at-rule parsing 
-PASS at-rule with extra spaces 
-PASS Rule with attributes 
-PASS Rule with malformed attributes 
-PASS Should be accepted inside media queries 
-PASS Nested viewport rule 
-PASS Rules inside a viewport rule 
-PASS Should ignore unprefixed at-rule 
-
diff --git a/LayoutTests/css3/device-adapt/viewport-at-rule-parsing.html b/LayoutTests/css3/device-adapt/viewport-at-rule-parsing.html
deleted file mode 100644 (file)
index 99b3de7..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <style type="text/css">
-        /* Valid viewport syntax. */
-        @-webkit-viewport {
-        }
-
-        /* Valid viewport syntax, extras spaces should be ignored. */
-        @-webkit-viewport          {
-        }
-
-        /* Valid viewport syntax, regular attributes. */
-        @-webkit-viewport {
-            max-height: 200px;
-            min-height: 200px;
-        }
-
-        /* Valid viewport syntax, should omit the malformed attribute. */
-        @-webkit-viewport {
-            asdasd
-        }
-
-        /* Valid viewport syntax, it is allowed inside media queries. */
-        @media all {
-            @-webkit-viewport {
-            }
-        }
-
-        /* Nested viewport rules are not allowed. The inner rule should be ignored. */
-        @-webkit-viewport {
-            max-height: 100px;
-            min-height: 100px;
-
-            @-webkit-viewport {
-                max-height: 200px;
-                min-height: 200px;
-            }
-        }
-
-        /* Rules inside a viewport should be ignored. */
-        @-webkit-viewport {
-            max-height: 50px;
-            min-height: 50px;
-
-            @import url('../../resources/testharness.css');
-        }
-
-        /* Should ignore unprefixed viewport rule. We need to change this
-           test if at some point we remove the prefix. */
-        @viewport {
-        }
-    </style>
-    <meta charset="utf-8" />
-    <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#syntax" />
-    <script src="../../resources/testharness.js"></script>
-    <script src="../../resources/testharnessreport.js"></script>
-    <script type="text/javascript">
-        var rules = document.styleSheets[0].cssRules;
-
-        test(function() {
-            assert_equals(rules.item(0).cssText, "@-webkit-viewport { }");
-        }, "Empty at-rule parsing");
-
-        test(function() {
-            assert_equals(rules.item(1).cssText, "@-webkit-viewport { }");
-        }, "at-rule with extra spaces");
-
-        test(function() {
-            assert_equals(rules.item(2).cssText, "@-webkit-viewport { max-height: 200px; min-height: 200px; }");
-        }, "Rule with attributes");
-
-        test(function() {
-            assert_equals(rules.item(3).cssText, "@-webkit-viewport { }");
-        }, "Rule with malformed attributes");
-
-        test(function() {
-            assert_equals(rules.item(4).cssText, "@media all { \n  @-webkit-viewport { }\n}");
-        }, "Should be accepted inside media queries");
-
-        test(function() {
-            assert_equals(rules.item(5).cssText, "@-webkit-viewport { max-height: 100px; min-height: 100px; }");
-        }, "Nested viewport rule");
-
-        test(function() {
-            assert_equals(rules.item(6).cssText, "@-webkit-viewport { max-height: 50px; min-height: 50px; }");
-        }, "Rules inside a viewport rule");
-
-        // The total number of parsed rules should be 6, meaning that the parser
-        // ignored the last two rules.
-        test(function() {
-            assert_equals(rules.length, 7)
-        }, "Should ignore unprefixed at-rule");
-    </script>
-</head>
-<body>
-    <div id="log"></div>
-</body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/viewport-properties-validation-expected.txt b/LayoutTests/css3/device-adapt/viewport-properties-validation-expected.txt
deleted file mode 100644 (file)
index 945e5c7..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-
-PASS Rule with no attributes 
-PASS Shorthands with double value 
-PASS Shorthands with single value 
-PASS Shorthands should override properties if defined later 
-PASS All valid properties with valid intial values 
-PASS All valid properties with valid values 
-PASS All valid properties with invalid intial values 
-PASS Negative numbers should be dropped on zoom attribute 
-PASS Viewport attributes inside selectors should be dropped 
-PASS Invalid attributes among valid should be dropped 
-
diff --git a/LayoutTests/css3/device-adapt/viewport-properties-validation.html b/LayoutTests/css3/device-adapt/viewport-properties-validation.html
deleted file mode 100644 (file)
index 3490cbf..0000000
+++ /dev/null
@@ -1,200 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <style type="text/css">
-        /* Valid viewport syntax with no properties. */
-        @-webkit-viewport {
-        }
-
-        /* Shorthands should be evaluated to the respective attributes. */
-        @-webkit-viewport {
-            width: 400px 500px;
-            height: 200px 300px;
-        }
-
-        /* Shorthands with single value should assume this value for min and max. */
-        @-webkit-viewport {
-            width: 500px;
-            height: 300px;
-        }
-
-        /* Shorthands should override properties if defined later. */
-        @-webkit-viewport {
-            min-width: 100px;
-            min-width: 100px;
-            max-height: 100px;
-            max-height: 100px;
-            width: 500px;
-            height: 300px;
-        }
-
-        /* All valid properties with valid initial values. */
-        @-webkit-viewport {
-            min-width: auto;
-            max-width: auto;
-            min-height: auto;
-            max-height: auto;
-            min-zoom: auto;
-            max-zoom: auto;
-            orientation: auto;
-            user-zoom: zoom;
-            zoom: auto;
-        }
-
-        /* All valid properties with valid values. */
-        @-webkit-viewport {
-            min-width: 50%;
-            max-width: 100px;
-            min-height: device-width;
-            max-height: device-height;
-            min-zoom: 50%;
-            max-zoom: 0.5;
-            orientation: landscape;
-            user-zoom: fixed;
-            zoom: 0.6;
-        }
-
-        /* All valid properties with invalid initial values. Should be empty. */
-        @-webkit-viewport {
-            min-width: zoom;
-            max-width: fixed;
-            min-height: landscape;
-            max-height: portrait;
-            min-zoom: 10px;
-            max-zoom: 50px;
-            orientation: 50%;
-            user-zoom: auto;
-            zoom: device-height;
-        }
-
-        /* Negative numbers should be dropped on zoom. */
-        @-webkit-viewport {
-            min-zoom: -1;
-            max-zoom: -0.5;
-            zoom: -0.6;
-        }
-
-        /* Viewport attributes inside selectors should be dropped. */
-        .foo {
-            min-zoom: auto;
-            max-zoom: auto;
-            orientation: auto;
-            user-zoom: zoom;
-            zoom: auto;
-        }
-
-        /* Invalid attributes among valid should be dropped. */
-        @-webkit-viewport {
-            font-family: sans-serif;
-            min-width: device-width;
-            max-width: device-height;
-            foo: auto;
-            min-height: 500px;
-            max-height: 50%;
-            text-indent: 0;
-            min-zoom: 0.5;
-            max-zoom: 50%;
-            orientation: portrait;
-            color: red;
-            user-zoom: zoom;
-            zoom: 60%;
-            letter-spacing: 0.5em;
-        }
-    </style>
-    <meta charset="utf-8" />
-    <link rel="help" href="http://www.w3.org/TR/css-device-adapt/#syntax" />
-    <script src="../../resources/testharness.js"></script>
-    <script src="../../resources/testharnessreport.js"></script>
-    <script type="text/javascript">
-        var rules = document.styleSheets[0].cssRules;
-
-        test(function() {
-            assert_equals(rules.item(0).cssText, "@-webkit-viewport { }");
-        }, "Rule with no attributes");
-
-        test(function() {
-            assert_equals(rules.item(1).cssText,
-                "@-webkit-viewport {" +
-                " min-width: 400px;" +
-                " max-width: 500px;" +
-                " min-height: 200px;" +
-                " max-height: 300px; }");
-        }, "Shorthands with double value");
-
-        test(function() {
-            assert_equals(rules.item(2).cssText,
-                "@-webkit-viewport {" +
-                " min-width: 500px;" +
-                " max-width: 500px;" +
-                " min-height: 300px;" +
-                " max-height: 300px; }");
-        }, "Shorthands with single value");
-
-        test(function() {
-            assert_equals(rules.item(3).cssText,
-                "@-webkit-viewport {" +
-                " min-width: 500px;" +
-                " max-width: 500px;" +
-                " min-height: 300px;" +
-                " max-height: 300px; }");
-        }, "Shorthands should override properties if defined later");
-
-        test(function() {
-            assert_equals(rules.item(4).cssText,
-                "@-webkit-viewport {" +
-                " min-width: auto;" +
-                " max-width: auto;" +
-                " min-height: auto;" +
-                " max-height: auto;" +
-                " min-zoom: auto;" +
-                " max-zoom: auto;" +
-                " orientation: auto;" +
-                " user-zoom: zoom;" +
-                " zoom: auto; }");
-        }, "All valid properties with valid intial values");
-
-        test(function() {
-            assert_equals(rules.item(5).cssText,
-                "@-webkit-viewport {" +
-                " min-width: 50%;" +
-                " max-width: 100px;" +
-                " min-height: device-width;" +
-                " max-height: device-height;" +
-                " min-zoom: 50%;" +
-                " max-zoom: 0.5;" +
-                " orientation: landscape;" +
-                " user-zoom: fixed;" +
-                " zoom: 0.6; }");
-        }, "All valid properties with valid values");
-
-        test(function() {
-            assert_equals(rules.item(6).cssText, "@-webkit-viewport { }");
-        }, "All valid properties with invalid intial values");
-
-        test(function() {
-            assert_equals(rules.item(7).cssText, "@-webkit-viewport { }");
-        }, "Negative numbers should be dropped on zoom attribute");
-
-        test(function() {
-            assert_equals(rules.item(8).cssText, ".foo { }");
-        }, "Viewport attributes inside selectors should be dropped");
-
-        test(function() {
-            assert_equals(rules.item(9).cssText,
-                "@-webkit-viewport {" +
-                " min-width: device-width;" +
-                " max-width: device-height;" +
-                " min-height: 500px;" +
-                " max-height: 50%;" +
-                " min-zoom: 0.5;" +
-                " max-zoom: 50%;" +
-                " orientation: portrait;" +
-                " user-zoom: zoom;" +
-                " zoom: 60%; }");
-        }, "Invalid attributes among valid should be dropped");
-    </script>
-</head>
-<body>
-    <div id="log"></div>
-</body>
-</html>
diff --git a/LayoutTests/css3/device-adapt/viewport-width-check-window-innerwidth-correct-expected.txt b/LayoutTests/css3/device-adapt/viewport-width-check-window-innerwidth-correct-expected.txt
deleted file mode 100644 (file)
index a0418fd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-window.innerWidth should be equal to 300. Got 300
diff --git a/LayoutTests/css3/device-adapt/viewport-width-check-window-innerwidth-correct.html b/LayoutTests/css3/device-adapt/viewport-width-check-window-innerwidth-correct.html
deleted file mode 100644 (file)
index a3c93d9..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>CSS Test: window.innerWidth should return valid value, when CSS viewport descriptors applied.</title>
-    <link rel="author" title="Mikhail Pozdnyakov" href="mailto:mikhail.pozdnyakov@intel.com" />
-    <script type="text/javascript">
-        if (window.testRunner) {
-            testRunner.dumpAsText();
-            testRunner.waitUntilDone();
-            testRunner.setBackingScaleFactor(2, backingScaleFactorCallback);
-        }
-
-        function backingScaleFactorCallback() {
-            window.location = "resources/viewport-width-check-inner-width.html";
-        }
-    </script>
-</head>
-</html>
diff --git a/LayoutTests/css3/device-adapt/viewport-width-not-affecting-next-page-expected.txt b/LayoutTests/css3/device-adapt/viewport-width-not-affecting-next-page-expected.txt
deleted file mode 100644 (file)
index 7ef22e9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-PASS
diff --git a/LayoutTests/css3/device-adapt/viewport-width-not-affecting-next-page.html b/LayoutTests/css3/device-adapt/viewport-width-not-affecting-next-page.html
deleted file mode 100644 (file)
index 828001f..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>CSS Test: viewport 'width' descriptor does not affect contents width of next loaded page.</title>
-    <link rel="author" title="Mikhail Pozdnyakov" href="mailto:mikhail.pozdnyakov@intel.com" />
-    <style type="text/css">
-        @-webkit-viewport {
-            width: 300px;
-        }
-    </style>
-    <script type="text/javascript">
-        if (window.testRunner) {
-            testRunner.dumpAsText();
-            testRunner.waitUntilDone();
-        }
-
-        function onLoad() {
-            window.location = "resources/check-contents-width.html";
-        }
-    </script>
-</head>
-<body onload="onLoad()"/>
-</html>
index e3d88ee..c97c448 100644 (file)
@@ -611,9 +611,6 @@ fast/mediastream/captureInGPUProcess.html [ Skip ]
 webkit.org/b/100137 fast/media/mq-resolution.html [ Failure ]
 webkit.org/b/100137 fast/media/mq-resolution-dpi-dpcm-warning.html [ Failure ]
 
-# CSS Device Adaptation is not enabled.
-webkit.org/b/95959 css3/device-adapt [ Skip ]
-
 # No support for MPEG-4 caption support
 webkit.org/b/131546 media/track/track-forced-subtitles-in-band.html [ Timeout Failure ]
 webkit.org/b/131546 media/track/track-in-band-cues-added-once.html [ Timeout Crash ]
index db52cb4..e8a432f 100644 (file)
@@ -1752,7 +1752,6 @@ legacy-animation-engine/transitions/svg-text-shadow-transition.html [ Failure Pa
 [ Release ] editing/undo/undo-delete.html [ Failure ]
 
 # Flaky as of 08/30/2016
-css3/device-adapt/viewport-width-not-affecting-next-page.html [ Pass Failure ]
 editing/execCommand/4641880-1.html [ Pass Failure ]
 editing/execCommand/insertHTML.html [ Pass Failure ]
 editing/input/composition-underline-rtl.html [ Pass ImageOnlyFailure ]
index d30abf1..f29cf1f 100644 (file)
@@ -248,9 +248,6 @@ inspector/ [ Skip ]
 http/tests/inspector/ [ Skip ]
 http/tests/websocket/tests/hybi/inspector/ [ Skip ]
 
-# CSS Device Adaptation is not enabled.
-webkit.org/b/95959 css3/device-adapt [ Skip ]
-
 # Unsupported on certain OS versions
 webkit.org/b/152491 fast/text/woff2.html [ Skip ]
 
index 9b97cef..cd4857b 100644 (file)
@@ -499,9 +499,6 @@ webkit.org/b/119467 webaudio/audiobuffersource-loop-points.html [ Skip ]
 # Skip tests in fast/text/shaping
 webkit.org/b/90951 fast/text/shaping
 
-# CSS Device Adaptation is not enabled.
-webkit.org/b/95959 css3/device-adapt [ Skip ]
-
 # Accelerated overflow scrolling (ENABLE_ACCELERATED_OVERFLOW_SCROLLING) is not enabled.
 fast/repaint/overflow-scroll-touch-repaint.html [ Skip ]
 
index 9ba64ec..49f2ea9 100644 (file)
@@ -239,9 +239,6 @@ svg/webarchive [ Skip ]
 svg/custom/image-with-prefix-in-webarchive.svg [ Skip ]
 http/tests/webarchive [ Skip ]
 
-# TODO CSS Device Adaptation is not enabled.
-webkit.org/b/95959 css3/device-adapt/ [ Skip ]
-
 # Neither this port nor the mac port support detecting slow unload handlers.
 fast/dom/Window/slow-unload-handler.html [ Skip ]
 fast/dom/Window/slow-unload-handler-only-frame-is-stopped.html [ Skip ]
index 843e2c8..686b7c9 100644 (file)
@@ -37,9 +37,6 @@ inspector/layers/layers-blending-compositing-reasons.html [ Skip ]
 transitions/blendmode-transitions.html [ Skip ]
 legacy-animation-engine/transitions/blendmode-transitions.html [ Skip ]
 
-# CSS_DEVICE_ADAPTATION is disabled
-webkit.org/b/95959 css3/device-adapt [ Skip ]
-
 # CSS_IMAGE_ORIENTATION is disabled
 fast/css/image-orientation [ Skip ]
 imported/blink/fast/css/image-orientation [ Skip ]
index 53ffaad..91d8b59 100644 (file)
@@ -728,7 +728,6 @@ Bug(WPE) fast/text/woff2-totalsfntsize.html [ Pass ]
 Bug(WPE) fast/text/woff2.html [ Pass ]
 Bug(WPE) fast/text-autosizing [ Skip ]
 
-Bug(WPE) css3/device-adapt [ Skip ]
 Bug(WPE) css3/filters [ Skip ]
 Bug(WPE) css3/masking [ Skip ]
 Bug(WPE) css3/scroll-snap [ Skip ]
index 4c3eee0..444775a 100644 (file)
@@ -1,3 +1,15 @@
+2020-02-12  Simon Fraser  <simon.fraser@apple.com>
+
+        Remove CSS_DEVICE_ADAPTATION
+        https://bugs.webkit.org/show_bug.cgi?id=203479
+
+        Reviewed by Tim Horton.
+
+        CSS Working Group resolved to remove @viewport <https://github.com/w3c/csswg-drafts/issues/4766>,
+        so remove the code.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2020-02-12  Yusuke Suzuki  <ysuzuki@apple.com>
 
         [JSC] Compact StructureTransitionTable
index f4d26e3..2a91e25 100644 (file)
@@ -103,8 +103,6 @@ ENABLE_CSS_CONIC_GRADIENTS_maccatalyst = ENABLE_CSS_CONIC_GRADIENTS;
 ENABLE_CSS_CONIC_GRADIENTS_macosx = $(ENABLE_CSS_CONIC_GRADIENTS$(WK_MACOS_1014));
 ENABLE_CSS_CONIC_GRADIENTS_MACOS_SINCE_1014 = ENABLE_CSS_CONIC_GRADIENTS;
 
-ENABLE_CSS_DEVICE_ADAPTATION = ;
-
 ENABLE_CSS_IMAGE_RESOLUTION = ;
 
 ENABLE_CSS_PAINTING_API = ENABLE_CSS_PAINTING_API;
@@ -450,4 +448,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET;
 
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLE_PAY_SESSION_V9) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_GPU_PROCESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INSPECTOR_TELEMETRY) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFSCREEN_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLE_PAY_SESSION_V9) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_GPU_PROCESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INSPECTOR_TELEMETRY) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFSCREEN_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
index 5e54cd4..0ed703b 100644 (file)
@@ -1,3 +1,15 @@
+2020-02-12  Simon Fraser  <simon.fraser@apple.com>
+
+        Remove CSS_DEVICE_ADAPTATION
+        https://bugs.webkit.org/show_bug.cgi?id=203479
+
+        Reviewed by Tim Horton.
+
+        CSS Working Group resolved to remove @viewport <https://github.com/w3c/csswg-drafts/issues/4766>,
+        so remove the code.
+
+        * wtf/PlatformEnable.h:
+
 2020-02-11  Fujii Hironori  <Hironori.Fujii@sony.com>
 
         Fix declarations marked by wrong export macros (WEBCORE_EXPORT and WTF_EXPORT)
index fede24b..a062ec3 100644 (file)
 #define ENABLE_CSS_BOX_DECORATION_BREAK 1
 #endif
 
-#if !defined(ENABLE_CSS_DEVICE_ADAPTATION)
-#define ENABLE_CSS_DEVICE_ADAPTATION 0
-#endif
-
 #if !defined(ENABLE_CSS_COMPOSITING)
 #define ENABLE_CSS_COMPOSITING 0
 #endif
index 1137e0d..178dff3 100644 (file)
@@ -661,7 +661,6 @@ set(WebCore_NON_SVG_IDL_FILES
     css/typedom/TypedOMCSSUnparsedValue.idl
 
     css/WebKitCSSMatrix.idl
-    css/WebKitCSSViewportRule.idl
 
     dom/AbortController.idl
     dom/AbortSignal.idl
index e8b6dd8..1f8af94 100644 (file)
@@ -1,3 +1,68 @@
+2020-02-12  Simon Fraser  <simon.fraser@apple.com>
+
+        Remove CSS_DEVICE_ADAPTATION
+        https://bugs.webkit.org/show_bug.cgi?id=203479
+
+        Reviewed by Tim Horton.
+
+        CSS Working Group resolved to remove @viewport <https://github.com/w3c/csswg-drafts/issues/4766>,
+        so remove the code.
+
+        * CMakeLists.txt:
+        * Configurations/FeatureDefines.xcconfig:
+        * DerivedSources.make:
+        * Sources.txt:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/JSCSSRuleCustom.cpp:
+        (WebCore::toJSNewlyCreated):
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::ComputedStyleExtractor::valueForPropertyInStyle):
+        * css/CSSProperties.json:
+        * css/CSSProperty.cpp:
+        (WebCore::CSSProperty::isDescriptorOnly):
+        * css/CSSRule.cpp:
+        * css/CSSRule.h:
+        * css/CSSRule.idl:
+        * css/CSSValueKeywords.in:
+        * css/StyleRule.cpp:
+        (WebCore::StyleRuleBase::destroy):
+        (WebCore::StyleRuleBase::copy const):
+        (WebCore::StyleRuleBase::createCSSOMWrapper const):
+        (WebCore::StyleRuleViewport::StyleRuleViewport): Deleted.
+        (WebCore::StyleRuleViewport::mutableProperties): Deleted.
+        * css/StyleRule.h:
+        (WebCore::StyleRuleBase::isSupportsRule const):
+        (WebCore::StyleRuleBase::isViewportRule const): Deleted.
+        * css/StyleRuleType.h:
+        * css/StyleSheetContents.cpp:
+        (WebCore::traverseRulesInVector):
+        (WebCore::StyleSheetContents::traverseSubresources const):
+        * css/ViewportStyleResolver.cpp: Removed.
+        * css/ViewportStyleResolver.h: Removed.
+        * css/WebKitCSSViewportRule.cpp: Removed.
+        * css/WebKitCSSViewportRule.h: Removed.
+        * css/WebKitCSSViewportRule.idl: Removed.
+        * css/parser/CSSParserImpl.cpp:
+        (WebCore::CSSParserImpl::consumeAtRule):
+        (WebCore::CSSParserImpl::consumeViewportRule): Deleted.
+        * css/parser/CSSPropertyParser.cpp:
+        (WebCore::CSSPropertyParser::parseValue):
+        (WebCore::consumeSingleViewportDescriptor): Deleted.
+        (WebCore::CSSPropertyParser::parseViewportDescriptor): Deleted.
+        * dom/Document.cpp:
+        (WebCore::Document::initialViewportSize const): Deleted.
+        * dom/Document.h:
+        * page/FrameView.h:
+        * style/RuleData.cpp:
+        * style/RuleSet.cpp:
+        (WebCore::Style::RuleSet::addChildRules):
+        * style/StyleResolver.cpp:
+        (WebCore::Style::Resolver::Resolver):
+        (WebCore::Style::Resolver::appendAuthorStyleSheets):
+        (WebCore::Style::Resolver::~Resolver):
+        * style/StyleResolver.h:
+        (WebCore::Style::Resolver::viewportStyleResolver): Deleted.
+
 2020-02-12  Brian Burg  <bburg@apple.com>
 
         Web Inspector: inspector/cpu-profiler/threads.html is flaky crashing
index f4d26e3..2a91e25 100644 (file)
@@ -103,8 +103,6 @@ ENABLE_CSS_CONIC_GRADIENTS_maccatalyst = ENABLE_CSS_CONIC_GRADIENTS;
 ENABLE_CSS_CONIC_GRADIENTS_macosx = $(ENABLE_CSS_CONIC_GRADIENTS$(WK_MACOS_1014));
 ENABLE_CSS_CONIC_GRADIENTS_MACOS_SINCE_1014 = ENABLE_CSS_CONIC_GRADIENTS;
 
-ENABLE_CSS_DEVICE_ADAPTATION = ;
-
 ENABLE_CSS_IMAGE_RESOLUTION = ;
 
 ENABLE_CSS_PAINTING_API = ENABLE_CSS_PAINTING_API;
@@ -450,4 +448,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET;
 
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLE_PAY_SESSION_V9) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_GPU_PROCESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INSPECTOR_TELEMETRY) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFSCREEN_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLE_PAY_SESSION_V9) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_GPU_PROCESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INSPECTOR_TELEMETRY) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFSCREEN_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
index 7fcee29..5ba26b8 100644 (file)
@@ -559,7 +559,6 @@ JS_BINDING_IDLS = \
     $(WebCore)/css/typedom/TypedOMCSSUnitValue.idl \
     $(WebCore)/css/typedom/TypedOMCSSUnparsedValue.idl \
     $(WebCore)/css/WebKitCSSMatrix.idl \
-    $(WebCore)/css/WebKitCSSViewportRule.idl \
     $(WebCore)/dom/AbortController.idl \
     $(WebCore)/dom/AbortSignal.idl \
     $(WebCore)/dom/AnimationEvent.idl \
index ca6360a..f7b2205 100644 (file)
@@ -1,3 +1,15 @@
+2020-02-12  Simon Fraser  <simon.fraser@apple.com>
+
+        Remove CSS_DEVICE_ADAPTATION
+        https://bugs.webkit.org/show_bug.cgi?id=203479
+
+        Reviewed by Tim Horton.
+
+        CSS Working Group resolved to remove @viewport <https://github.com/w3c/csswg-drafts/issues/4766>,
+        so remove the code.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2020-02-11  Chris Fleizach  <cfleizach@apple.com>
 
         AX: Wrong includes for internal SDK
index f4d26e3..2a91e25 100644 (file)
@@ -103,8 +103,6 @@ ENABLE_CSS_CONIC_GRADIENTS_maccatalyst = ENABLE_CSS_CONIC_GRADIENTS;
 ENABLE_CSS_CONIC_GRADIENTS_macosx = $(ENABLE_CSS_CONIC_GRADIENTS$(WK_MACOS_1014));
 ENABLE_CSS_CONIC_GRADIENTS_MACOS_SINCE_1014 = ENABLE_CSS_CONIC_GRADIENTS;
 
-ENABLE_CSS_DEVICE_ADAPTATION = ;
-
 ENABLE_CSS_IMAGE_RESOLUTION = ;
 
 ENABLE_CSS_PAINTING_API = ENABLE_CSS_PAINTING_API;
@@ -450,4 +448,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET;
 
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLE_PAY_SESSION_V9) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_GPU_PROCESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INSPECTOR_TELEMETRY) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFSCREEN_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLE_PAY_SESSION_V9) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_GPU_PROCESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INSPECTOR_TELEMETRY) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFSCREEN_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
index b5f6a29..3976134 100644 (file)
@@ -779,9 +779,7 @@ css/StyleSheet.cpp
 css/StyleSheetContents.cpp
 css/StyleSheetList.cpp
 css/TransformFunctions.cpp
-css/ViewportStyleResolver.cpp
 css/WebKitCSSMatrix.cpp
-css/WebKitCSSViewportRule.cpp
 
 css/parser/CSSAtRuleID.cpp
 css/parser/CSSDeferredParser.cpp
@@ -3481,7 +3479,6 @@ JSWebGPUTexture.cpp
 JSWebGPUTextureView.cpp
 JSWebKitAnimationEvent.cpp
 JSWebKitCSSMatrix.cpp
-JSWebKitCSSViewportRule.cpp
 JSWebKitPlaybackTargetAvailabilityEvent.cpp
 JSWebKitPoint.cpp
 JSWebKitTransitionEvent.cpp
index b18e742..f24ca35 100644 (file)
                3FBC4AF3189881560046EE38 /* VideoFullscreenInterfaceAVKit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3FBC4AF1189881560046EE38 /* VideoFullscreenInterfaceAVKit.mm */; };
                3FBC4AF4189881560046EE38 /* VideoFullscreenInterfaceAVKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 3FBC4AF2189881560046EE38 /* VideoFullscreenInterfaceAVKit.h */; settings = {ATTRIBUTES = (Private, ); }; };
                3FF813A71DBA8640009BF001 /* PointerLockController.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CFC434F192406A900A0D3B5 /* PointerLockController.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               3FFFF9A9159D9A550020BBD5 /* WebKitCSSViewportRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3FFFF9A7159D9A550020BBD5 /* WebKitCSSViewportRule.h */; };
-               3FFFF9AE159D9B060020BBD5 /* ViewportStyleResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 3FFFF9AC159D9B060020BBD5 /* ViewportStyleResolver.h */; };
                4107908C1FC3F0330061B27A /* ClientOrigin.h in Headers */ = {isa = PBXBuildFile; fileRef = 4107908A1FC3E4F20061B27A /* ClientOrigin.h */; settings = {ATTRIBUTES = (Private, ); }; };
                410E4461234373E9000173D4 /* LibWebRTCSocketIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 410E445F234373AD000173D4 /* LibWebRTCSocketIdentifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
                41103AAC1E39791000769F03 /* RealtimeOutgoingAudioSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 41103AA81E39790A00769F03 /* RealtimeOutgoingAudioSource.h */; };
                3BB6B80F22A7D311003A2A69 /* TabSize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TabSize.h; sourceTree = "<group>"; };
                3C244FE4A375AC633F88BE6F /* RenderLayerModelObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderLayerModelObject.h; sourceTree = "<group>"; };
                3C244FE5A375AC633F88BE6F /* RenderLayerModelObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderLayerModelObject.cpp; sourceTree = "<group>"; };
-               3F2B33E3165ABD3500E3987C /* WebKitCSSViewportRule.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebKitCSSViewportRule.idl; sourceTree = "<group>"; };
                3F2B33E9165AF15500E3987C /* JSWebKitCSSViewportRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitCSSViewportRule.cpp; sourceTree = "<group>"; };
                3F2B33EA165AF15500E3987C /* JSWebKitCSSViewportRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebKitCSSViewportRule.h; sourceTree = "<group>"; };
                3F3BB5821E709EE400C701F2 /* CoreAudioCaptureSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CoreAudioCaptureSource.cpp; sourceTree = "<group>"; };
                3F8020341E9E381D00DEC61D /* CoreAudioCaptureDeviceManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreAudioCaptureDeviceManager.h; sourceTree = "<group>"; };
                3FBC4AF1189881560046EE38 /* VideoFullscreenInterfaceAVKit.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = VideoFullscreenInterfaceAVKit.mm; sourceTree = "<group>"; };
                3FBC4AF2189881560046EE38 /* VideoFullscreenInterfaceAVKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoFullscreenInterfaceAVKit.h; sourceTree = "<group>"; };
-               3FFFF9A6159D9A550020BBD5 /* WebKitCSSViewportRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitCSSViewportRule.cpp; sourceTree = "<group>"; };
-               3FFFF9A7159D9A550020BBD5 /* WebKitCSSViewportRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitCSSViewportRule.h; sourceTree = "<group>"; };
-               3FFFF9AB159D9B060020BBD5 /* ViewportStyleResolver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ViewportStyleResolver.cpp; sourceTree = "<group>"; };
-               3FFFF9AC159D9B060020BBD5 /* ViewportStyleResolver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewportStyleResolver.h; sourceTree = "<group>"; };
                41024FC823CF254F00FDF98E /* SampleBufferDisplayLayer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SampleBufferDisplayLayer.cpp; sourceTree = "<group>"; };
                410626A72280A22A006D1B59 /* JSAudioNodeCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAudioNodeCustom.cpp; sourceTree = "<group>"; };
                4107908A1FC3E4F20061B27A /* ClientOrigin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClientOrigin.h; sourceTree = "<group>"; };
                CD94A5CC1F71CB6900F525C5 /* CDMRequirement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDMRequirement.h; sourceTree = "<group>"; };
                CD94A5CD1F71CB6900F525C5 /* CDMKeySystemConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDMKeySystemConfiguration.h; sourceTree = "<group>"; };
                CD94A5CE1F71CB6A00F525C5 /* CDMInstance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDMInstance.h; sourceTree = "<group>"; };
+               CD94A5CF1F71CB6100F525C5 /* CDMProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDMProxy.h; sourceTree = "<group>"; };
+               CD94A5CF1F71CB6100F525D5 /* CDMProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CDMProxy.cpp; sourceTree = "<group>"; };
                CD94A5CF1F71CB6A00F525C5 /* CDMPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDMPrivate.h; sourceTree = "<group>"; };
                CD94A5D01F71CB6B00F525C5 /* CDMRestrictions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDMRestrictions.h; sourceTree = "<group>"; };
                CD94A5D11F71CB6B00F525C5 /* CDMFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CDMFactory.cpp; sourceTree = "<group>"; };
                CD94A5D21F71CB6B00F525C5 /* CDMFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDMFactory.h; sourceTree = "<group>"; };
-               CD94A5CF1F71CB6100F525D5 /* CDMProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CDMProxy.cpp; sourceTree = "<group>"; };
-               CD94A5CF1F71CB6100F525C5 /* CDMProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDMProxy.h; sourceTree = "<group>"; };
                CD94A5D31F71CB6C00F525C5 /* CDMMediaCapability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDMMediaCapability.h; sourceTree = "<group>"; };
                CD94A5D41F71CB6C00F525C5 /* CDMKeyStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDMKeyStatus.h; sourceTree = "<group>"; };
                CD94A5D51F71CB6D00F525C5 /* CDMSessionType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDMSessionType.h; sourceTree = "<group>"; };
                                B2227B040D00BFF10071B782 /* SVGCSSValueKeywords.in */,
                                FB484F4A171F821E00040755 /* TransformFunctions.cpp */,
                                FB484F4B171F821E00040755 /* TransformFunctions.h */,
-                               3FFFF9AB159D9B060020BBD5 /* ViewportStyleResolver.cpp */,
-                               3FFFF9AC159D9B060020BBD5 /* ViewportStyleResolver.h */,
                                498391550F1E776900C23782 /* WebKitCSSMatrix.cpp */,
                                498391560F1E776900C23782 /* WebKitCSSMatrix.h */,
                                498391570F1E776900C23782 /* WebKitCSSMatrix.idl */,
-                               3FFFF9A6159D9A550020BBD5 /* WebKitCSSViewportRule.cpp */,
-                               3FFFF9A7159D9A550020BBD5 /* WebKitCSSViewportRule.h */,
-                               3F2B33E3165ABD3500E3987C /* WebKitCSSViewportRule.idl */,
                                31055BB81E4FE18900EB604E /* WebKitFontFamilyNames.in */,
                        );
                        path = css;
                                070E81D11BF27656001FDA48 /* VideoTrackPrivateMediaStream.h in Headers */,
                                CEF418CF1179678C009D112C /* ViewportArguments.h in Headers */,
                                26F9A83918A046AC00AEB88A /* ViewportConfiguration.h in Headers */,
-                               3FFFF9AE159D9B060020BBD5 /* ViewportStyleResolver.h in Headers */,
                                83407FC11E8D9C1700E048D3 /* VisibilityChangeClient.h in Headers */,
                                46CA9C441F97BBE9004CFC3A /* VisibilityState.h in Headers */,
                                93309E20099E64920056E581 /* VisiblePosition.h in Headers */,
                                31C0FF220E4CEB6E007D6FE5 /* WebKitAnimationEvent.h in Headers */,
                                5DFEBAB718592B6D00C75BEB /* WebKitAvailability.h in Headers */,
                                498391590F1E776900C23782 /* WebKitCSSMatrix.h in Headers */,
-                               3FFFF9A9159D9A550020BBD5 /* WebKitCSSViewportRule.h in Headers */,
                                2D0621451DA639BA00A7FB26 /* WebKitMediaKeyMessageEvent.h in Headers */,
                                2D0621511DA63A9F00A7FB26 /* WebKitMediaKeyNeededEvent.h in Headers */,
                                2D06214E1DA63A8E00A7FB26 /* WebKitMediaKeys.h in Headers */,
index 5a8806c..4628d9b 100644 (file)
@@ -46,8 +46,6 @@
 #include "JSCSSSupportsRule.h"
 #include "JSNode.h"
 #include "JSStyleSheetCustom.h"
-#include "JSWebKitCSSViewportRule.h"
-#include "WebKitCSSViewportRule.h"
 
 
 namespace WebCore {
@@ -79,10 +77,6 @@ JSValue toJSNewlyCreated(JSGlobalObject*, JSDOMGlobalObject* globalObject, Ref<C
         return createWrapper<CSSKeyframesRule>(globalObject, WTFMove(rule));
     case CSSRule::SUPPORTS_RULE:
         return createWrapper<CSSSupportsRule>(globalObject, WTFMove(rule));
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-    case CSSRule::WEBKIT_VIEWPORT_RULE:
-        return createWrapper<WebKitCSSViewportRule>(globalObject, WTFMove(rule));
-#endif
     default:
         return createWrapper<CSSRule>(globalObject, WTFMove(rule));
     }
index 3957975..4a3b8b9 100644 (file)
@@ -3813,14 +3813,6 @@ RefPtr<CSSValue> ComputedStyleExtractor::valueForPropertyInStyle(const RenderSty
         case CSSPropertyTransformOriginZ:
             break;
 
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-        case CSSPropertyMaxZoom:
-        case CSSPropertyMinZoom:
-        case CSSPropertyOrientation:
-        case CSSPropertyUserZoom:
-            break;
-#endif
-
         case CSSPropertyBufferedRendering:
         case CSSPropertyClipRule:
         case CSSPropertyMask:
index 6e314c4..aac1a32 100644 (file)
                 "url": "https://www.w3.org/TR/css-shapes/#propdef-shape-image-threshold"
             }
         },
-        "max-zoom": {
-            "codegen-properties": {
-                "skip-builder": true,
-                "enable-if": "ENABLE_CSS_DEVICE_ADAPTATION"
-            },
-            "specification": {
-                "category": "css-device-adapt",
-                "url": "https://www.w3.org/TR/css-device-adapt-1/#descdef-viewport-max-zoom"
-            }
-        },
-        "min-zoom": {
-            "codegen-properties": {
-                "skip-builder": true,
-                "enable-if": "ENABLE_CSS_DEVICE_ADAPTATION"
-            },
-            "specification": {
-                "category": "css-device-adapt",
-                "url": "https://www.w3.org/TR/css-device-adapt-1/#descdef-viewport-min-zoom"
-            }
-        },
-        "orientation": {
-            "codegen-properties": {
-                "skip-builder": true,
-                "enable-if": "ENABLE_CSS_DEVICE_ADAPTATION"
-            },
-            "specification": {
-                "category": "css-device-adapt",
-                "url": "https://www.w3.org/TR/css-device-adapt-1/#descdef-viewport-orientation"
-            }
-        },
-        "user-zoom": {
-            "codegen-properties": {
-                "skip-builder": true,
-                "enable-if": "ENABLE_CSS_DEVICE_ADAPTATION"
-            },
-            "specification": {
-                "category": "css-device-adapt",
-                "url": "https://www.w3.org/TR/css-device-adapt-1/#descdef-viewport-user-zoom"
-            }
-        },
         "-webkit-tap-highlight-color": {
             "inherited": true,
             "codegen-properties": {
index c460595..f699a11 100644 (file)
@@ -164,12 +164,6 @@ CSSPropertyID CSSProperty::resolveDirectionAwareProperty(CSSPropertyID propertyI
 bool CSSProperty::isDescriptorOnly(CSSPropertyID propertyID)
 {
     switch (propertyID) {
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-    case CSSPropertyMinZoom:
-    case CSSPropertyMaxZoom:
-    case CSSPropertyOrientation:
-    case CSSPropertyUserZoom:
-#endif
     case CSSPropertySrc:
     case CSSPropertyUnicodeRange:
     case CSSPropertyFontDisplay:
index 27cef09..b886868 100644 (file)
@@ -47,9 +47,6 @@ COMPILE_ASSERT(StyleRuleType::Keyframes == static_cast<StyleRuleType>(CSSRule::T
 COMPILE_ASSERT(StyleRuleType::Keyframe == static_cast<StyleRuleType>(CSSRule::Type::KEYFRAME_RULE), enums_should_match);
 COMPILE_ASSERT(StyleRuleType::Namespace == static_cast<StyleRuleType>(CSSRule::Type::NAMESPACE_RULE), enums_should_match);
 COMPILE_ASSERT(StyleRuleType::Supports == static_cast<StyleRuleType>(CSSRule::Type::SUPPORTS_RULE), enums_should_match);
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-COMPILE_ASSERT(StyleRuleBase::Viewport == static_cast<StyleRuleType>(CSSRule::WEBKIT_VIEWPORT_RULE), enums_should_match);
-#endif
 
 ExceptionOr<void> CSSRule::setCssText(const String&)
 {
index e9f6368..4da5b63 100644 (file)
@@ -51,9 +51,6 @@ public:
         KEYFRAME_RULE,
         NAMESPACE_RULE = 10, // Matches other browsers.
         SUPPORTS_RULE = 12,
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-        WEBKIT_VIEWPORT_RULE = 15,
-#endif
     };
 
     enum DeprecatedType {
index 45d61e2..2d406ba 100644 (file)
@@ -37,7 +37,6 @@
     const unsigned short KEYFRAME_RULE = 8;
     const unsigned short NAMESPACE_RULE = 10;
     const unsigned short SUPPORTS_RULE = 12;
-    [Conditional=CSS_DEVICE_ADAPTATION] const unsigned short WEBKIT_VIEWPORT_RULE = 15;
 
     // Legacy synonyms for the above, kept to avoid breaking existing content.
     const unsigned short WEBKIT_KEYFRAMES_RULE = 7;
index 281435e..47f4d78 100644 (file)
@@ -984,24 +984,6 @@ step-end
 document
 reset
 
-#if defined(ENABLE_CSS_DEVICE_ADAPTATION) && ENABLE_CSS_DEVICE_ADAPTATION
-//
-// CSS_PROP_USER_ZOOM
-//
-// fixed
-zoom
-
-//
-// CSS_PROP_MIN_WIDTH
-// CSS_PROP_MAX_WIDTH
-// CSS_PROP_MIN_HEIGHT
-// CSS_PROP_MAX_HEIGHT
-//
-// auto
-device-width
-device-height
-#endif
-
 //
 // CSS_PROP_POINTER_EVENTS
 //
index d46babe..2c100cf 100644 (file)
@@ -35,7 +35,6 @@
 #include "MediaList.h"
 #include "StyleProperties.h"
 #include "StyleRuleImport.h"
-#include "WebKitCSSViewportRule.h"
 
 namespace WebCore {
 
@@ -82,11 +81,6 @@ void StyleRuleBase::destroy()
     case StyleRuleType::Keyframes:
         delete downcast<StyleRuleKeyframes>(this);
         return;
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-    case StyleRuleType::Viewport:
-        delete downcast<StyleRuleViewport>(this);
-        return;
-#endif
     case StyleRuleType::Namespace:
         delete downcast<StyleRuleNamespace>(this);
         return;
@@ -118,10 +112,6 @@ Ref<StyleRuleBase> StyleRuleBase::copy() const
         return downcast<StyleRuleSupports>(*this).copy();
     case StyleRuleType::Keyframes:
         return downcast<StyleRuleKeyframes>(*this).copy();
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-    case StyleRuleType::Viewport:
-        return downcast<StyleRuleViewport>(*this).copy();
-#endif
     case StyleRuleType::Import:
     case StyleRuleType::Namespace:
         // FIXME: Copy import and namespace rules.
@@ -160,11 +150,6 @@ Ref<CSSRule> StyleRuleBase::createCSSOMWrapper(CSSStyleSheet* parentSheet, CSSRu
     case StyleRuleType::Keyframes:
         rule = CSSKeyframesRule::create(downcast<StyleRuleKeyframes>(self), parentSheet);
         break;
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-    case StyleRuleType::Viewport:
-        rule = WebKitCSSViewportRule::create(downcast<StyleRuleViewport>(self), parentSheet);
-        break;
-#endif
     case StyleRuleType::Namespace:
         rule = CSSNamespaceRule::create(downcast<StyleRuleNamespace>(self), parentSheet);
         break;
@@ -402,29 +387,6 @@ StyleRuleSupports::StyleRuleSupports(const StyleRuleSupports& o)
 {
 }
 
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-StyleRuleViewport::StyleRuleViewport(Ref<StyleProperties>&& properties)
-    : StyleRuleBase(StyleRuleType::Viewport)
-    , m_properties(WTFMove(properties))
-{
-}
-
-StyleRuleViewport::StyleRuleViewport(const StyleRuleViewport& o)
-    : StyleRuleBase(o)
-    , m_properties(o.m_properties->mutableCopy())
-{
-}
-
-StyleRuleViewport::~StyleRuleViewport() = default;
-
-MutableStyleProperties& StyleRuleViewport::mutableProperties()
-{
-    if (!m_properties->isMutable())
-        m_properties = m_properties->mutableCopy();
-    return static_cast<MutableStyleProperties&>(m_properties.get());
-}
-#endif // ENABLE(CSS_DEVICE_ADAPTATION)
-
 StyleRuleCharset::StyleRuleCharset()
     : StyleRuleBase(StyleRuleType::Charset)
 {
index c50c79e..b0999b5 100644 (file)
@@ -55,9 +55,6 @@ public:
     bool isPageRule() const { return type() == StyleRuleType::Page; }
     bool isStyleRule() const { return type() == StyleRuleType::Style; }
     bool isSupportsRule() const { return type() == StyleRuleType::Supports; }
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-    bool isViewportRule() const { return type() == StyleRuleType::Viewport; }
-#endif
     bool isImportRule() const { return type() == StyleRuleType::Import; }
 
     Ref<StyleRuleBase> copy() const;
@@ -293,26 +290,6 @@ private:
     bool m_conditionIsSupported;
 };
 
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-class StyleRuleViewport final : public StyleRuleBase {
-public:
-    static Ref<StyleRuleViewport> create(Ref<StyleProperties>&& properties) { return adoptRef(*new StyleRuleViewport(WTFMove(properties))); }
-
-    ~StyleRuleViewport();
-
-    const StyleProperties& properties() const { return m_properties.get(); }
-    MutableStyleProperties& mutableProperties();
-
-    Ref<StyleRuleViewport> copy() const { return adoptRef(*new StyleRuleViewport(*this)); }
-
-private:
-    explicit StyleRuleViewport(Ref<StyleProperties>&&);
-    StyleRuleViewport(const StyleRuleViewport&);
-
-    Ref<StyleProperties> m_properties;
-};
-#endif // ENABLE(CSS_DEVICE_ADAPTATION)
-
 // This is only used by the CSS parser.
 class StyleRuleCharset final : public StyleRuleBase {
 public:
@@ -371,12 +348,6 @@ SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::StyleRuleSupports)
     static bool isType(const WebCore::StyleRuleBase& rule) { return rule.isSupportsRule(); }
 SPECIALIZE_TYPE_TRAITS_END()
 
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::StyleRuleViewport)
-    static bool isType(const WebCore::StyleRuleBase& rule) { return rule.isViewportRule(); }
-SPECIALIZE_TYPE_TRAITS_END()
-#endif // ENABLE(CSS_DEVICE_ADAPTATION)
-
 SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::StyleRuleNamespace)
     static bool isType(const WebCore::StyleRuleBase& rule) { return rule.isNamespaceRule(); }
 SPECIALIZE_TYPE_TRAITS_END()
index 3444286..cbb939b 100644 (file)
@@ -39,9 +39,6 @@ enum class StyleRuleType : uint8_t {
     Keyframe, // Not used. These are internally non-rule StyleRuleKeyframe objects.
     Namespace = 10,
     Supports = 12,
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-    Viewport = 15,
-#endif
 };
 
 } // namespace WebCore
index b56bed7..9060ae2 100644 (file)
@@ -445,9 +445,6 @@ static bool traverseRulesInVector(const Vector<RefPtr<StyleRuleBase>>& rules, co
         case StyleRuleType::Charset:
         case StyleRuleType::Keyframe:
         case StyleRuleType::Supports:
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-        case StyleRuleType::Viewport:
-#endif
             break;
         }
     }
@@ -488,9 +485,6 @@ bool StyleSheetContents::traverseSubresources(const WTF::Function<bool (const Ca
         case StyleRuleType::Charset:
         case StyleRuleType::Keyframe:
         case StyleRuleType::Supports:
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-        case StyleRuleType::Viewport:
-#endif
             return false;
         };
         ASSERT_NOT_REACHED();
diff --git a/Source/WebCore/css/ViewportStyleResolver.cpp b/Source/WebCore/css/ViewportStyleResolver.cpp
deleted file mode 100644 (file)
index cfc416c..0000000
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (C) 2012 Intel Corporation. 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 THE COPYRIGHT HOLDER “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 THE COPYRIGHT HOLDER 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 "ViewportStyleResolver.h"
-
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-
-#include "CSSValueKeywords.h"
-#include "Document.h"
-#include "NodeRenderStyle.h"
-#include "StyleProperties.h"
-#include "StyleRule.h"
-#include "ViewportArguments.h"
-
-namespace WebCore {
-
-ViewportStyleResolver::ViewportStyleResolver(Document* document)
-    : m_document(document ? makeWeakPtr(*document) : nullptr)
-{
-    ASSERT(m_document);
-}
-
-ViewportStyleResolver::~ViewportStyleResolver() = default;
-
-void ViewportStyleResolver::addViewportRule(StyleRuleViewport* viewportRule)
-{
-    StyleProperties& propertySet = viewportRule->mutableProperties();
-
-    unsigned propertyCount = propertySet.propertyCount();
-    if (!propertyCount)
-        return;
-
-    if (!m_propertySet) {
-        m_propertySet = propertySet.mutableCopy();
-        return;
-    }
-
-    m_propertySet->mergeAndOverrideOnConflict(propertySet);
-}
-
-void ViewportStyleResolver::clearDocument()
-{
-    m_document = nullptr;
-}
-
-void ViewportStyleResolver::resolve()
-{
-    if (!m_document || !m_propertySet)
-        return;
-
-    ViewportArguments arguments(ViewportArguments::CSSDeviceAdaptation);
-
-    arguments.userZoom = getViewportArgumentValue(CSSPropertyUserZoom);
-    arguments.zoom = getViewportArgumentValue(CSSPropertyZoom);
-    arguments.minZoom = getViewportArgumentValue(CSSPropertyMinZoom);
-    arguments.maxZoom = getViewportArgumentValue(CSSPropertyMaxZoom);
-    arguments.minWidth = getViewportArgumentValue(CSSPropertyMinWidth);
-    arguments.maxWidth = getViewportArgumentValue(CSSPropertyMaxWidth);
-    arguments.minHeight = getViewportArgumentValue(CSSPropertyMinHeight);
-    arguments.maxHeight = getViewportArgumentValue(CSSPropertyMaxHeight);
-    arguments.orientation = getViewportArgumentValue(CSSPropertyOrientation);
-
-    m_document->setViewportArguments(arguments);
-    m_document->updateViewportArguments();
-
-    m_propertySet = nullptr;
-}
-
-float ViewportStyleResolver::getViewportArgumentValue(CSSPropertyID id) const
-{
-    float defaultValue = ViewportArguments::ValueAuto;
-
-    // UserZoom default value is CSSValueZoom, which maps to true, meaning that
-    // yes, it is user scalable. When the value is set to CSSValueFixed, we
-    // return false.
-    if (id == CSSPropertyUserZoom)
-        defaultValue = 1;
-
-    RefPtr<CSSValue> value = m_propertySet->getPropertyCSSValue(id);
-    if (!is<CSSPrimitiveValue>(value))
-        return defaultValue;
-
-    CSSPrimitiveValue& primitiveValue = downcast<CSSPrimitiveValue>(*value);
-
-    if (primitiveValue.isNumber() || primitiveValue.isPx())
-        return primitiveValue.floatValue();
-
-    if (primitiveValue.isFontRelativeLength())
-        return primitiveValue.floatValue() * m_document->documentElement()->renderStyle()->fontDescription().computedSize();
-
-    if (primitiveValue.isPercentage()) {
-        float percentValue = primitiveValue.floatValue() / 100.0f;
-        switch (id) {
-        case CSSPropertyMaxHeight:
-        case CSSPropertyMinHeight:
-            ASSERT(m_document->initialViewportSize().height() > 0);
-            return percentValue * m_document->initialViewportSize().height();
-        case CSSPropertyMaxWidth:
-        case CSSPropertyMinWidth:
-            ASSERT(m_document->initialViewportSize().width() > 0);
-            return percentValue * m_document->initialViewportSize().width();
-        case CSSPropertyMaxZoom:
-        case CSSPropertyMinZoom:
-        case CSSPropertyZoom:
-            return percentValue;
-        default:
-            ASSERT_NOT_REACHED();
-            break;
-        }
-    }
-
-    switch (primitiveValue.valueID()) {
-    case CSSValueAuto:
-        return defaultValue;
-    case CSSValueDeviceHeight:
-        return ViewportArguments::ValueDeviceHeight;
-    case CSSValueDeviceWidth:
-        return ViewportArguments::ValueDeviceWidth;
-    case CSSValueLandscape:
-        return ViewportArguments::ValueLandscape;
-    case CSSValuePortrait:
-        return ViewportArguments::ValuePortrait;
-    case CSSValueZoom:
-        return defaultValue;
-    case CSSValueFixed:
-        return 0;
-    default:
-        return defaultValue;
-    }
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(CSS_DEVICE_ADAPTATION)
diff --git a/Source/WebCore/css/ViewportStyleResolver.h b/Source/WebCore/css/ViewportStyleResolver.h
deleted file mode 100644 (file)
index e1b8e5a..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2012 Intel Corporation. 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 THE COPYRIGHT HOLDER “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 THE COPYRIGHT HOLDER 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.
- */
-
-#pragma once
-
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-
-#include "CSSPropertyNames.h"
-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
-
-namespace WebCore {
-
-class CSSPrimitiveValue;
-class Document;
-class MutableStyleProperties;
-class StyleRuleViewport;
-
-class ViewportStyleResolver final : public RefCounted<ViewportStyleResolver> {
-public:
-    static Ref<ViewportStyleResolver> create(Document* document)
-    {
-        return adoptRef(*new ViewportStyleResolver(document));
-    }
-
-    ~ViewportStyleResolver();
-
-    void addViewportRule(StyleRuleViewport*);
-
-    void clearDocument();
-    void resolve();
-
-private:
-    explicit ViewportStyleResolver(Document*);
-
-    float getViewportArgumentValue(CSSPropertyID) const;
-
-    WeakPtr<Document> m_document;
-    RefPtr<MutableStyleProperties> m_propertySet;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(CSS_DEVICE_ADAPTATION)
diff --git a/Source/WebCore/css/WebKitCSSViewportRule.cpp b/Source/WebCore/css/WebKitCSSViewportRule.cpp
deleted file mode 100644 (file)
index cbd172f..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2012 Intel Corporation. All rights reserved.
- * Copyright (C) 2012 Apple 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 THE COPYRIGHT HOLDER “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 THE COPYRIGHT HOLDER 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 "WebKitCSSViewportRule.h"
-
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-
-#include "PropertySetCSSStyleDeclaration.h"
-#include "StyleProperties.h"
-#include "StyleRule.h"
-#include <wtf/text/StringBuilder.h>
-
-namespace WebCore {
-
-WebKitCSSViewportRule::WebKitCSSViewportRule(StyleRuleViewport& viewportRule, CSSStyleSheet* sheet)
-    : CSSRule(sheet)
-    , m_viewportRule(viewportRule)
-{
-}
-
-WebKitCSSViewportRule::~WebKitCSSViewportRule()
-{
-    if (m_propertiesCSSOMWrapper)
-        m_propertiesCSSOMWrapper->clearParentRule();
-}
-
-CSSStyleDeclaration& WebKitCSSViewportRule::style()
-{
-    if (!m_propertiesCSSOMWrapper)
-        m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_viewportRule->mutableProperties(), *this);
-
-    return *m_propertiesCSSOMWrapper;
-}
-
-String WebKitCSSViewportRule::cssText() const
-{
-    StringBuilder result;
-    result.appendLiteral("@-webkit-viewport { ");
-
-    String decls = m_viewportRule->properties().asText();
-    result.append(decls);
-    if (!decls.isEmpty())
-        result.append(' ');
-
-    result.append('}');
-
-    return result.toString();
-}
-
-void WebKitCSSViewportRule::reattach(StyleRuleBase& rule)
-{
-    m_viewportRule = downcast<StyleRuleViewport>(rule);
-
-    if (m_propertiesCSSOMWrapper)
-        m_propertiesCSSOMWrapper->reattach(m_viewportRule->mutableProperties());
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(CSS_DEVICE_ADAPTATION)
diff --git a/Source/WebCore/css/WebKitCSSViewportRule.h b/Source/WebCore/css/WebKitCSSViewportRule.h
deleted file mode 100644 (file)
index 9e10649..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2012 Intel Corporation. All rights reserved.
- * Copyright (C) 2012 Apple 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 THE COPYRIGHT HOLDER “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 THE COPYRIGHT HOLDER 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.
- */
-
-#pragma once
-
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-
-#include "CSSRule.h"
-
-namespace WebCore {
-
-class CSSStyleDeclaration;
-class StyleRuleViewport;
-class StyleRuleCSSStyleDeclaration;
-
-class WebKitCSSViewportRule final : public CSSRule {
-public:
-    static Ref<WebKitCSSViewportRule> create(StyleRuleViewport& viewportRule, CSSStyleSheet* sheet)
-    {
-        return adoptRef(*new WebKitCSSViewportRule(viewportRule, sheet));
-    }
-    virtual ~WebKitCSSViewportRule();
-
-    String cssText() const final;
-    void reattach(StyleRuleBase&) final;
-
-    CSSStyleDeclaration& style();
-
-private:
-    WebKitCSSViewportRule(StyleRuleViewport&, CSSStyleSheet*);
-
-    CSSRule::Type type() const final { return WEBKIT_VIEWPORT_RULE; }
-
-    Ref<StyleRuleViewport> m_viewportRule;
-    mutable RefPtr<StyleRuleCSSStyleDeclaration> m_propertiesCSSOMWrapper;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(CSS_DEVICE_ADAPTATION)
diff --git a/Source/WebCore/css/WebKitCSSViewportRule.idl b/Source/WebCore/css/WebKitCSSViewportRule.idl
deleted file mode 100644 (file)
index a194922..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2012 Intel Corporation. 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 THE COPYRIGHT HOLDER “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 THE COPYRIGHT HOLDER 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.
- */
-
-[
-    Conditional=CSS_DEVICE_ADAPTATION,
-] interface WebKitCSSViewportRule : CSSRule {
-    readonly attribute CSSStyleDeclaration style;
-};
index 73ed1cc..ffad497 100644 (file)
@@ -430,10 +430,6 @@ RefPtr<StyleRuleBase> CSSParserImpl::consumeAtRule(CSSParserTokenRange& range, A
         return consumeMediaRule(prelude, block);
     case CSSAtRuleSupports:
         return consumeSupportsRule(prelude, block);
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-    case CSSAtRuleViewport:
-        return consumeViewportRule(prelude, block);
-#endif
     case CSSAtRuleFontFace:
         return consumeFontFaceRule(prelude, block);
     case CSSAtRuleWebkitKeyframes:
@@ -575,25 +571,6 @@ RefPtr<StyleRuleSupports> CSSParserImpl::consumeSupportsRule(CSSParserTokenRange
     return StyleRuleSupports::create(prelude.serialize().stripWhiteSpace(), supported, rules);
 }
 
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-RefPtr<StyleRuleViewport> CSSParserImpl::consumeViewportRule(CSSParserTokenRange prelude, CSSParserTokenRange block)
-{
-    if (!prelude.atEnd())
-        return nullptr; // Parser error; @viewport prelude should be empty
-
-    if (m_observerWrapper) {
-        unsigned endOffset = m_observerWrapper->endOffset(prelude);
-        m_observerWrapper->observer().startRuleHeader(StyleRuleType::Viewport, m_observerWrapper->startOffset(prelude));
-        m_observerWrapper->observer().endRuleHeader(endOffset);
-        m_observerWrapper->observer().startRuleBody(endOffset);
-        m_observerWrapper->observer().endRuleBody(endOffset);
-    }
-
-    consumeDeclarationList(block, StyleRule::Viewport);
-    return StyleRuleViewport::create(createStyleProperties(m_parsedProperties, CSSViewportRuleMode));
-}
-#endif
-
 RefPtr<StyleRuleFontFace> CSSParserImpl::consumeFontFaceRule(CSSParserTokenRange prelude, CSSParserTokenRange block)
 {
     if (!prelude.atEnd())
index d67f88a..afffa43 100644 (file)
@@ -266,11 +266,6 @@ bool CSSPropertyParser::parseValue(CSSPropertyID propertyID, bool important, con
     CSSPropertyParser parser(range, context, &parsedProperties);
     bool parseSuccess;
 
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-    if (ruleType == StyleRuleType::Viewport)
-        parseSuccess = parser.parseViewportDescriptor(propertyID, important);
-    else
-#endif
     if (ruleType == StyleRuleType::FontFace)
         parseSuccess = parser.parseFontFaceDescriptor(propertyID);
     else
@@ -4666,93 +4661,6 @@ bool CSSPropertyParser::consumeBorderSpacing(bool important)
     return true;
 }
 
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-
-static RefPtr<CSSValue> consumeSingleViewportDescriptor(CSSParserTokenRange& range, CSSPropertyID propId, CSSParserMode cssParserMode)
-{
-    CSSValueID id = range.peek().id();
-    switch (propId) {
-    case CSSPropertyMinWidth:
-    case CSSPropertyMaxWidth:
-    case CSSPropertyMinHeight:
-    case CSSPropertyMaxHeight:
-        if (id == CSSValueAuto)
-            return consumeIdent(range);
-        return consumeLengthOrPercent(range, cssParserMode, ValueRangeNonNegative);
-    case CSSPropertyMinZoom:
-    case CSSPropertyMaxZoom:
-    case CSSPropertyZoom: {
-        if (id == CSSValueAuto)
-            return consumeIdent(range);
-        RefPtr<CSSValue> parsedValue = consumeNumber(range, ValueRangeNonNegative);
-        if (parsedValue)
-            return parsedValue;
-        return consumePercent(range, ValueRangeNonNegative);
-    }
-    case CSSPropertyUserZoom:
-        return consumeIdent<CSSValueZoom, CSSValueFixed>(range);
-    case CSSPropertyOrientation:
-        return consumeIdent<CSSValueAuto, CSSValuePortrait, CSSValueLandscape>(range);
-    default:
-        ASSERT_NOT_REACHED();
-        break;
-    }
-
-    ASSERT_NOT_REACHED();
-    return nullptr;
-}
-
-bool CSSPropertyParser::parseViewportDescriptor(CSSPropertyID propId, bool important)
-{
-    switch (propId) {
-    case CSSPropertyWidth: {
-        RefPtr<CSSValue> minWidth = consumeSingleViewportDescriptor(m_range, CSSPropertyMinWidth, m_context.mode);
-        if (!minWidth)
-            return false;
-        RefPtr<CSSValue> maxWidth = minWidth;
-        if (!m_range.atEnd())
-            maxWidth = consumeSingleViewportDescriptor(m_range, CSSPropertyMaxWidth, m_context.mode);
-        if (!maxWidth || !m_range.atEnd())
-            return false;
-        addProperty(CSSPropertyMinWidth, CSSPropertyInvalid, *minWidth, important);
-        addProperty(CSSPropertyMaxWidth, CSSPropertyInvalid, *maxWidth, important);
-        return true;
-    }
-    case CSSPropertyHeight: {
-        RefPtr<CSSValue> minHeight = consumeSingleViewportDescriptor(m_range, CSSPropertyMinHeight, m_context.mode);
-        if (!minHeight)
-            return false;
-        RefPtr<CSSValue> maxHeight = minHeight;
-        if (!m_range.atEnd())
-            maxHeight = consumeSingleViewportDescriptor(m_range, CSSPropertyMaxHeight, m_context.mode);
-        if (!maxHeight || !m_range.atEnd())
-            return false;
-        addProperty(CSSPropertyMinHeight, CSSPropertyInvalid, *minHeight, important);
-        addProperty(CSSPropertyMaxHeight, CSSPropertyInvalid, *maxHeight, important);
-        return true;
-    }
-    case CSSPropertyMinWidth:
-    case CSSPropertyMaxWidth:
-    case CSSPropertyMinHeight:
-    case CSSPropertyMaxHeight:
-    case CSSPropertyMinZoom:
-    case CSSPropertyMaxZoom:
-    case CSSPropertyZoom:
-    case CSSPropertyUserZoom:
-    case CSSPropertyOrientation: {
-        RefPtr<CSSValue> parsedValue = consumeSingleViewportDescriptor(m_range, propId, m_context.mode);
-        if (!parsedValue || !m_range.atEnd())
-            return false;
-        addProperty(propId, CSSPropertyInvalid, parsedValue.releaseNonNull(), important);
-        return true;
-    }
-    default:
-        return false;
-    }
-}
-
-#endif
-
 bool CSSPropertyParser::consumeColumns(bool important)
 {
     RefPtr<CSSValue> columnWidth;
index 858e883..447b441 100644 (file)
@@ -6809,17 +6809,6 @@ DocumentLoader* Document::loader() const
     return loader;
 }
 
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-
-IntSize Document::initialViewportSize() const
-{
-    if (!view())
-        return IntSize();
-    return view()->initialViewportSize();
-}
-
-#endif
-
 Element* eventTargetElementForDocument(Document* document)
 {
     if (!document)
index 5620291..4bee2bb 100644 (file)
@@ -1270,10 +1270,6 @@ public:
     void suspendScheduledTasks(ReasonForSuspension);
     void resumeScheduledTasks(ReasonForSuspension);
 
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-    IntSize initialViewportSize() const;
-#endif
-
     void convertAbsoluteToClientQuads(Vector<FloatQuad>&, const RenderStyle&);
     void convertAbsoluteToClientRects(Vector<FloatRect>&, const RenderStyle&);
     void convertAbsoluteToClientRect(FloatRect&, const RenderStyle&);
index d2cc70f..fed1e5b 100644 (file)
@@ -558,11 +558,6 @@ public:
     // distinguish between the two.
     const Pagination& pagination() const;
     void setPagination(const Pagination&);
-    
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-    IntSize initialViewportSize() const { return m_initialViewportSize; }
-    void setInitialViewportSize(const IntSize& size) { m_initialViewportSize = size; }
-#endif
 
     bool isActive() const final;
     bool forceUpdateScrollbarsOnMainThreadForPerformanceTesting() const final;
@@ -895,12 +890,6 @@ private:
     static const unsigned visualCharacterThreshold = 200;
     static const unsigned visualPixelThreshold = 32 * 32;
 
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-    // Size of viewport before any UA or author styles have overridden
-    // the viewport given by the window or viewing area of the UA.
-    IntSize m_initialViewportSize;
-#endif
-
     Pagination m_pagination;
 
     enum class ViewportRendererType : uint8_t { None, Document, Body };
index 7b9adee..a4b7375 100644 (file)
@@ -42,7 +42,6 @@
 #include "StyleRule.h"
 #include "StyleRuleImport.h"
 #include "StyleSheetContents.h"
-#include "ViewportStyleResolver.h"
 
 #if ENABLE(VIDEO_TRACK)
 #include "TextTrackCue.h"
index f46c3b2..e27e53f 100644 (file)
@@ -42,7 +42,6 @@
 #include "StyleRule.h"
 #include "StyleRuleImport.h"
 #include "StyleSheetContents.h"
-#include "ViewportStyleResolver.h"
 
 #if ENABLE(VIDEO_TRACK)
 #include "TextTrackCue.h"
@@ -312,14 +311,6 @@ void RuleSet::addChildRules(const Vector<RefPtr<StyleRuleBase>>& rules, MediaQue
             addChildRules(downcast<StyleRuleSupports>(*rule).childRules(), mediaQueryCollector, resolver, mode);
             continue;
         }
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-        if (is<StyleRuleViewport>(*rule)) {
-            if (resolver)
-                resolver->viewportStyleResolver()->addViewportRule(downcast<StyleRuleViewport>(rule.get()));
-            mediaQueryCollector.didMutateResolver();
-            continue;
-        }
-#endif
     }
 }
 
index 8bf371a..f3f3621 100644 (file)
@@ -72,7 +72,6 @@
 #include "StyleRule.h"
 #include "StyleSheetContents.h"
 #include "UserAgentStyle.h"
-#include "ViewportStyleResolver.h"
 #include "VisitedLinkState.h"
 #include "WebKitFontFamilyNames.h"
 #include <wtf/Seconds.h>
@@ -88,9 +87,6 @@ using namespace HTMLNames;
 Resolver::Resolver(Document& document)
     : m_ruleSets(*this)
     , m_document(document)
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-    , m_viewportStyleResolver(ViewportStyleResolver::create(&document))
-#endif
     , m_matchAuthorAndUserStyles(m_document.settings().authorAndUserStylesEnabled())
 {
     Element* root = m_document.documentElement();
@@ -142,10 +138,6 @@ void Resolver::appendAuthorStyleSheets(const Vector<RefPtr<CSSStyleSheet>>& styl
 
     if (auto renderView = document().renderView())
         renderView->style().fontCascade().update(&document().fontSelector());
-
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-    viewportStyleResolver()->resolve();
-#endif
 }
 
 // This is a simplified style setting function for keyframe styles
@@ -160,10 +152,6 @@ Resolver::~Resolver()
     RELEASE_ASSERT(!m_document.isResolvingTreeStyle());
     RELEASE_ASSERT(!m_isDeleted);
     m_isDeleted = true;
-
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-    m_viewportStyleResolver->clearDocument();
-#endif
 }
 
 Resolver::State::State(const Element& element, const RenderStyle* parentStyle, const RenderStyle* documentElementStyle)
index c770431..cfa52a3 100644 (file)
@@ -127,10 +127,6 @@ public:
     bool hasSelectorForId(const AtomString&) const;
     bool hasSelectorForAttribute(const Element&, const AtomString&) const;
 
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-    ViewportStyleResolver* viewportStyleResolver() { return m_viewportStyleResolver.get(); }
-#endif
-
     bool hasViewportDependentMediaQueries() const;
     Optional<DynamicMediaQueryEvaluationChanges> evaluateDynamicMediaQueries();
 
@@ -193,10 +189,6 @@ private:
 
     RenderStyle* m_overrideDocumentElementStyle { nullptr };
 
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-    RefPtr<ViewportStyleResolver> m_viewportStyleResolver;
-#endif
-
     InspectorCSSOMWrappers m_inspectorCSSOMWrappers;
 
     MatchedDeclarationsCache m_matchedDeclarationsCache;
index 6e9f5b1..98abc43 100644 (file)
@@ -1,3 +1,17 @@
+2020-02-12  Simon Fraser  <simon.fraser@apple.com>
+
+        Remove CSS_DEVICE_ADAPTATION
+        https://bugs.webkit.org/show_bug.cgi?id=203479
+
+        Reviewed by Tim Horton.
+
+        CSS Working Group resolved to remove @viewport <https://github.com/w3c/csswg-drafts/issues/4766>,
+        so remove the code.
+
+        * Configurations/FeatureDefines.xcconfig:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::sendViewportAttributesChanged):
+
 2020-02-12  Brent Fulgham  <bfulgham@apple.com>
 
         [macOS] Remove irrelevant global-name rule in WebContent sandbox
index f4d26e3..2a91e25 100644 (file)
@@ -103,8 +103,6 @@ ENABLE_CSS_CONIC_GRADIENTS_maccatalyst = ENABLE_CSS_CONIC_GRADIENTS;
 ENABLE_CSS_CONIC_GRADIENTS_macosx = $(ENABLE_CSS_CONIC_GRADIENTS$(WK_MACOS_1014));
 ENABLE_CSS_CONIC_GRADIENTS_MACOS_SINCE_1014 = ENABLE_CSS_CONIC_GRADIENTS;
 
-ENABLE_CSS_DEVICE_ADAPTATION = ;
-
 ENABLE_CSS_IMAGE_RESOLUTION = ;
 
 ENABLE_CSS_PAINTING_API = ENABLE_CSS_PAINTING_API;
@@ -450,4 +448,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET;
 
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLE_PAY_SESSION_V9) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_GPU_PROCESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INSPECTOR_TELEMETRY) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFSCREEN_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLE_PAY_SESSION_V9) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_GPU_PROCESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INSPECTOR_TELEMETRY) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFSCREEN_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
index 508bcc1..e0284a8 100644 (file)
@@ -1785,12 +1785,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg
     // Use FloatSize to avoid truncated values during scale.
     FloatSize contentFixedSize = m_viewSize;
 
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-    // CSS viewport descriptors might be applied to already affected viewport size
-    // if the page enables/disables stylesheets, so need to keep initial viewport size.
-    view->setInitialViewportSize(roundedIntSize(contentFixedSize));
-#endif
-
     contentFixedSize.scale(1 / attr.initialScale);
     view->setFixedVisibleContentRect(IntRect(contentFixedOrigin, roundedIntSize(contentFixedSize)));
 
index e7ddc6d..bc1aa4d 100644 (file)
@@ -1,3 +1,17 @@
+2020-02-12  Simon Fraser  <simon.fraser@apple.com>
+
+        Remove CSS_DEVICE_ADAPTATION
+        https://bugs.webkit.org/show_bug.cgi?id=203479
+
+        Reviewed by Tim Horton.
+
+        CSS Working Group resolved to remove @viewport <https://github.com/w3c/csswg-drafts/issues/4766>,
+        so remove the code.
+
+        * Configurations/FeatureDefines.xcconfig:
+        * DOM/DOMCSS.mm:
+        (kitClass):
+
 2020-02-12  Said Abou-Hallawa  <said@apple.com>
 
         REGRESSION (r255158): http/tests/frame-throttling/raf-throttle-in-cross-origin-subframe.html is a flaky failure
index f4d26e3..2a91e25 100644 (file)
@@ -103,8 +103,6 @@ ENABLE_CSS_CONIC_GRADIENTS_maccatalyst = ENABLE_CSS_CONIC_GRADIENTS;
 ENABLE_CSS_CONIC_GRADIENTS_macosx = $(ENABLE_CSS_CONIC_GRADIENTS$(WK_MACOS_1014));
 ENABLE_CSS_CONIC_GRADIENTS_MACOS_SINCE_1014 = ENABLE_CSS_CONIC_GRADIENTS;
 
-ENABLE_CSS_DEVICE_ADAPTATION = ;
-
 ENABLE_CSS_IMAGE_RESOLUTION = ;
 
 ENABLE_CSS_PAINTING_API = ENABLE_CSS_PAINTING_API;
@@ -450,4 +448,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET;
 
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLE_PAY_SESSION_V9) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_GPU_PROCESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INSPECTOR_TELEMETRY) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFSCREEN_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLE_PAY_SESSION_V9) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_GPU_PROCESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INSPECTOR_TELEMETRY) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFSCREEN_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
index 11d8d79..2bb52f2 100644 (file)
@@ -79,9 +79,6 @@ Class kitClass(WebCore::CSSRule* impl)
     case WebCore::CSSRule::NAMESPACE_RULE:
     case WebCore::CSSRule::KEYFRAME_RULE:
     case WebCore::CSSRule::SUPPORTS_RULE:
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-    case WebCore::CSSRule::WEBKIT_VIEWPORT_RULE:
-#endif
         return [DOMCSSRule class];
     }
     ASSERT_NOT_REACHED();
index 6cb075e..b8c4416 100644 (file)
@@ -1,3 +1,15 @@
+2020-02-12  Simon Fraser  <simon.fraser@apple.com>
+
+        Remove CSS_DEVICE_ADAPTATION
+        https://bugs.webkit.org/show_bug.cgi?id=203479
+
+        Reviewed by Tim Horton.
+        
+        CSS Working Group resolved to remove @viewport <https://github.com/w3c/csswg-drafts/issues/4766>,
+        so remove the code.
+
+        * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
 2020-02-12  Said Abou-Hallawa  <said@apple.com>
 
         REGRESSION (r255158): http/tests/frame-throttling/raf-throttle-in-cross-origin-subframe.html is a flaky failure
index f4d26e3..2a91e25 100644 (file)
@@ -103,8 +103,6 @@ ENABLE_CSS_CONIC_GRADIENTS_maccatalyst = ENABLE_CSS_CONIC_GRADIENTS;
 ENABLE_CSS_CONIC_GRADIENTS_macosx = $(ENABLE_CSS_CONIC_GRADIENTS$(WK_MACOS_1014));
 ENABLE_CSS_CONIC_GRADIENTS_MACOS_SINCE_1014 = ENABLE_CSS_CONIC_GRADIENTS;
 
-ENABLE_CSS_DEVICE_ADAPTATION = ;
-
 ENABLE_CSS_IMAGE_RESOLUTION = ;
 
 ENABLE_CSS_PAINTING_API = ENABLE_CSS_PAINTING_API;
@@ -450,4 +448,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET;
 
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLE_PAY_SESSION_V9) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_GPU_PROCESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INSPECTOR_TELEMETRY) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFSCREEN_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLE_PAY_SESSION_V9) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_GPU_PROCESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INSPECTOR_TELEMETRY) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFSCREEN_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_EVENTS) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);