Changeset 87780 in webkit


Ignore:
Timestamp:
Jun 1, 2011 12:40:41 AM (13 years ago)
Author:
Dimitri Glazkov
Message:

2011-06-01 Dimitri Glazkov <Dimitri Glazkov>

Reviewed by Kent Tamura.

Remove ShadowElement and compact remaining used bits into RenderFileUploadControl.
https://bugs.webkit.org/show_bug.cgi?id=61816

This is a near-mechanical move-and-rename of ShadowElement, which is now only
used by input[type=file]. Next step -- switch it over to new shadow DOM.

Refactoring, no change in behavior.

  • CMakeLists.txt: Removed ShadowElement.cpp and ShadowElement.h.
  • GNUmakefile.list.am: Ditto.
  • WebCore.gypi: Ditto.
  • WebCore.pro: Ditto.
  • WebCore/WebCore.vcproj/WebCore.vcproj: Ditto.
  • WebCore.xcodeproj/project.pbxproj: Ditto.
  • WebCore/rendering/RenderingAllInOne.cpp: Ditto.
  • rendering/RenderFileUploadControl.cpp: (WebCore::UploadButton::create): Moved from ShadowElement, renamed as UploadButton. (WebCore::UploadButton::detach): Ditto. (WebCore::UploadButton::UploadButton): Ditto. (WebCore::RenderFileUploadControl::updateFromElement): Changed to use UploadButton.
  • rendering/RenderMeter.cpp: Removed ShadowElement.h include, which is no longer used.
  • rendering/RenderProgress.cpp: Ditto.
  • rendering/ShadowElement.cpp: Removed.
  • rendering/ShadowElement.h: Removed.
Location:
trunk/Source/WebCore
Files:
2 deleted
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/CMakeLists.txt

    r87746 r87780  
    12921292    rendering/RootInlineBox.cpp
    12931293    rendering/ScrollBehavior.cpp
    1294     rendering/ShadowElement.cpp
    12951294    rendering/TransformState.cpp
    12961295    rendering/break_lines.cpp
  • trunk/Source/WebCore/ChangeLog

    r87779 r87780  
     12011-06-01  Dimitri Glazkov  <dglazkov@chromium.org>
     2
     3        Reviewed by Kent Tamura.
     4
     5        Remove ShadowElement and compact remaining used bits into RenderFileUploadControl.
     6        https://bugs.webkit.org/show_bug.cgi?id=61816
     7
     8        This is a near-mechanical move-and-rename of ShadowElement, which is now only
     9        used by input[type=file]. Next step -- switch it over to new shadow DOM.
     10
     11        Refactoring, no change in behavior.
     12
     13        * CMakeLists.txt: Removed ShadowElement.cpp and ShadowElement.h.
     14        * GNUmakefile.list.am: Ditto.
     15        * WebCore.gypi: Ditto.
     16        * WebCore.pro: Ditto.
     17        * WebCore/WebCore.vcproj/WebCore.vcproj: Ditto.
     18        * WebCore.xcodeproj/project.pbxproj: Ditto.
     19        * WebCore/rendering/RenderingAllInOne.cpp: Ditto.
     20        * rendering/RenderFileUploadControl.cpp:
     21        (WebCore::UploadButton::create): Moved from ShadowElement, renamed as UploadButton.
     22        (WebCore::UploadButton::detach): Ditto.
     23        (WebCore::UploadButton::UploadButton): Ditto.
     24        (WebCore::RenderFileUploadControl::updateFromElement): Changed to use UploadButton.
     25        * rendering/RenderMeter.cpp: Removed ShadowElement.h include, which is no longer used.
     26        * rendering/RenderProgress.cpp: Ditto.
     27        * rendering/ShadowElement.cpp: Removed.
     28        * rendering/ShadowElement.h: Removed.
     29
    1302011-06-01  Nikolas Zimmermann  <nzimmermann@rim.com>
    231
  • trunk/Source/WebCore/GNUmakefile.list.am

    r87708 r87780  
    29382938        Source/WebCore/rendering/ScrollBehavior.cpp \
    29392939        Source/WebCore/rendering/ScrollBehavior.h \
    2940         Source/WebCore/rendering/ShadowElement.cpp \
    2941         Source/WebCore/rendering/ShadowElement.h \
    29422940        Source/WebCore/rendering/VerticalPositionCache.h \
    29432941        Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp \
  • trunk/Source/WebCore/WebCore.gypi

    r87746 r87780  
    53585358            'rendering/RootInlineBox.cpp',
    53595359            'rendering/ScrollBehavior.cpp',
    5360             'rendering/ShadowElement.cpp',
    5361             'rendering/ShadowElement.h',
    53625360            'rendering/TableLayout.h',
    53635361            'rendering/TrailingFloatsRootInlineBox.h',
  • trunk/Source/WebCore/WebCore.pro

    r87708 r87780  
    11621162    rendering/RootInlineBox.cpp \
    11631163    rendering/ScrollBehavior.cpp \
    1164     rendering/ShadowElement.cpp \
    11651164    rendering/TransformState.cpp \
    11661165    rendering/style/ContentData.cpp \
     
    21932192    rendering/RootInlineBox.h \
    21942193    rendering/ScrollBehavior.h \
    2195     rendering/ShadowElement.h \
    21962194    rendering/style/ContentData.h \
    21972195    rendering/style/CounterDirectives.h \
  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r87708 r87780  
    3877738777                        </File>
    3877838778                        <File
    38779                                 RelativePath="..\rendering\ShadowElement.cpp"
    38780                                 >
    38781                                 <FileConfiguration
    38782                                         Name="Debug|Win32"
    38783                                         ExcludedFromBuild="true"
    38784                                         >
    38785                                         <Tool
    38786                                                 Name="VCCLCompilerTool"
    38787                                         />
    38788                                 </FileConfiguration>
    38789                                 <FileConfiguration
    38790                                         Name="Release|Win32"
    38791                                         ExcludedFromBuild="true"
    38792                                         >
    38793                                         <Tool
    38794                                                 Name="VCCLCompilerTool"
    38795                                         />
    38796                                 </FileConfiguration>
    38797                                 <FileConfiguration
    38798                                         Name="Debug_Cairo_CFLite|Win32"
    38799                                         ExcludedFromBuild="true"
    38800                                         >
    38801                                         <Tool
    38802                                                 Name="VCCLCompilerTool"
    38803                                         />
    38804                                 </FileConfiguration>
    38805                                 <FileConfiguration
    38806                                         Name="Release_Cairo_CFLite|Win32"
    38807                                         ExcludedFromBuild="true"
    38808                                         >
    38809                                         <Tool
    38810                                                 Name="VCCLCompilerTool"
    38811                                         />
    38812                                 </FileConfiguration>
    38813                                 <FileConfiguration
    38814                                         Name="Debug_All|Win32"
    38815                                         ExcludedFromBuild="true"
    38816                                         >
    38817                                         <Tool
    38818                                                 Name="VCCLCompilerTool"
    38819                                         />
    38820                                 </FileConfiguration>
    38821                                 <FileConfiguration
    38822                                         Name="Production|Win32"
    38823                                         ExcludedFromBuild="true"
    38824                                         >
    38825                                         <Tool
    38826                                                 Name="VCCLCompilerTool"
    38827                                         />
    38828                                 </FileConfiguration>
    38829                         </File>
    38830                         <File
    38831                                 RelativePath="..\rendering\ShadowElement.h"
    38832                                 >
    38833                         </File>
    38834                         <File
    3883538779                                RelativePath="..\rendering\svg\SVGMarkerData.h"
    3883638780                                >
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r87746 r87780  
    983983                44A28AAC12DFB8AC00AE923B /* MathMLElementFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 44A28AAB12DFB8AC00AE923B /* MathMLElementFactory.h */; };
    984984                44A28AAF12DFB8BF00AE923B /* MathMLNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 44A28AAE12DFB8BF00AE923B /* MathMLNames.h */; };
    985                 44D8DA99139545BE00337B75 /* SVGMPathElement.idl in Resources */ = {isa = PBXBuildFile; fileRef = 44D8DA98139545BE00337B75 /* SVGMPathElement.idl */; };
    986                 44D8DA9B139545CD00337B75 /* SVGAnimateMotionElement.idl in Resources */ = {isa = PBXBuildFile; fileRef = 44D8DA9A139545CD00337B75 /* SVGAnimateMotionElement.idl */; };
    987985                45099C411370A7800058D513 /* IconURL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45099C401370A7800058D513 /* IconURL.cpp */; };
    988986                45BAC2B01360BBAB005DA258 /* IconURL.h in Headers */ = {isa = PBXBuildFile; fileRef = 45BAC2AF1360BBAB005DA258 /* IconURL.h */; settings = {ATTRIBUTES = (Private, ); }; };
     
    32753273                A7DBF8DD1276919C006B6008 /* TextCheckingHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7DBF8DB1276919C006B6008 /* TextCheckingHelper.cpp */; };
    32763274                A7DBF8DE1276919C006B6008 /* TextCheckingHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = A7DBF8DC1276919C006B6008 /* TextCheckingHelper.h */; };
    3277                 A7F338A311C0EFCA00A320A7 /* ShadowElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7F338A111C0EFCA00A320A7 /* ShadowElement.cpp */; };
    3278                 A7F338A411C0EFCA00A320A7 /* ShadowElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A7F338A211C0EFCA00A320A7 /* ShadowElement.h */; };
    32793275                A7F5D94F1384F02D00A29A87 /* NodeRenderingContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7F5D94D1384F02D00A29A87 /* NodeRenderingContext.cpp */; };
    32803276                A7F5D9501384F02D00A29A87 /* NodeRenderingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = A7F5D94E1384F02D00A29A87 /* NodeRenderingContext.h */; };
     
    98499845                A7DBF8DB1276919C006B6008 /* TextCheckingHelper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextCheckingHelper.cpp; sourceTree = "<group>"; };
    98509846                A7DBF8DC1276919C006B6008 /* TextCheckingHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextCheckingHelper.h; sourceTree = "<group>"; };
    9851                 A7F338A111C0EFCA00A320A7 /* ShadowElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShadowElement.cpp; sourceTree = "<group>"; };
    9852                 A7F338A211C0EFCA00A320A7 /* ShadowElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShadowElement.h; sourceTree = "<group>"; };
    98539847                A7F5D94D1384F02D00A29A87 /* NodeRenderingContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NodeRenderingContext.cpp; sourceTree = "<group>"; };
    98549848                A7F5D94E1384F02D00A29A87 /* NodeRenderingContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NodeRenderingContext.h; sourceTree = "<group>"; };
     
    1928719281                                5D925B650F64D4DD00B847F0 /* ScrollBehavior.cpp */,
    1928819282                                5D925B660F64D4DD00B847F0 /* ScrollBehavior.h */,
    19289                                 A7F338A111C0EFCA00A320A7 /* ShadowElement.cpp */,
    19290                                 A7F338A211C0EFCA00A320A7 /* ShadowElement.h */,
    1929119283                                A8CFF04C0A154F09000A4234 /* TableLayout.h */,
    1929219284                                37FC96DA1104ED71003E1FAD /* TrailingFloatsRootInlineBox.h */,
     
    2244522437                                A71C30B91381265E00DBC351 /* ShadowContentSelector.h in Headers */,
    2244622438                                BC5EB8C40E82031B00B25965 /* ShadowData.h in Headers */,
    22447                                 A7F338A411C0EFCA00A320A7 /* ShadowElement.h in Headers */,
    2244822439                                A6D169641346B4C1000EB770 /* ShadowRoot.h in Headers */,
    2244922440                                A80E6CE80A1989CA007FB8C5 /* ShadowValue.h in Headers */,
     
    2527525266                                A71C30B81381265E00DBC351 /* ShadowContentSelector.cpp in Sources */,
    2527625267                                BC5EB8C30E82031B00B25965 /* ShadowData.cpp in Sources */,
    25277                                 A7F338A311C0EFCA00A320A7 /* ShadowElement.cpp in Sources */,
    2527825268                                A6D169621346B49B000EB770 /* ShadowRoot.cpp in Sources */,
    2527925269                                A80E6CF40A1989CA007FB8C5 /* ShadowValue.cpp in Sources */,
  • trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp

    r87260 r87780  
    2929#include "HTMLInputElement.h"
    3030#include "HTMLNames.h"
    31 #include "ShadowElement.h"
    3231#include "Icon.h"
    3332#include "LocalizedStrings.h"
     
    5453const int buttonShadowHeight = 2;
    5554
     55class UploadButton : public HTMLInputElement {
     56public:
     57    static PassRefPtr<UploadButton> create(HTMLInputElement*);
     58    virtual void detach();
     59
     60private:
     61    UploadButton(HTMLInputElement*);
     62};
     63
     64PassRefPtr<UploadButton> UploadButton::create(HTMLInputElement* shadowParent)
     65{
     66    return adoptRef(new UploadButton(shadowParent));
     67}
     68
     69void UploadButton::detach()
     70{
     71    HTMLInputElement::detach();
     72    setShadowHost(0);
     73}
     74
     75UploadButton::UploadButton(HTMLInputElement* shadowParent)
     76    : HTMLInputElement(inputTag, shadowParent->document(), 0, false)
     77{
     78    setShadowHost(shadowParent);
     79}
     80
    5681RenderFileUploadControl::RenderFileUploadControl(HTMLInputElement* input)
    5782    : RenderBlock(input)
     
    155180   
    156181    if (!m_button) {
    157         m_button = ShadowInputElement::create(inputElement);
     182        m_button = UploadButton::create(inputElement);
    158183        m_button->setType("button");
    159184        m_button->setValue(fileButtonChooseFileLabel());
  • trunk/Source/WebCore/rendering/RenderMeter.cpp

    r82899 r87780  
    2828#include "HTMLNames.h"
    2929#include "RenderTheme.h"
    30 #include "ShadowElement.h"
    3130
    3231using namespace std;
  • trunk/Source/WebCore/rendering/RenderProgress.cpp

    r84156 r87780  
    2929#include "PaintInfo.h"
    3030#include "RenderTheme.h"
    31 #include "ShadowElement.h"
    3231#include <wtf/CurrentTime.h>
    3332#include <wtf/RefPtr.h>
  • trunk/Source/WebCore/rendering/RenderingAllInOne.cpp

    r84991 r87780  
    108108#include "RootInlineBox.cpp"
    109109#include "ScrollBehavior.cpp"
    110 #include "ShadowElement.cpp"
    111110#include "TransformState.cpp"
    112111#include "break_lines.cpp"
Note: See TracChangeset for help on using the changeset viewer.