Changeset 199112 in webkit


Ignore:
Timestamp:
Apr 6, 2016 12:54:30 PM (8 years ago)
Author:
weinig@apple.com
Message:

window.CSS should be a constructor with static functions
<rdar://problem/25580516>
​https://bugs.webkit.org/show_bug.cgi?id=156294

Reviewed by Chris Dumez.

Source/WebCore:

Rename DOMWindowCSS to DOMCSSNamespace to avoid name collisions, DOMWindow prefixed
classes cause collisions in JSDOMWindow.

  • CMakeLists.txt:
  • DerivedSources.make:
  • WebCore.xcodeproj/project.pbxproj:

Update for renames.

  • css/DOMCSSNamespace.cpp: Copied from Source/WebCore/css/DOMWindowCSS.cpp.

(WebCore::valueWithoutImportant):
(WebCore::DOMCSSNamespace::supports):
(WebCore::DOMWindowCSS::create): Deleted.
(WebCore::DOMWindowCSS::supports): Deleted.

  • css/DOMCSSNamespace.h: Copied from Source/WebCore/css/DOMWindowCSS.h.

(WebCore::DOMWindowCSS::DOMWindowCSS): Deleted.
Rename DOMWindowCSS to DOMCSSNamespace and turn functions into static functions.

  • css/DOMCSSNamespace.idl: Copied from Source/WebCore/css/DOMWindowCSS.idl.

Remove NoInterfaceObject, to inject a constructor, and turn functions into
static functions matching spec.

  • page/DOMWindow.cpp:

(WebCore::DOMWindow::css): Deleted.

  • page/DOMWindow.h:
  • page/DOMWindow.idl:

Remove CSS property. Constructor will be implicitly added.

LayoutTests:

  • platform/efl/js/dom/global-constructors-attributes-expected.txt:
  • platform/gtk/js/dom/global-constructors-attributes-expected.txt:
  • platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt:
  • platform/mac/js/dom/global-constructors-attributes-expected.txt:
  • platform/win/js/dom/global-constructors-attributes-expected.txt:

Update for new CSS constructor property.

Location:
trunk
Files:
15 edited
3 moved

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r199110 r199112  
     12016-04-06  Sam Weinig  <sam@webkit.org>
     2
     3        window.CSS should be a constructor with static functions
     4        <rdar://problem/25580516>
     5        https://bugs.webkit.org/show_bug.cgi?id=156294
     6
     7        Reviewed by Chris Dumez.
     8
     9        * platform/efl/js/dom/global-constructors-attributes-expected.txt:
     10        * platform/gtk/js/dom/global-constructors-attributes-expected.txt:
     11        * platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt:
     12        * platform/mac/js/dom/global-constructors-attributes-expected.txt:
     13        * platform/win/js/dom/global-constructors-attributes-expected.txt:
     14        Update for new CSS constructor property.
     15
    1162016-04-06  Joanmarie Diggs  <jdiggs@igalia.com>
    217

  • trunk/LayoutTests/js/dom/global-constructors-attributes-expected.txt

    r197118 r199112  
    109109PASS Object.getOwnPropertyDescriptor(global, 'CDATASection').enumerable is false
    110110PASS Object.getOwnPropertyDescriptor(global, 'CDATASection').configurable is true
     111PASS Object.getOwnPropertyDescriptor(global, 'CSS').value is CSS
     112PASS Object.getOwnPropertyDescriptor(global, 'CSS').hasOwnProperty('get') is false
     113PASS Object.getOwnPropertyDescriptor(global, 'CSS').hasOwnProperty('set') is false
     114PASS Object.getOwnPropertyDescriptor(global, 'CSS').enumerable is false
     115PASS Object.getOwnPropertyDescriptor(global, 'CSS').configurable is true
    111116PASS Object.getOwnPropertyDescriptor(global, 'CSSCharsetRule').value is CSSCharsetRule
    112117PASS Object.getOwnPropertyDescriptor(global, 'CSSCharsetRule').hasOwnProperty('get') is false

  • trunk/LayoutTests/platform/efl/js/dom/global-constructors-attributes-expected.txt

    r197118 r199112  
    104104PASS Object.getOwnPropertyDescriptor(global, 'CDATASection').enumerable is false
    105105PASS Object.getOwnPropertyDescriptor(global, 'CDATASection').configurable is true
     106PASS Object.getOwnPropertyDescriptor(global, 'CSS').value is CSS
     107PASS Object.getOwnPropertyDescriptor(global, 'CSS').hasOwnProperty('get') is false
     108PASS Object.getOwnPropertyDescriptor(global, 'CSS').hasOwnProperty('set') is false
     109PASS Object.getOwnPropertyDescriptor(global, 'CSS').enumerable is false
     110PASS Object.getOwnPropertyDescriptor(global, 'CSS').configurable is true
    106111PASS Object.getOwnPropertyDescriptor(global, 'CSSCharsetRule').value is CSSCharsetRule
    107112PASS Object.getOwnPropertyDescriptor(global, 'CSSCharsetRule').hasOwnProperty('get') is false

  • trunk/LayoutTests/platform/gtk/js/dom/global-constructors-attributes-expected.txt

    r197142 r199112  
    104104PASS Object.getOwnPropertyDescriptor(global, 'CDATASection').enumerable is false
    105105PASS Object.getOwnPropertyDescriptor(global, 'CDATASection').configurable is true
     106PASS Object.getOwnPropertyDescriptor(global, 'CSS').value is CSS
     107PASS Object.getOwnPropertyDescriptor(global, 'CSS').hasOwnProperty('get') is false
     108PASS Object.getOwnPropertyDescriptor(global, 'CSS').hasOwnProperty('set') is false
     109PASS Object.getOwnPropertyDescriptor(global, 'CSS').enumerable is false
     110PASS Object.getOwnPropertyDescriptor(global, 'CSS').configurable is true
    106111PASS Object.getOwnPropertyDescriptor(global, 'CSSCharsetRule').value is CSSCharsetRule
    107112PASS Object.getOwnPropertyDescriptor(global, 'CSSCharsetRule').hasOwnProperty('get') is false

  • trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt

    r199062 r199112  
    124124PASS Object.getOwnPropertyDescriptor(global, 'CDATASection').enumerable is false
    125125PASS Object.getOwnPropertyDescriptor(global, 'CDATASection').configurable is true
     126PASS Object.getOwnPropertyDescriptor(global, 'CSS').value is CSS
     127PASS Object.getOwnPropertyDescriptor(global, 'CSS').hasOwnProperty('get') is false
     128PASS Object.getOwnPropertyDescriptor(global, 'CSS').hasOwnProperty('set') is false
     129PASS Object.getOwnPropertyDescriptor(global, 'CSS').enumerable is false
     130PASS Object.getOwnPropertyDescriptor(global, 'CSS').configurable is true
    126131PASS Object.getOwnPropertyDescriptor(global, 'CSSCharsetRule').value is CSSCharsetRule
    127132PASS Object.getOwnPropertyDescriptor(global, 'CSSCharsetRule').hasOwnProperty('get') is false

  • trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt

    r199062 r199112  
    124124PASS Object.getOwnPropertyDescriptor(global, 'CDATASection').enumerable is false
    125125PASS Object.getOwnPropertyDescriptor(global, 'CDATASection').configurable is true
     126PASS Object.getOwnPropertyDescriptor(global, 'CSS').value is CSS
     127PASS Object.getOwnPropertyDescriptor(global, 'CSS').hasOwnProperty('get') is false
     128PASS Object.getOwnPropertyDescriptor(global, 'CSS').hasOwnProperty('set') is false
     129PASS Object.getOwnPropertyDescriptor(global, 'CSS').enumerable is false
     130PASS Object.getOwnPropertyDescriptor(global, 'CSS').configurable is true
    126131PASS Object.getOwnPropertyDescriptor(global, 'CSSCharsetRule').value is CSSCharsetRule
    127132PASS Object.getOwnPropertyDescriptor(global, 'CSSCharsetRule').hasOwnProperty('get') is false

  • trunk/LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt

    r197142 r199112  
    5454PASS Object.getOwnPropertyDescriptor(global, 'CDATASection').enumerable is false
    5555PASS Object.getOwnPropertyDescriptor(global, 'CDATASection').configurable is true
     56PASS Object.getOwnPropertyDescriptor(global, 'CSS').value is CSS
     57PASS Object.getOwnPropertyDescriptor(global, 'CSS').hasOwnProperty('get') is false
     58PASS Object.getOwnPropertyDescriptor(global, 'CSS').hasOwnProperty('set') is false
     59PASS Object.getOwnPropertyDescriptor(global, 'CSS').enumerable is false
     60PASS Object.getOwnPropertyDescriptor(global, 'CSS').configurable is true
    5661PASS Object.getOwnPropertyDescriptor(global, 'CSSCharsetRule').value is CSSCharsetRule
    5762PASS Object.getOwnPropertyDescriptor(global, 'CSSCharsetRule').hasOwnProperty('get') is false

  • trunk/Source/WebCore/CMakeLists.txt

    r199094 r199112  
    335335    css/CSSValueList.idl
    336336    css/Counter.idl
    337     css/DOMWindowCSS.idl
     337    css/DOMCSSNamespace.idl
    338338    css/FontFace.idl
    339339    css/FontFaceSet.idl
    … …  
    13411341    css/CSSVariableDependentValue.cpp
    13421342    css/CSSVariableValue.cpp
    1343     css/DOMWindowCSS.cpp
     1343    css/DOMCSSNamespace.cpp
    13441344    css/DocumentRuleSets.cpp
    13451345    css/ElementRuleCollector.cpp

  • trunk/Source/WebCore/ChangeLog

    r199111 r199112  
     12016-04-06  Sam Weinig  <sam@webkit.org>
     2
     3        window.CSS should be a constructor with static functions
     4        <rdar://problem/25580516>
     5        https://bugs.webkit.org/show_bug.cgi?id=156294
     6
     7        Reviewed by Chris Dumez.
     8
     9        Rename DOMWindowCSS to DOMCSSNamespace to avoid name collisions, DOMWindow prefixed
     10        classes cause collisions in JSDOMWindow.
     11
     12        * CMakeLists.txt:
     13        * DerivedSources.make:
     14        * WebCore.xcodeproj/project.pbxproj:
     15        Update for renames.
     16
     17        * css/DOMCSSNamespace.cpp: Copied from Source/WebCore/css/DOMWindowCSS.cpp.
     18        (WebCore::valueWithoutImportant):
     19        (WebCore::DOMCSSNamespace::supports):
     20        (WebCore::DOMWindowCSS::create): Deleted.
     21        (WebCore::DOMWindowCSS::supports): Deleted.
     22        * css/DOMCSSNamespace.h: Copied from Source/WebCore/css/DOMWindowCSS.h.
     23        (WebCore::DOMWindowCSS::DOMWindowCSS): Deleted.
     24        Rename DOMWindowCSS to DOMCSSNamespace and turn functions into static functions.
     25
     26        * css/DOMCSSNamespace.idl: Copied from Source/WebCore/css/DOMWindowCSS.idl.
     27        Remove NoInterfaceObject, to inject a constructor, and turn functions into
     28        static functions matching spec.
     29
     30        * page/DOMWindow.cpp:
     31        (WebCore::DOMWindow::css): Deleted.
     32        * page/DOMWindow.h:
     33        * page/DOMWindow.idl:
     34        Remove CSS property. Constructor will be implicitly added.
     35
    1362016-04-05  Simon Fraser  <simon.fraser@apple.com>
    237

  • trunk/Source/WebCore/DerivedSources.make

    r197748 r199112  
    248248    $(WebCore)/css/CSSValueList.idl \
    249249    $(WebCore)/css/Counter.idl \
    250     $(WebCore)/css/DOMWindowCSS.idl \
     250    $(WebCore)/css/DOMCSSNamespace.idl \
    251251    $(WebCore)/css/FontFace.idl \
    252252    $(WebCore)/css/FontFaceSet.idl \

  • trunk/Source/WebCore/PlatformGTK.cmake

    r198766 r199112  
    546546    Modules/webdatabase/Database.idl
    547547
    548     css/DOMWindowCSS.idl
     548    css/DOMCSSNamespace.idl
    549549    css/MediaQueryList.idl
    550550    css/StyleMedia.idl

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r199072 r199112  
    68476847                FC54D05716A7673100575E4D /* CSSSupportsRule.h in Headers */ = {isa = PBXBuildFile; fileRef = FC63BDB1167AABAC00F9380F /* CSSSupportsRule.h */; };
    68486848                FC54D05816A7676E00575E4D /* JSCSSSupportsRule.h in Headers */ = {isa = PBXBuildFile; fileRef = FC84802E167AB444008CD100 /* JSCSSSupportsRule.h */; };
    6849                 FC9A0F75164094CF003D6B8D /* DOMWindowCSS.h in Headers */ = {isa = PBXBuildFile; fileRef = FC9A0F72164094CF003D6B8D /* DOMWindowCSS.h */; };
    6850                 FC9E0E4D16419C1E00392BE3 /* JSDOMWindowCSS.h in Headers */ = {isa = PBXBuildFile; fileRef = FC9E0E4B16419C1E00392BE3 /* JSDOMWindowCSS.h */; };
     6849                FC9A0F75164094CF003D6B8D /* DOMCSSNamespace.h in Headers */ = {isa = PBXBuildFile; fileRef = FC9A0F72164094CF003D6B8D /* DOMCSSNamespace.h */; };
     6850                FC9E0E4D16419C1E00392BE3 /* JSDOMCSSNamespace.h in Headers */ = {isa = PBXBuildFile; fileRef = FC9E0E4B16419C1E00392BE3 /* JSDOMCSSNamespace.h */; };
    68516851                FCD8832A16A49F8200962227 /* DOMCSSSupportsRule.h in Headers */ = {isa = PBXBuildFile; fileRef = FCD8832816A49F8200962227 /* DOMCSSSupportsRule.h */; };
    68526852                FCD8832B16A49F8200962227 /* DOMCSSSupportsRule.mm in Sources */ = {isa = PBXBuildFile; fileRef = FCD8832916A49F8200962227 /* DOMCSSSupportsRule.mm */; };
    … …  
    70037003                FD671A77159BB07000197559 /* MediaStreamAudioSourceNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD671A74159BB07000197559 /* MediaStreamAudioSourceNode.cpp */; };
    70047004                FD671A78159BB07000197559 /* MediaStreamAudioSourceNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FD671A75159BB07000197559 /* MediaStreamAudioSourceNode.h */; };
    7005                 FD677738195CAF3D0072E0D3 /* DOMWindowCSS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD677735195CAB200072E0D3 /* DOMWindowCSS.cpp */; };
     7005                FD677738195CAF3D0072E0D3 /* DOMCSSNamespace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD677735195CAB200072E0D3 /* DOMCSSNamespace.cpp */; };
    70067006                FD677739195CAFBA0072E0D3 /* CSSSupportsRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD677734195CAB200072E0D3 /* CSSSupportsRule.cpp */; };
    70077007                FD67773A195CB14A0072E0D3 /* JSCSSSupportsRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD677736195CAB7D0072E0D3 /* JSCSSSupportsRule.cpp */; };
    7008                 FD67773B195CB1E60072E0D3 /* JSDOMWindowCSS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD677737195CAB7D0072E0D3 /* JSDOMWindowCSS.cpp */; };
     7008                FD67773B195CB1E60072E0D3 /* JSDOMCSSNamespace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD677737195CAB7D0072E0D3 /* JSDOMCSSNamespace.cpp */; };
    70097009                FD6ED2C3136B8E42003CF072 /* DynamicsCompressorNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD6ED2C1136B8E42003CF072 /* DynamicsCompressorNode.cpp */; };
    70107010                FD6ED2C4136B8E42003CF072 /* DynamicsCompressorNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FD6ED2C2136B8E42003CF072 /* DynamicsCompressorNode.h */; };
    … …  
    1492014920                FC63BDB2167AABAC00F9380F /* CSSSupportsRule.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CSSSupportsRule.idl; sourceTree = "<group>"; };
    1492114921                FC84802E167AB444008CD100 /* JSCSSSupportsRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCSSSupportsRule.h; sourceTree = "<group>"; };
    14922                 FC9A0F72164094CF003D6B8D /* DOMWindowCSS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMWindowCSS.h; sourceTree = "<group>"; };
    14923                 FC9A0F73164094CF003D6B8D /* DOMWindowCSS.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DOMWindowCSS.idl; sourceTree = "<group>"; };
    14924                 FC9E0E4B16419C1E00392BE3 /* JSDOMWindowCSS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMWindowCSS.h; sourceTree = "<group>"; };
     14922                FC9A0F72164094CF003D6B8D /* DOMCSSNamespace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMCSSNamespace.h; sourceTree = "<group>"; };
     14923                FC9A0F73164094CF003D6B8D /* DOMCSSNamespace.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DOMCSSNamespace.idl; sourceTree = "<group>"; };
     14924                FC9E0E4B16419C1E00392BE3 /* JSDOMCSSNamespace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMCSSNamespace.h; sourceTree = "<group>"; };
    1492514925                FCD8832816A49F8200962227 /* DOMCSSSupportsRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMCSSSupportsRule.h; sourceTree = "<group>"; };
    1492614926                FCD8832916A49F8200962227 /* DOMCSSSupportsRule.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMCSSSupportsRule.mm; sourceTree = "<group>"; };
    … …  
    1509915099                FD671A76159BB07000197559 /* MediaStreamAudioSourceNode.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MediaStreamAudioSourceNode.idl; sourceTree = "<group>"; };
    1510015100                FD677734195CAB200072E0D3 /* CSSSupportsRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSSupportsRule.cpp; sourceTree = "<group>"; };
    15101                 FD677735195CAB200072E0D3 /* DOMWindowCSS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMWindowCSS.cpp; sourceTree = "<group>"; };
     15101                FD677735195CAB200072E0D3 /* DOMCSSNamespace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMCSSNamespace.cpp; sourceTree = "<group>"; };
    1510215102                FD677736195CAB7D0072E0D3 /* JSCSSSupportsRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JSCSSSupportsRule.cpp; path = DerivedSources/WebCore/JSCSSSupportsRule.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
    15103                 FD677737195CAB7D0072E0D3 /* JSDOMWindowCSS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JSDOMWindowCSS.cpp; path = DerivedSources/WebCore/JSDOMWindowCSS.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
     15103                FD677737195CAB7D0072E0D3 /* JSDOMCSSNamespace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JSDOMCSSNamespace.cpp; path = DerivedSources/WebCore/JSDOMCSSNamespace.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
    1510415104                FD6ED2C1136B8E42003CF072 /* DynamicsCompressorNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DynamicsCompressorNode.cpp; sourceTree = "<group>"; };
    1510515105                FD6ED2C2136B8E42003CF072 /* DynamicsCompressorNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DynamicsCompressorNode.h; sourceTree = "<group>"; };
    … …  
    2074920749                                A8D05FA90A23B30F005E7203 /* JSCSSValueList.cpp */,
    2075020750                                A8D05FAA0A23B30F005E7203 /* JSCSSValueList.h */,
    20751                                 FD677737195CAB7D0072E0D3 /* JSDOMWindowCSS.cpp */,
    20752                                 FC9E0E4B16419C1E00392BE3 /* JSDOMWindowCSS.h */,
     20751                                FD677737195CAB7D0072E0D3 /* JSDOMCSSNamespace.cpp */,
     20752                                FC9E0E4B16419C1E00392BE3 /* JSDOMCSSNamespace.h */,
    2075320753                                BC3C39B40C0D3D8D005F4D7A /* JSMediaList.cpp */,
    2075420754                                BC3C39B50C0D3D8D005F4D7A /* JSMediaList.h */,
    … …  
    2372823728                                4A4F48A716B0DFC000EDBB29 /* DocumentRuleSets.cpp */,
    2372923729                                4A4F48A816B0DFC000EDBB29 /* DocumentRuleSets.h */,
    23730                                 FD677735195CAB200072E0D3 /* DOMWindowCSS.cpp */,
    23731                                 FC9A0F72164094CF003D6B8D /* DOMWindowCSS.h */,
    23732                                 FC9A0F73164094CF003D6B8D /* DOMWindowCSS.idl */,
     23730                                FD677735195CAB200072E0D3 /* DOMCSSNamespace.cpp */,
     23731                                FC9A0F72164094CF003D6B8D /* DOMCSSNamespace.h */,
     23732                                FC9A0F73164094CF003D6B8D /* DOMCSSNamespace.idl */,
    2373323733                                FBDB619A16D6032A00BB3394 /* ElementRuleCollector.cpp */,
    2373423734                                FBDB619E16D6036500BB3394 /* ElementRuleCollector.h */,
    … …  
    2588225882                                85989DD10ACC8BBD00A0BC51 /* DOMWheelEventInternal.h in Headers */,
    2588325883                                1403B99709EB13AF00797C7F /* DOMWindow.h in Headers */,
    25884                                 FC9A0F75164094CF003D6B8D /* DOMWindowCSS.h in Headers */,
     25884                                FC9A0F75164094CF003D6B8D /* DOMCSSNamespace.h in Headers */,
    2588525885                                51FA2D78152132B300C1BA0B /* DOMWindowExtension.h in Headers */,
    2588625886                                5185FC751BB4C4E80012898F /* DOMWindowIndexedDatabase.h in Headers */,
    … …  
    2653426534                                2E37E00612DBC5A400A6B233 /* JSDOMURL.h in Headers */,
    2653526535                                BC6932740D7E293900AE44D1 /* JSDOMWindowBase.h in Headers */,
    26536                                 FC9E0E4D16419C1E00392BE3 /* JSDOMWindowCSS.h in Headers */,
     26536                                FC9E0E4D16419C1E00392BE3 /* JSDOMCSSNamespace.h in Headers */,
    2653726537                                652FBBBC0DE27CB60001D386 /* JSDOMWindowCustom.h in Headers */,
    2653826538                                BCBFB53D0DCD29CF0019B3E5 /* JSDOMWindowShell.h in Headers */,
    … …  
    2959829598                                85C7F5E80AAFBAFB004014DD /* DOMWheelEvent.mm in Sources */,
    2959929599                                1403B99809EB13AF00797C7F /* DOMWindow.cpp in Sources */,
    29600                                 FD677738195CAF3D0072E0D3 /* DOMWindowCSS.cpp in Sources */,
     29600                                FD677738195CAF3D0072E0D3 /* DOMCSSNamespace.cpp in Sources */,
    2960129601                                517FBA1E151AB17C00B57959 /* DOMWindowExtension.cpp in Sources */,
    2960229602                                5185FC741BB4C4E80012898F /* DOMWindowIndexedDatabase.cpp in Sources */,
    … …  
    3022030220                                1403BA0C09EB18C700797C7F /* JSDOMWindow.cpp in Sources */,
    3022130221                                BC6932730D7E293900AE44D1 /* JSDOMWindowBase.cpp in Sources */,
    30222                                 FD67773B195CB1E60072E0D3 /* JSDOMWindowCSS.cpp in Sources */,
     30222                                FD67773B195CB1E60072E0D3 /* JSDOMCSSNamespace.cpp in Sources */,
    3022330223                                BCD9C2620C17AA67005C90A2 /* JSDOMWindowCustom.cpp in Sources */,
    3022430224                                BCBFB53C0DCD29CF0019B3E5 /* JSDOMWindowShell.cpp in Sources */,

  • trunk/Source/WebCore/css/DOMCSSNamespace.cpp

    r199071 r199112  
    2929
    3030#include "config.h"
    31 #include "DOMWindowCSS.h"
     31#include "DOMCSSNamespace.h"
    3232
    3333#include "CSSParser.h"
    … …  
    3636
    3737namespace WebCore {
    38 
    39 Ref<DOMWindowCSS> DOMWindowCSS::create()
    40 {
    41     return adoptRef(*new DOMWindowCSS);
    42 }
    4338
    4439static String valueWithoutImportant(const String& value)
    … …  
    5651}
    5752
    58 bool DOMWindowCSS::supports(const String& property, const String& value) const
     53bool DOMCSSNamespace::supports(const String& property, const String& value)
    5954{
    6055    CSSPropertyID propertyID = cssPropertyID(property.stripWhiteSpace());
    … …  
    7671}
    7772
    78 bool DOMWindowCSS::supports(const String& conditionText) const
     73bool DOMCSSNamespace::supports(const String& conditionText)
    7974{
    8075    CSSParserContext context(CSSStrictMode);

  • trunk/Source/WebCore/css/DOMCSSNamespace.h

    r199071 r199112  
    2828 */
    2929
    30 #ifndef DOMWindowCSS_h
    31 #define DOMWindowCSS_h
     30#pragma once
    3231
    3332#include <wtf/Forward.h>
    34 #include <wtf/Ref.h>
    3533#include <wtf/RefCounted.h>
    3634
    3735namespace WebCore {
    3836
    39 class DOMWindowCSS : public RefCounted<DOMWindowCSS> {
     37class DOMCSSNamespace : public RefCounted<DOMCSSNamespace> {
    4038public:
    41     WEBCORE_EXPORT static Ref<DOMWindowCSS> create();
    42 
    43     bool supports(const String& property, const String& value) const;
    44     bool supports(const String& conditionText) const;
    45 
    46 private:
    47     DOMWindowCSS()
    48     {
    49     }
     39    static bool supports(const String& property, const String& value);
     40    static bool supports(const String& conditionText);
    5041};
    5142
    5243}
    53 
    54 #endif

  • trunk/Source/WebCore/css/DOMCSSNamespace.idl

    r199071 r199112  
    2929
    3030[
    31     NoInterfaceObject,
    3231    InterfaceName=CSS,
    3332    ImplementationLacksVTable,
    34 ] interface DOMWindowCSS {
    35 
    36     boolean supports(DOMString property, DOMString value);
    37     boolean supports(DOMString conditionText);
    38 
     33] interface DOMCSSNamespace {
     34    static boolean supports(DOMString property, DOMString value);
     35    static boolean supports(DOMString conditionText);
    3936};
    40 

  • trunk/Source/WebCore/page/DOMWindow.cpp

    r199020 r199112  
    4545#include "DOMTokenList.h"
    4646#include "DOMURL.h"
    47 #include "DOMWindowCSS.h"
    4847#include "DOMWindowExtension.h"
    4948#include "DOMWindowNotifications.h"
    … …  
    16711670#endif
    16721671
    1673 DOMWindowCSS* DOMWindow::css()
    1674 {
    1675     if (!m_css)
    1676         m_css = DOMWindowCSS::create();
    1677     return m_css.get();
    1678 }
    1679 
    16801672static void didAddStorageEventListener(DOMWindow* window)
    16811673{

  • trunk/Source/WebCore/page/DOMWindow.h

    r198738 r199112  
    5151    class DOMSelection;
    5252    class DOMURL;
    53     class DOMWindowCSS;
    5453    class DOMWindowProperty;
    5554    class DOMWrapperWorld;
    … …  
    273272#endif
    274273
    275         DOMWindowCSS* css();
    276 
    277274        // Events
    278275        // EventTarget API
    … …  
    418415#endif
    419416
    420         mutable RefPtr<DOMWindowCSS> m_css;
    421 
    422417#if ENABLE(USER_MESSAGE_HANDLERS)
    423418        mutable RefPtr<WebKitNamespace> m_webkitNamespace;

  • trunk/Source/WebCore/page/DOMWindow.idl

    r198102 r199112  
    180180    [Conditional=REQUEST_ANIMATION_FRAME, ImplementedAs=cancelAnimationFrame] void webkitCancelRequestAnimationFrame(long id); // This is a deprecated alias for webkitCancelAnimationFrame(). Remove this when removing vendor prefix.
    181181
    182     [Replaceable] readonly attribute DOMWindowCSS CSS;
    183 
    184182    void captureEvents(/*in long eventFlags*/);
    185183    void releaseEvents(/*in long eventFlags*/);
Note: See TracChangeset for help on using the changeset viewer.