Changeset 173220 in webkit


Ignore:
Timestamp:
Sep 3, 2014 1:18:36 PM (10 years ago)
Author:
andersca@apple.com
Message:

Get rid of DOMImplementationFront
​https://bugs.webkit.org/show_bug.cgi?id=136495

Reviewed by Andreas Kling.

DOMImplementationFront was used in a workaround for a GCC bug, and since we're building with clang
on Mac this is no longer an issue.

  • WebCore.xcodeproj/project.pbxproj:
  • bindings/objc/DOMImplementationFront.cpp: Removed.
  • bindings/objc/DOMImplementationFront.h: Removed.

Remove files.

  • bindings/objc/DOMUtility.mm:

(JSC::createDOMWrapper):
Remove call to implementationFront.

  • bindings/scripts/CodeGeneratorObjC.pm:

(GetImplClassName):
Remove DOMImplementation special case

(AddIncludesForType):
Ditto.

(GenerateHeader):
Use the class header name in the #import in the internal header.

(GenerateImplementation):
Remove DOMImplementation special case.

Location:
trunk/Source/WebCore
Files:
2 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r173218 r173220  
     12014-09-03  Anders Carlsson  <andersca@apple.com>
     2
     3        Get rid of DOMImplementationFront
     4        https://bugs.webkit.org/show_bug.cgi?id=136495
     5
     6        Reviewed by Andreas Kling.
     7
     8        DOMImplementationFront was used in a workaround for a GCC bug, and since we're building with clang
     9        on Mac this is no longer an issue.
     10
     11        * WebCore.xcodeproj/project.pbxproj:
     12        * bindings/objc/DOMImplementationFront.cpp: Removed.
     13        * bindings/objc/DOMImplementationFront.h: Removed.
     14        Remove files.
     15
     16        * bindings/objc/DOMUtility.mm:
     17        (JSC::createDOMWrapper):
     18        Remove call to implementationFront.
     19
     20        * bindings/scripts/CodeGeneratorObjC.pm:
     21        (GetImplClassName):
     22        Remove DOMImplementation special case
     23
     24        (AddIncludesForType):
     25        Ditto.
     26
     27        (GenerateHeader):
     28        Use the class header name in the #import in the internal header.
     29
     30        (GenerateImplementation):
     31        Remove DOMImplementation special case.
     32
    1332014-09-03  Brent Fulgham  <bfulgham@apple.com>
    234

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

    r173198 r173220  
    32913291                93C4A4161629DF5A00C3EB6E /* ScrollingTreeFrameScrollingNodeMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93C4A4141629DF5A00C3EB6E /* ScrollingTreeFrameScrollingNodeMac.mm */; };
    32923292                93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */ = {isa = PBXBuildFile; fileRef = 93C4F6E91108F9A50099D0DB /* AccessibilityScrollbar.h */; };
    3293                 93C841F809CE855C00DFF5E5 /* DOMImplementationFront.h in Headers */ = {isa = PBXBuildFile; fileRef = 93C841F709CE855C00DFF5E5 /* DOMImplementationFront.h */; };
    3294                 93C841FF09CE858300DFF5E5 /* DOMImplementationFront.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93C841FE09CE858300DFF5E5 /* DOMImplementationFront.cpp */; };
    32953293                93CCF0270AF6C52900018E89 /* NavigationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 93CCF0260AF6C52900018E89 /* NavigationAction.h */; settings = {ATTRIBUTES = (Private, ); }; };
    32963294                93CCF0600AF6CA7600018E89 /* NavigationAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93CCF05F0AF6CA7600018E89 /* NavigationAction.cpp */; };
    … …  
    1041210410                93C4A4141629DF5A00C3EB6E /* ScrollingTreeFrameScrollingNodeMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ScrollingTreeFrameScrollingNodeMac.mm; sourceTree = "<group>"; };
    1041310411                93C4F6E91108F9A50099D0DB /* AccessibilityScrollbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityScrollbar.h; sourceTree = "<group>"; };
    10414                 93C841F709CE855C00DFF5E5 /* DOMImplementationFront.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMImplementationFront.h; sourceTree = "<group>"; };
    10415                 93C841FE09CE858300DFF5E5 /* DOMImplementationFront.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMImplementationFront.cpp; sourceTree = "<group>"; };
    1041610412                93CA4C9909DF93FA00DF8677 /* html.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = html.css; sourceTree = "<group>"; };
    1041710413                93CA4C9A09DF93FA00DF8677 /* make-css-file-arrays.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = "make-css-file-arrays.pl"; sourceTree = "<group>"; };
    … …  
    1676016756                        isa = PBXGroup;
    1676116757                        children = (
    16762                                 93C841FE09CE858300DFF5E5 /* DOMImplementationFront.cpp */,
    16763                                 93C841F709CE855C00DFF5E5 /* DOMImplementationFront.h */,
    1676416758                                856C8AE20A912649005C687B /* DOMObject.h */,
    1676516759                                856C8AE30A912649005C687B /* DOMObject.mm */,
    … …  
    2394723941                                85E711D00AC5D5350053270F /* DOMHTMLUListElementInternal.h in Headers */,
    2394823942                                A8185F3B09765766005826D9 /* DOMImplementation.h in Headers */,
    23949                                 93C841F809CE855C00DFF5E5 /* DOMImplementationFront.h in Headers */,
    2395023943                                BC1A37B9097C715F0019F3D8 /* DOMInternal.h in Headers */,
    2395123944                                85FF315A0AAFBFCB00374F38 /* DOMKeyboardEvent.h in Headers */,
    … …  
    2749027483                                85BA4D180AA688680088052D /* DOMHTMLUListElement.mm in Sources */,
    2749127484                                A8185F3E09765766005826D9 /* DOMImplementation.cpp in Sources */,
    27492                                 93C841FF09CE858300DFF5E5 /* DOMImplementationFront.cpp in Sources */,
    2749327485                                BC1A37BA097C715F0019F3D8 /* DOMInternal.mm in Sources */,
    2749427486                                85FF315B0AAFBFCB00374F38 /* DOMKeyboardEvent.mm in Sources */,

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

    r165676 r173220  
    3333#import "DOMCSSValueInternal.h"
    3434#import "DOMCounterInternal.h"
     35#import "DOMDOMImplementationInternal.h"
    3536#import "DOMEventInternal.h"
    3637#import "DOMHTMLCollectionInternal.h"
    37 #import "DOMImplementationFront.h"
    3838#import "DOMInternal.h"
    3939#import "DOMMediaListInternal.h"
    … …  
    7676#import "WebScriptObjectPrivate.h"
    7777#import "runtime_root.h"
    78 
    79 // FIXME: Couldn't get an include of "DOMDOMImplementationInternal.h" to work here.
    80 DOMImplementation *kit(WebCore::DOMImplementationFront*);
    8178
    8279// This file makes use of both the ObjC DOM API and the C++ DOM API, so we need to be careful about what
    … …  
    128125
    129126    if (object->inherits(WebCore::JSDOMImplementation::info()))
    130         return kit(implementationFront(static_cast<WebCore::JSDOMImplementation*>(object)));
     127        return kit(&static_cast<WebCore::JSDOMImplementation*>(object)->impl());
    131128
    132129    return nil;

  • trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm

    r173176 r173220  
    421421    my $name = shift;
    422422
    423     return "DOMImplementationFront" if $name eq "DOMImplementation";
    424423    return "DOMWindow" if $name eq "AbstractView";
    425424    return $name;
    … …  
    678677        $implIncludes{"DOMAbstractViewInternal.h"} = 1;
    679678        $implIncludes{"DOMWindow.h"} = 1;
    680         return;
    681     }
    682 
    683     if ($type eq "DOMImplementation") {
    684         $implIncludes{"DOMDOMImplementationInternal.h"} = 1;
    685         $implIncludes{"DOMImplementationFront.h"} = 1;
    686679        return;
    687680    }
    … …  
    11021095        }
    11031096
    1104         push(@internalHeaderContent, "\n#import <WebCore/$className.h>\n\n");
     1097        my $classHeaderName = GetClassHeaderName($className);
     1098        push(@internalHeaderContent, "\n#import <WebCore/$classHeaderName.h>\n\n");
    11051099
    11061100        if ($interfaceName eq "Node") {
    … …  
    13041298            # Special cases
    13051299            my @customGetterContent = ();
    1306             if ($attributeTypeSansPtr eq "DOMImplementation") {
    1307                 # FIXME: We have to special case DOMImplementation until DOMImplementationFront is removed
    1308                 $getterContentHead = "kit(implementationFront(IMPL";
    1309                 $getterContentTail .= ")";
    1310             } elsif ($attributeName =~ /(\w+)DisplayString$/) {
     1300            if ($attributeName =~ /(\w+)DisplayString$/) {
    13111301                my $attributeToDisplay = $1;
    13121302                $getterContentHead = "WebCore::displayString(IMPL->$attributeToDisplay(), core(self)";
Note: See TracChangeset for help on using the changeset viewer.