Changeset 135564 in webkit


Ignore:
Timestamp:
Nov 23, 2012 12:06:32 AM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Expose DOM interface for CSS Device Adaptation
​https://bugs.webkit.org/show_bug.cgi?id=95966

Patch by Thiago Marcos P. Santos <​thiago.santos@intel.com> on 2012-11-23
Reviewed by Kenneth Rohde Christiansen.

Source/WebCore:

Added V8 and JSC bindings for CSS Device Adapation.

Test: css3/device-adapt/opera/cssom-001.xhtml

  • CMakeLists.txt:
  • DerivedSources.make:
  • DerivedSources.pri:
  • GNUmakefile.list.am:
  • WebCore.gypi:
  • WebCore.xcodeproj/project.pbxproj:
  • bindings/js/JSCSSRuleCustom.cpp:

(WebCore::toJS):

  • bindings/objc/DOMCSS.mm:

(kitClass):

  • bindings/v8/custom/V8CSSRuleCustom.cpp:

(WebCore::wrap):

  • css/CSSRule.idl:
  • css/WebKitCSSViewportRule.idl: Added.
  • page/DOMWindow.idl:

LayoutTests:

Imported a test submitted by Opera that tests the exposed interface.

  • css3/device-adapt/opera/cssom-001-expected.txt: Added.
  • css3/device-adapt/opera/cssom-001.xhtml: Added.
  • platform/efl/fast/js/global-constructors-expected.txt:
Location:
trunk
Files:
3 added
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r135563 r135564  
     12012-11-23  Thiago Marcos P. Santos  <thiago.santos@intel.com>
     2
     3        Expose DOM interface for CSS Device Adaptation
     4        https://bugs.webkit.org/show_bug.cgi?id=95966
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        Imported a test submitted by Opera that tests the exposed interface.
     9
     10        * css3/device-adapt/opera/cssom-001-expected.txt: Added.
     11        * css3/device-adapt/opera/cssom-001.xhtml: Added.
     12        * platform/efl/fast/js/global-constructors-expected.txt:
     13
    1142012-11-22  Sheriff Bot  <webkit.review.bot@gmail.com>
    215

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

    r135562 r135564  
    333333PASS WebKitCSSRegionRule.toString() is '[object WebKitCSSRegionRuleConstructor]'
    334334PASS WebKitCSSTransformValue.toString() is '[object WebKitCSSTransformValueConstructor]'
     335PASS WebKitCSSViewportRule.toString() is '[object WebKitCSSViewportRuleConstructor]'
    335336FAIL WebKitIntent.toString() should be [object WebKitIntentConstructor]. Was [object IntentConstructor].
    336337FAIL WebKitMutationObserver.toString() should be [object WebKitMutationObserverConstructor]. Was [object MutationObserverConstructor].

  • trunk/Source/WebCore/CMakeLists.txt

    r135529 r135564  
    335335    css/WebKitCSSRegionRule.idl
    336336    css/WebKitCSSTransformValue.idl
     337    css/WebKitCSSViewportRule.idl
    337338
    338339    dom/Attr.idl

  • trunk/Source/WebCore/ChangeLog

    r135563 r135564  
     12012-11-23  Thiago Marcos P. Santos  <thiago.santos@intel.com>
     2
     3        Expose DOM interface for CSS Device Adaptation
     4        https://bugs.webkit.org/show_bug.cgi?id=95966
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        Added V8 and JSC bindings for CSS Device Adapation.
     9
     10        Test: css3/device-adapt/opera/cssom-001.xhtml
     11
     12        * CMakeLists.txt:
     13        * DerivedSources.make:
     14        * DerivedSources.pri:
     15        * GNUmakefile.list.am:
     16        * WebCore.gypi:
     17        * WebCore.xcodeproj/project.pbxproj:
     18        * bindings/js/JSCSSRuleCustom.cpp:
     19        (WebCore::toJS):
     20        * bindings/objc/DOMCSS.mm:
     21        (kitClass):
     22        * bindings/v8/custom/V8CSSRuleCustom.cpp:
     23        (WebCore::wrap):
     24        * css/CSSRule.idl:
     25        * css/WebKitCSSViewportRule.idl: Added.
     26        * page/DOMWindow.idl:
     27
    1282012-11-22  Sheriff Bot  <webkit.review.bot@gmail.com>
    229

  • trunk/Source/WebCore/DerivedSources.make

    r135129 r135564  
    197197    $(WebCore)/css/WebKitCSSRegionRule.idl \
    198198    $(WebCore)/css/WebKitCSSTransformValue.idl \
     199    $(WebCore)/css/WebKitCSSViewportRule.idl \
    199200    $(WebCore)/dom/Attr.idl \
    200201    $(WebCore)/dom/BeforeLoadEvent.idl \

  • trunk/Source/WebCore/DerivedSources.pri

    r135129 r135564  
    214214    $$PWD/css/WebKitCSSRegionRule.idl \
    215215    $$PWD/css/WebKitCSSTransformValue.idl \
     216    $$PWD/css/WebKitCSSViewportRule.idl \
    216217    $$PWD/dom/Attr.idl \
    217218    $$PWD/dom/BeforeLoadEvent.idl \

  • trunk/Source/WebCore/GNUmakefile.list.am

    r135538 r135564  
    810810        DerivedSources/WebCore/JSWebKitCSSTransformValue.cpp \
    811811        DerivedSources/WebCore/JSWebKitCSSTransformValue.h \
     812        DerivedSources/WebCore/JSWebKitCSSViewportRule.cpp \
     813        DerivedSources/WebCore/JSWebKitCSSViewportRule.h \
    812814        DerivedSources/WebCore/JSWebKitNamedFlow.cpp \
    813815        DerivedSources/WebCore/JSWebKitNamedFlow.h \
    … …  
    13371339        $(WebCore)/css/WebKitCSSRegionRule.idl \
    13381340        $(WebCore)/css/WebKitCSSTransformValue.idl \
     1341        $(WebCore)/css/WebKitCSSViewportRule.idl \
    13391342        $(WebCore)/dom/Attr.idl \
    13401343        $(WebCore)/dom/BeforeLoadEvent.idl \

  • trunk/Source/WebCore/WebCore.gypi

    r135529 r135564  
    974974            'css/WebKitCSSRegionRule.idl',
    975975            'css/WebKitCSSTransformValue.idl',
     976            'css/WebKitCSSViewportRule.idl',
    976977            'dom/Attr.idl',
    977978            'dom/BeforeLoadEvent.idl',
    … …  
    73027303            '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMWebKitCSSTransformValue.mm',
    73037304            '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMWebKitCSSTransformValueInternal.h',
     7305            '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMWebKitCSSViewportRule.h',
     7306            '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMWebKitCSSViewportRule.mm',
     7307            '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMWebKitCSSViewportRuleInternal.h',
    73047308            '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMWheelEvent.mm',
    73057309            '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMWheelEventInternal.h',
    … …  
    83528356            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitCSSTransformValue.cpp',
    83538357            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitCSSTransformValue.h',
     8358            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitCSSViewportRule.cpp',
     8359            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitCSSViewportRule.h',
    83548360            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitPoint.cpp',
    83558361            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitPoint.h',

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

    r135529 r135564  
    10411041                3C244FEAA375AC633F88BE6F /* RenderLayerModelObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C244FE4A375AC633F88BE6F /* RenderLayerModelObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
    10421042                3C244FEBA375AC633F88BE6F /* RenderLayerModelObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C244FE5A375AC633F88BE6F /* RenderLayerModelObject.cpp */; };
     1043                3F2B33EB165AF15600E3987C /* DOMWebKitCSSViewportRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3F2B33E6165AF15500E3987C /* DOMWebKitCSSViewportRule.h */; };
     1044                3F2B33EC165AF15600E3987C /* DOMWebKitCSSViewportRule.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3F2B33E7165AF15500E3987C /* DOMWebKitCSSViewportRule.mm */; };
     1045                3F2B33ED165AF15600E3987C /* DOMWebKitCSSViewportRuleInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 3F2B33E8165AF15500E3987C /* DOMWebKitCSSViewportRuleInternal.h */; };
     1046                3F2B33EE165AF15600E3987C /* JSWebKitCSSViewportRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F2B33E9165AF15500E3987C /* JSWebKitCSSViewportRule.cpp */; };
     1047                3F2B33EF165AF15600E3987C /* JSWebKitCSSViewportRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3F2B33EA165AF15500E3987C /* JSWebKitCSSViewportRule.h */; };
    10431048                3FFFF9A8159D9A550020BBD5 /* WebKitCSSViewportRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3FFFF9A6159D9A550020BBD5 /* WebKitCSSViewportRule.cpp */; };
    10441049                3FFFF9A9159D9A550020BBD5 /* WebKitCSSViewportRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3FFFF9A7159D9A550020BBD5 /* WebKitCSSViewportRule.h */; };
    … …  
    82188223                3C244FE4A375AC633F88BE6F /* RenderLayerModelObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderLayerModelObject.h; sourceTree = "<group>"; };
    82198224                3C244FE5A375AC633F88BE6F /* RenderLayerModelObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderLayerModelObject.cpp; sourceTree = "<group>"; };
     8225                3F2B33E3165ABD3500E3987C /* WebKitCSSViewportRule.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebKitCSSViewportRule.idl; sourceTree = "<group>"; };
     8226                3F2B33E6165AF15500E3987C /* DOMWebKitCSSViewportRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMWebKitCSSViewportRule.h; sourceTree = "<group>"; };
     8227                3F2B33E7165AF15500E3987C /* DOMWebKitCSSViewportRule.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMWebKitCSSViewportRule.mm; sourceTree = "<group>"; };
     8228                3F2B33E8165AF15500E3987C /* DOMWebKitCSSViewportRuleInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMWebKitCSSViewportRuleInternal.h; sourceTree = "<group>"; };
     8229                3F2B33E9165AF15500E3987C /* JSWebKitCSSViewportRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitCSSViewportRule.cpp; sourceTree = "<group>"; };
     8230                3F2B33EA165AF15500E3987C /* JSWebKitCSSViewportRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebKitCSSViewportRule.h; sourceTree = "<group>"; };
    82208231                3FFFF9A6159D9A550020BBD5 /* WebKitCSSViewportRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitCSSViewportRule.cpp; sourceTree = "<group>"; };
    82218232                3FFFF9A7159D9A550020BBD5 /* WebKitCSSViewportRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitCSSViewportRule.h; sourceTree = "<group>"; };
    … …  
    1625116262                                31611E5F0E1C4E1400F6A579 /* DOMWebKitCSSTransformValue.mm */,
    1625216263                                31611E600E1C4E1400F6A579 /* DOMWebKitCSSTransformValueInternal.h */,
     16264                                3F2B33E6165AF15500E3987C /* DOMWebKitCSSViewportRule.h */,
     16265                                3F2B33E7165AF15500E3987C /* DOMWebKitCSSViewportRule.mm */,
     16266                                3F2B33E8165AF15500E3987C /* DOMWebKitCSSViewportRuleInternal.h */,
    1625316267                        );
    1625416268                        name = CSS;
    … …  
    1906219076                                31611E580E1C4DE000F6A579 /* JSWebKitCSSTransformValue.cpp */,
    1906319077                                31611E590E1C4DE000F6A579 /* JSWebKitCSSTransformValue.h */,
     19078                                3F2B33E9165AF15500E3987C /* JSWebKitCSSViewportRule.cpp */,
     19079                                3F2B33EA165AF15500E3987C /* JSWebKitCSSViewportRule.h */,
    1906419080                        );
    1906519081                        name = CSS;
    … …  
    2150521521                                3FFFF9A6159D9A550020BBD5 /* WebKitCSSViewportRule.cpp */,
    2150621522                                3FFFF9A7159D9A550020BBD5 /* WebKitCSSViewportRule.h */,
     21523                                3F2B33E3165ABD3500E3987C /* WebKitCSSViewportRule.idl */,
    2150721524                        );
    2150821525                        path = css;
    … …  
    2577925796                                3FFFF9AE159D9B060020BBD5 /* ViewportStyleResolver.h in Headers */,
    2578025797                                3FFFF9A9159D9A550020BBD5 /* WebKitCSSViewportRule.h in Headers */,
     25798                                3F2B33EB165AF15600E3987C /* DOMWebKitCSSViewportRule.h in Headers */,
     25799                                3F2B33ED165AF15600E3987C /* DOMWebKitCSSViewportRuleInternal.h in Headers */,
     25800                                3F2B33EF165AF15600E3987C /* JSWebKitCSSViewportRule.h in Headers */,
    2578125801                                93C38BFF164473C700091EB2 /* ScrollingStateFixedNode.h in Headers */,
    2578225802                                93C38C03164473DD00091EB2 /* ScrollingTreeFixedNode.h in Headers */,
    … …  
    2887528895                                50D32857163B313F0016111E /* ValidatedCustomFilterOperation.cpp in Sources */,
    2887628896                                3FFFF9A8159D9A550020BBD5 /* WebKitCSSViewportRule.cpp in Sources */,
     28897                                3F2B33EC165AF15600E3987C /* DOMWebKitCSSViewportRule.mm in Sources */,
     28898                                3F2B33EE165AF15600E3987C /* JSWebKitCSSViewportRule.cpp in Sources */,
    2887728899                                4FFC022B1643B710004E1638 /* NodeRareData.cpp in Sources */,
    2887828900                                4FFC022D1643B726004E1638 /* ElementRareData.cpp in Sources */,

  • trunk/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp

    r118484 r135564  
    4343#include "JSWebKitCSSKeyframesRule.h"
    4444#include "JSWebKitCSSRegionRule.h"
     45#include "JSWebKitCSSViewportRule.h"
    4546#include "WebKitCSSKeyframeRule.h"
    4647#include "WebKitCSSKeyframesRule.h"
    4748#include "WebKitCSSRegionRule.h"
     49#include "WebKitCSSViewportRule.h"
    4850
    4951using namespace JSC;
    … …  
    9597            wrapper = CREATE_DOM_WRAPPER(exec, globalObject, WebKitCSSKeyframesRule, rule);
    9698            break;
     99#if ENABLE(CSS_DEVICE_ADAPTATION)
     100        case CSSRule::WEBKIT_VIEWPORT_RULE:
     101            wrapper = CREATE_DOM_WRAPPER(exec, globalObject, WebKitCSSViewportRule, rule);
     102            break;
     103#endif
    97104#if ENABLE(CSS_REGIONS)
    98105        case CSSRule::WEBKIT_REGION_RULE:

  • trunk/Source/WebCore/bindings/objc/DOMCSS.mm

    r118484 r135564  
    5858#endif
    5959
     60#if ENABLE(CSS_DEVICE_ADAPTATION)
     61#import "DOMWebKitCSSViewportRule.h"
     62#endif
     63
    6064#if ENABLE(SVG_DOM_OBJC_BINDINGS)
    6165#import "DOMSVGPaint.h"
    … …  
    96100        case DOM_WEBKIT_KEYFRAME_RULE:
    97101            return [DOMWebKitCSSKeyframeRule class];
     102#if ENABLE(CSS_DEVICE_ADAPTATION)
     103        case DOM_WEBKIT_VIEWPORT_RULE:
     104            return [DOMWebKitCSSViewportRule class];
     105#endif
    98106#if ENABLE(CSS_REGIONS)
    99107        case DOM_WEBKIT_REGION_RULE:

  • trunk/Source/WebCore/bindings/v8/custom/V8CSSRuleCustom.cpp

    r134696 r135564  
    4242#include "V8WebKitCSSRegionRule.h"
    4343
     44#if ENABLE(CSS_DEVICE_ADAPTATION)
     45#include "V8WebKitCSSViewportRule.h"
     46#endif
     47
    4448namespace WebCore {
    4549
    … …  
    6973    case CSSRule::WEBKIT_KEYFRAMES_RULE:
    7074        return wrap(static_cast<WebKitCSSKeyframesRule*>(impl), creationContext, isolate);
     75#if ENABLE(CSS_DEVICE_ADAPTATION)
     76    case CSSRule::WEBKIT_VIEWPORT_RULE:
     77        return wrap(static_cast<WebKitCSSViewportRule*>(impl), creationContext, isolate);
     78#endif
    7179    case CSSRule::WEBKIT_REGION_RULE:
    7280        return wrap(static_cast<WebKitCSSRegionRule*>(impl), creationContext, isolate);

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

    r131172 r135564  
    3838    const unsigned short WEBKIT_KEYFRAMES_RULE = 7;
    3939    const unsigned short WEBKIT_KEYFRAME_RULE = 8;
     40#if defined(ENABLE_CSS_DEVICE_ADAPTATION) && ENABLE_CSS_DEVICE_ADAPTATION
     41    const unsigned short WEBKIT_VIEWPORT_RULE = 15;
     42#endif
    4043#if defined(ENABLE_CSS_REGIONS) && ENABLE_CSS_REGIONS
    4144    const unsigned short WEBKIT_REGION_RULE = 16;

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

    r135562 r135564  
    344344#if defined(ENABLE_CSS_FILTERS) && ENABLE_CSS_FILTERS
    345345    attribute WebKitCSSFilterValueConstructor WebKitCSSFilterValue;
     346#endif
     347
     348#if defined(ENABLE_CSS_DEVICE_ADAPTATION) && ENABLE_CSS_DEVICE_ADAPTATION
     349    attribute WebKitCSSViewportRuleConstructor WebKitCSSViewportRule;
    346350#endif
    347351
Note: See TracChangeset for help on using the changeset viewer.