Changeset 204700 in webkit


Ignore:
Timestamp:
Aug 21, 2016, 9:04:54 PM (9 years ago)
Author:
commit-queue@webkit.org
Message:

Remove a few custom bindings
​https://bugs.webkit.org/show_bug.cgi?id=161039

Patch by Sam Weinig <​sam@webkit.org> on 2016-08-21
Reviewed by Darin Adler.

Remove custom bindings for CanvasRenderingContext2D's webkitLineDash attribute and commit function.

  • WebCore.xcodeproj/project.pbxproj:

Sort files.

  • bindings/js/JSCanvasRenderingContext2DCustom.cpp:

(WebCore::JSCanvasRenderingContext2D::commit): Deleted.
(WebCore::JSCanvasRenderingContext2D::webkitLineDash): Deleted.
(WebCore::JSCanvasRenderingContext2D::setWebkitLineDash): Deleted.

  • html/canvas/CanvasRenderingContext2D.cpp:

(WebCore::CanvasRenderingContext2D::webkitLineDashOffset): Deleted.
(WebCore::CanvasRenderingContext2D::setWebkitLineDashOffset): Deleted.

  • html/canvas/CanvasRenderingContext2D.h:
  • html/canvas/CanvasRenderingContext2D.idl:
Location:
trunk/Source/WebCore
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r204693 r204700  
     12016-08-21  Sam Weinig  <sam@webkit.org>
     2
     3        Remove a few custom bindings
     4        https://bugs.webkit.org/show_bug.cgi?id=161039
     5
     6        Reviewed by Darin Adler.
     7
     8        Remove custom bindings for CanvasRenderingContext2D's webkitLineDash attribute and commit function.
     9
     10        * WebCore.xcodeproj/project.pbxproj:
     11        Sort files.
     12
     13        * bindings/js/JSCanvasRenderingContext2DCustom.cpp:
     14        (WebCore::JSCanvasRenderingContext2D::commit): Deleted.
     15        (WebCore::JSCanvasRenderingContext2D::webkitLineDash): Deleted.
     16        (WebCore::JSCanvasRenderingContext2D::setWebkitLineDash): Deleted.
     17        * html/canvas/CanvasRenderingContext2D.cpp:
     18        (WebCore::CanvasRenderingContext2D::webkitLineDashOffset): Deleted.
     19        (WebCore::CanvasRenderingContext2D::setWebkitLineDashOffset): Deleted.
     20        * html/canvas/CanvasRenderingContext2D.h:
     21        * html/canvas/CanvasRenderingContext2D.idl:
     22
    1232016-08-21  Youenn Fablet  <youenn@apple.com>
    224

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

    r204692 r204700  
    11051105                1FC40FB91655CCB60040F29E /* SubimageCacheWithTimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1FC40FB81655C5910040F29E /* SubimageCacheWithTimer.cpp */; };
    11061106                1FC40FBA1655CCB90040F29E /* SubimageCacheWithTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FC40FB71655C5910040F29E /* SubimageCacheWithTimer.h */; };
    1107                 209B456B16796A7E00E54E4E /* JSCryptoCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 209B456A16796A7E00E54E4E /* JSCryptoCustom.cpp */; };
    11081107                20D629261253690B00081543 /* InspectorInstrumentation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20D629241253690B00081543 /* InspectorInstrumentation.cpp */; };
    11091108                20D629271253690B00081543 /* InspectorInstrumentation.h in Headers */ = {isa = PBXBuildFile; fileRef = 20D629251253690B00081543 /* InspectorInstrumentation.h */; };
    … …  
    28672866                7CE6CBFB187F370700D46BF5 /* FormatConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CE6CBFA187F370700D46BF5 /* FormatConverter.h */; };
    28682867                7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CE6CBFC187F394900D46BF5 /* FormatConverter.cpp */; };
     2868                7CEF26191D6A931700BE905D /* JSCryptoCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CEF26181D6A92E300BE905D /* JSCryptoCustom.cpp */; };
    28692869                7CFDC57C1AC1D80500E24A57 /* ContentExtensionError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CFDC57A1AC1D80500E24A57 /* ContentExtensionError.cpp */; };
    28702870                7CFDC57D1AC1D80500E24A57 /* ContentExtensionError.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CFDC57B1AC1D80500E24A57 /* ContentExtensionError.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    67176717                FA654A6C1108ABED002626F1 /* MathMLUnderOverElement.h in Headers */ = {isa = PBXBuildFile; fileRef = FA654A6A1108ABED002626F1 /* MathMLUnderOverElement.h */; };
    67186718                FABE72F41059C1EB00D888CC /* MathMLAnnotationElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FABE72ED1059C1EB00D888CC /* MathMLAnnotationElement.cpp */; };
     6719                FABE72F41059C1EB00D999DD /* MathMLElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FABE72ED1059C1EB00D999DD /* MathMLElement.cpp */; };
    67196720                FABE72F51059C1EB00D888CC /* MathMLAnnotationElement.h in Headers */ = {isa = PBXBuildFile; fileRef = FABE72EE1059C1EB00D888CC /* MathMLAnnotationElement.h */; };
    6720                 FABE72F41059C1EB00D999DD /* MathMLElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FABE72ED1059C1EB00D999DD /* MathMLElement.cpp */; };
    67216721                FABE72F51059C1EB00D999DD /* MathMLElement.h in Headers */ = {isa = PBXBuildFile; fileRef = FABE72EE1059C1EB00D999DD /* MathMLElement.h */; };
    67226722                FABE72F61059C1EB00D999DD /* MathMLInlineContainerElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FABE72EF1059C1EB00D999DD /* MathMLInlineContainerElement.cpp */; };
    … …  
    83388338                1FC40FB71655C5910040F29E /* SubimageCacheWithTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SubimageCacheWithTimer.h; sourceTree = "<group>"; };
    83398339                1FC40FB81655C5910040F29E /* SubimageCacheWithTimer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SubimageCacheWithTimer.cpp; sourceTree = "<group>"; };
    8340                 209B456A16796A7E00E54E4E /* JSCryptoCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCryptoCustom.cpp; sourceTree = "<group>"; };
    83418340                20D629241253690B00081543 /* InspectorInstrumentation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorInstrumentation.cpp; sourceTree = "<group>"; };
    83428341                20D629251253690B00081543 /* InspectorInstrumentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorInstrumentation.h; sourceTree = "<group>"; };
    … …  
    1031010309                7CE6CBFA187F370700D46BF5 /* FormatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormatConverter.h; sourceTree = "<group>"; };
    1031110310                7CE6CBFC187F394900D46BF5 /* FormatConverter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormatConverter.cpp; sourceTree = "<group>"; };
     10311                7CEF26181D6A92E300BE905D /* JSCryptoCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCryptoCustom.cpp; sourceTree = "<group>"; };
    1031210312                7CFDC57A1AC1D80500E24A57 /* ContentExtensionError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContentExtensionError.cpp; sourceTree = "<group>"; };
    1031310313                7CFDC57B1AC1D80500E24A57 /* ContentExtensionError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContentExtensionError.h; sourceTree = "<group>"; };
    … …  
    1469614696                FA6E466FCD0418A9966A5B60 /* DNSResolveQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DNSResolveQueue.h; sourceTree = "<group>"; };
    1469714697                FABE72ED1059C1EB00D888CC /* MathMLAnnotationElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathMLAnnotationElement.cpp; sourceTree = "<group>"; };
     14698                FABE72ED1059C1EB00D999DD /* MathMLElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathMLElement.cpp; sourceTree = "<group>"; };
    1469814699                FABE72EE1059C1EB00D888CC /* MathMLAnnotationElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathMLAnnotationElement.h; sourceTree = "<group>"; };
    14699                 FABE72ED1059C1EB00D999DD /* MathMLElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathMLElement.cpp; sourceTree = "<group>"; };
    1470014700                FABE72EE1059C1EB00D999DD /* MathMLElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathMLElement.h; sourceTree = "<group>"; };
    1470114701                FABE72EF1059C1EB00D999DD /* MathMLInlineContainerElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathMLInlineContainerElement.cpp; sourceTree = "<group>"; };
    … …  
    2198421984                                C585A66011D4FAC5004C3E4B /* IDBBindingUtilities.cpp */,
    2198521985                                C585A66111D4FAC5004C3E4B /* IDBBindingUtilities.h */,
    21986                                 46A58AC41D46B3FA00432036 /* JSClientRectCustom.cpp */,
    2198721986                                E157A8EE18185425009F821D /* JSCryptoAlgorithmBuilder.cpp */,
    2198821987                                E157A8EF18185425009F821D /* JSCryptoAlgorithmBuilder.h */,
    … …  
    2199721996                                BCE438A1140C0DBF005E437E /* JSDictionary.cpp */,
    2199821997                                BCE4389B140B1BA7005E437E /* JSDictionary.h */,
    21999                                 ADDA94BF19686F8000453029 /* JSDocumentCustom.h */,
    2200021998                                93B70D4709EB0C7C009D8468 /* JSDOMBinding.cpp */,
    2200121999                                93B70D4809EB0C7C009D8468 /* JSDOMBinding.h */,
    … …  
    2203122029                                C6F420A016B7164E0052A9F2 /* JSMutationCallback.cpp */,
    2203222030                                C6F420A116B7164E0052A9F2 /* JSMutationCallback.h */,
    22033                                 83F1206A1B8C103600D75F63 /* JSNodeFilterCustom.cpp */,
    2203422031                                7C91A38D1B498ABE003F9EFA /* JSNodeOrString.cpp */,
    2203522032                                7C91A38E1B498ABE003F9EFA /* JSNodeOrString.h */,
    … …  
    2203922036                                4129DF831BB5B7F700322A16 /* JSReadableStreamPrivateConstructors.cpp */,
    2204022037                                4129DF841BB5B7F700322A16 /* JSReadableStreamPrivateConstructors.h */,
    22041                                 418C395D1C8F0AAB0051C8A3 /* JSReadableStreamSourceCustom.cpp */,
    22042                                 838869EB1CE81E9E00D16A9E /* JSTextCustom.cpp */,
    2204322038                                E1C36D320EB0A094007410BC /* JSWorkerGlobalScopeBase.cpp */,
    2204422039                                E1C36D330EB0A094007410BC /* JSWorkerGlobalScopeBase.h */,
    22045                                 83A4A9F81CE7FD7E00709B00 /* JSXMLDocumentCustom.cpp */,
    22046                                 836C14421CDEAFCA0073493F /* JSXPathNSResolverCustom.cpp */,
    2204722040                                418C395E1C8F0AAB0051C8A3 /* ReadableStreamDefaultController.cpp */,
    2204822041                                418C395F1C8F0AAB0051C8A3 /* ReadableStreamDefaultController.h */,
    … …  
    2212722120                        isa = PBXGroup;
    2212822121                        children = (
    22129                                 1B88DD121D5AD3B200E3B7A4 /* JSMediaDevicesCustom.cpp */,
    2213022122                                1221E0721C03E4C2006A1A00 /* JSAnimationTimelineCustom.cpp */,
    2213122123                                1AE96A741D1A04D300B86768 /* JSApplePayPaymentAuthorizedEventCustom.cpp */,
    … …  
    2214322135                                49EED14D1051971A00099FAB /* JSCanvasRenderingContextCustom.cpp */,
    2214422136                                7C33F3581B4A044800502CAF /* JSCharacterDataCustom.cpp */,
     22137                                46A58AC41D46B3FA00432036 /* JSClientRectCustom.cpp */,
    2214522138                                A584FE371864DAC100843B10 /* JSCommandLineAPIHostCustom.cpp */,
    22146                                 209B456A16796A7E00E54E4E /* JSCryptoCustom.cpp */,
     22139                                7CEF26181D6A92E300BE905D /* JSCryptoCustom.cpp */,
    2214722140                                E157A8E618184C67009F821D /* JSCryptoKeyCustom.cpp */,
    2214822141                                E1F80B89183172A2007885C3 /* JSCryptoKeyPairCustom.cpp */,
    … …  
    2216122154                                590E1B4A11E4EF700069F784 /* JSDeviceOrientationEventCustom.cpp */,
    2216222155                                49C7BA8C1042F5B10009D447 /* JSDocumentCustom.cpp */,
     22156                                ADDA94BF19686F8000453029 /* JSDocumentCustom.h */,
    2216322157                                7C33F3601B4A050400502CAF /* JSDocumentFragmentCustom.cpp */,
    2216422158                                7C33F35C1B4A04CE00502CAF /* JSDocumentTypeCustom.cpp */,
    … …  
    2220822202                                7A74ECBC101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp */,
    2220922203                                BCE1C43F0D9830F4003B02F2 /* JSLocationCustom.cpp */,
     22204                                1B88DD121D5AD3B200E3B7A4 /* JSMediaDevicesCustom.cpp */,
    2221022205                                AD726FE716D9F204003A4E6D /* JSMediaListCustom.h */,
    2221122206                                077B640E1B8F5375003E9AD5 /* JSMediaSessionCustom.cpp */,
    … …  
    2222122216                                BCD9C2600C17AA67005C90A2 /* JSNodeCustom.cpp */,
    2222222217                                BC9439C2116CF4940048C750 /* JSNodeCustom.h */,
     22218                                83F1206A1B8C103600D75F63 /* JSNodeFilterCustom.cpp */,
    2222322219                                1A750DD30A90E729000FF215 /* JSNodeIteratorCustom.cpp */,
    2222422220                                BCD9C2610C17AA67005C90A2 /* JSNodeListCustom.cpp */,
    … …  
    2222722223                                FD8AA63D169514A700D2EA68 /* JSPannerNodeCustom.cpp */,
    2222822224                                A85F22081430377D007CC884 /* JSPopStateEventCustom.cpp */,
     22225                                418C395D1C8F0AAB0051C8A3 /* JSReadableStreamSourceCustom.cpp */,
    2222922226                                07DC5FD317D3EEE90099F890 /* JSRTCStatsResponseCustom.cpp */,
    2223022227                                51DCE8010CAC9F1C00488358 /* JSSQLResultSetRowListCustom.cpp */,
    … …  
    2223622233                                08E4FE450E2BD41400F4CAE0 /* JSSVGLengthCustom.cpp */,
    2223722234                                B2C96D8C0B3AF2B7005E80EC /* JSSVGPathSegCustom.cpp */,
     22235                                838869EB1CE81E9E00D16A9E /* JSTextCustom.cpp */,
    2223822236                                07E117061489EBEB00EC5ACE /* JSTextTrackCueCustom.cpp */,
    2223922237                                07E116B01489C9A100EC5ACE /* JSTextTrackCustom.cpp */,
    … …  
    2225322251                                E1CA5CBB0E8CDCAF00E8EF90 /* JSWorkerCustom.cpp */,
    2225422252                                E18258AB0EF3CD7000933242 /* JSWorkerGlobalScopeCustom.cpp */,
     22253                                83A4A9F81CE7FD7E00709B00 /* JSXMLDocumentCustom.cpp */,
    2225522254                                BC348BBD0DB7F531004ABAB9 /* JSXMLHttpRequestCustom.cpp */,
     22255                                836C14421CDEAFCA0073493F /* JSXPathNSResolverCustom.cpp */,
    2225622256                                A1C7FAA1133A5D3500D6732D /* JSXPathResultCustom.cpp */,
    2225722257                                BCEFE1E40DCA5F3300739219 /* JSXSLTProcessorCustom.cpp */,
    … …  
    2987829878                                E157A8F018185425009F821D /* JSCryptoAlgorithmBuilder.cpp in Sources */,
    2987929879                                E1C657121815F9DD00256CDD /* JSCryptoAlgorithmDictionary.cpp in Sources */,
    29880                                 209B456B16796A7E00E54E4E /* JSCryptoCustom.cpp in Sources */,
    2988129880                                E157A8E01817331C009F821D /* JSCryptoKey.cpp in Sources */,
    2988229881                                E157A8E818184C67009F821D /* JSCryptoKeyCustom.cpp in Sources */,
    … …  
    3127731276                                A1E1154813015C5D0054AC8C /* SpotLightSource.cpp in Sources */,
    3127831277                                97BC6A3E1505F081001B74AC /* SQLException.cpp in Sources */,
     31278                                7CEF26191D6A931700BE905D /* JSCryptoCustom.cpp in Sources */,
    3127931279                                1A2E6E7A0CC556D5004A2062 /* SQLiteAuthorizer.cpp in Sources */,
    3128031280                                1A2246490CC98DDB00C05240 /* SQLiteDatabase.cpp in Sources */,

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

    r191887 r204700  
    6060}
    6161
    62 JSValue JSCanvasRenderingContext2D::commit(ExecState&)
    63 {
    64     // This is a no-op in a direct-2d canvas.
    65     return jsUndefined();
    66 }
    67 
    6862JSValue JSCanvasRenderingContext2D::strokeStyle(ExecState& state) const
    6963{
    … …  
    9690}
    9791
    98 JSValue JSCanvasRenderingContext2D::webkitLineDash(ExecState& state) const
    99 {
    100     const Vector<float>& dash = wrapped().getLineDash();
    101 
    102     MarkedArgumentBuffer list;
    103     Vector<float>::const_iterator end = dash.end();
    104     for (Vector<float>::const_iterator it = dash.begin(); it != end; ++it)
    105         list.append(JSValue(*it));
    106     return constructArray(&state, 0, globalObject(), list);
    107 }
    108 
    109 void JSCanvasRenderingContext2D::setWebkitLineDash(ExecState& state, JSValue value)
    110 {
    111     if (!isJSArray(value))
    112         return;
    113 
    114     Vector<float> dash;
    115     JSArray* valueArray = asArray(value);
    116     for (unsigned i = 0; i < valueArray->length(); ++i) {
    117         float elem = valueArray->getIndex(&state, i).toFloat(&state);
    118         if (elem <= 0 || !std::isfinite(elem))
    119             return;
    120 
    121         dash.append(elem);
    122     }
    123 
    124     wrapped().setWebkitLineDash(dash);
    125 }
    126 
    12792} // namespace WebCore

  • trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp

    r204517 r204700  
    646646}
    647647
    648 float CanvasRenderingContext2D::webkitLineDashOffset() const
    649 {
    650     return lineDashOffset();
    651 }
    652 
    653 void CanvasRenderingContext2D::setWebkitLineDashOffset(float offset)
    654 {
    655     setLineDashOffset(offset);
    656 }
    657 
    658648void CanvasRenderingContext2D::applyLineDash() const
    659649{

  • trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h

    r204669 r204700  
    8383    const Vector<float>& getLineDash() const;
    8484    void setLineDash(const Vector<float>&);
     85    const Vector<float>& webkitLineDash() const { return getLineDash(); }
    8586    void setWebkitLineDash(const Vector<float>&);
    8687
    8788    float lineDashOffset() const;
    8889    void setLineDashOffset(float);
    89     float webkitLineDashOffset() const;
    90     void setWebkitLineDashOffset(float);
    9190
    9291    float shadowOffsetX() const;
    … …  
    110109    void save() { ++m_unrealizedSaveCount; }
    111110    void restore();
     111
     112    // This is a no-op in a direct-2d canvas.
     113    void commit() { }
    112114
    113115    void scale(float sx, float sy);

  • trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl

    r204669 r204700  
    3232    void restore();
    3333
    34     [Custom] void commit();
     34    void commit();
    3535
    3636    void scale(unrestricted float sx, unrestricted float sy);
    … …  
    6363    attribute unrestricted float lineDashOffset;
    6464
    65     [Custom] attribute Array webkitLineDash;
    66     attribute unrestricted float webkitLineDashOffset;
     65    attribute sequence<unrestricted float> webkitLineDash;
     66    [ImplementedAs=lineDashOffset] attribute unrestricted float webkitLineDashOffset;
    6767
    6868    void clearRect(unrestricted float x, unrestricted float y, unrestricted float width, unrestricted float height);
Note: See TracChangeset for help on using the changeset viewer.