Changeset 83596 in webkit


Ignore:
Timestamp:
Apr 12, 2011 9:24:38 AM (13 years ago)
Author:
morrita@google.com
Message:

2011-04-11 MORITA Hajime <morrita@google.com>

Reviewed by Ryosuke Niwa.

RenderIndicator and ShadowBlockElement are no longer used.
https://bugs.webkit.org/show_bug.cgi?id=58277

Removed RenderIndicator and ShadowBlockElement.

No new tests. Just removed unused code.

  • CMakeLists.txt:
  • GNUmakefile.list.am:
  • WebCore.gypi:
  • WebCore.pro:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • rendering/RenderIndicator.cpp: Removed.
  • rendering/RenderIndicator.h: Removed.
  • rendering/RenderMeter.h:
  • rendering/RenderingAllInOne.cpp:
  • rendering/ShadowElement.cpp:
  • rendering/ShadowElement.h:
Location:
trunk/Source/WebCore
Files:
2 deleted
11 edited

Legend:

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

    r83545 r83596  
    12241224    rendering/RenderImageResource.cpp
    12251225    rendering/RenderImageResourceStyleImage.cpp
    1226     rendering/RenderIndicator.cpp
    12271226    rendering/RenderInline.cpp
    12281227    rendering/RenderLayer.cpp
  • trunk/Source/WebCore/ChangeLog

    r83593 r83596  
     12011-04-11  MORITA Hajime  <morrita@google.com>
     2
     3        Reviewed by Ryosuke Niwa.
     4       
     5        RenderIndicator and ShadowBlockElement are no longer used.
     6        https://bugs.webkit.org/show_bug.cgi?id=58277
     7
     8        Removed RenderIndicator and ShadowBlockElement.
     9       
     10        No new tests. Just removed unused code.
     11
     12        * CMakeLists.txt:
     13        * GNUmakefile.list.am:
     14        * WebCore.gypi:
     15        * WebCore.pro:
     16        * WebCore.vcproj/WebCore.vcproj:
     17        * WebCore.xcodeproj/project.pbxproj:
     18        * rendering/RenderIndicator.cpp: Removed.
     19        * rendering/RenderIndicator.h: Removed.
     20        * rendering/RenderMeter.h:
     21        * rendering/RenderingAllInOne.cpp:
     22        * rendering/ShadowElement.cpp:
     23        * rendering/ShadowElement.h:
     24
    1252011-04-12  Csaba Osztrogonác  <ossy@webkit.org>
    226
  • trunk/Source/WebCore/GNUmakefile.list.am

    r83549 r83596  
    27822782        Source/WebCore/rendering/RenderImageResourceStyleImage.cpp \
    27832783        Source/WebCore/rendering/RenderImageResourceStyleImage.h \
    2784         Source/WebCore/rendering/RenderIndicator.cpp \
    2785         Source/WebCore/rendering/RenderIndicator.h \
    27862784        Source/WebCore/rendering/RenderInline.cpp \
    27872785        Source/WebCore/rendering/RenderInline.h \
  • trunk/Source/WebCore/WebCore.gypi

    r83578 r83596  
    51665166            'rendering/RenderImageResource.cpp',
    51675167            'rendering/RenderImageResourceStyleImage.cpp',
    5168             'rendering/RenderIndicator.cpp',
    5169             'rendering/RenderIndicator.h',
    51705168            'rendering/RenderInline.cpp',
    51715169            'rendering/RenderInline.h',
  • trunk/Source/WebCore/WebCore.pro

    r83545 r83596  
    11021102    rendering/RenderImageResource.cpp \
    11031103    rendering/RenderImageResourceStyleImage.cpp \
    1104     rendering/RenderIndicator.cpp \
    11051104    rendering/RenderInline.cpp \
    11061105    rendering/RenderLayer.cpp \
     
    21112110    rendering/RenderImageResourceStyleImage.h \
    21122111    rendering/RenderImage.h \
    2113     rendering/RenderIndicator.h \
    21142112    rendering/RenderInline.h \
    21152113    rendering/RenderInputSpeech.h \
  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r83545 r83596  
    3449534495                        </File>
    3449634496                        <File
    34497                                 RelativePath="..\rendering\RenderIndicator.cpp"
    34498                                 >
    34499                                 <FileConfiguration
    34500                                         Name="Debug|Win32"
    34501                                         ExcludedFromBuild="true"
    34502                                         >
    34503                                         <Tool
    34504                                                 Name="VCCLCompilerTool"
    34505                                         />
    34506                                 </FileConfiguration>
    34507                                 <FileConfiguration
    34508                                         Name="Release|Win32"
    34509                                         ExcludedFromBuild="true"
    34510                                         >
    34511                                         <Tool
    34512                                                 Name="VCCLCompilerTool"
    34513                                         />
    34514                                 </FileConfiguration>
    34515                                 <FileConfiguration
    34516                                         Name="Debug_Cairo_CFLite|Win32"
    34517                                         ExcludedFromBuild="true"
    34518                                         >
    34519                                         <Tool
    34520                                                 Name="VCCLCompilerTool"
    34521                                         />
    34522                                 </FileConfiguration>
    34523                                 <FileConfiguration
    34524                                         Name="Release_Cairo_CFLite|Win32"
    34525                                         ExcludedFromBuild="true"
    34526                                         >
    34527                                         <Tool
    34528                                                 Name="VCCLCompilerTool"
    34529                                         />
    34530                                 </FileConfiguration>
    34531                                 <FileConfiguration
    34532                                         Name="Debug_All|Win32"
    34533                                         ExcludedFromBuild="true"
    34534                                         >
    34535                                         <Tool
    34536                                                 Name="VCCLCompilerTool"
    34537                                         />
    34538                                 </FileConfiguration>
    34539                                 <FileConfiguration
    34540                                         Name="Production|Win32"
    34541                                         ExcludedFromBuild="true"
    34542                                         >
    34543                                         <Tool
    34544                                                 Name="VCCLCompilerTool"
    34545                                         />
    34546                                 </FileConfiguration>
    34547                         </File>
    34548                         <File
    34549                                 RelativePath="..\rendering\RenderIndicator.h"
    34550                                 >
    34551                         </File>
    34552                         <File
    3455334497                                RelativePath="..\rendering\RenderingAllInOne.cpp"
    3455434498                                >
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r83548 r83596  
    32313231                A795463E0B5C4C80007B438F /* DragDataMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A795463D0B5C4C80007B438F /* DragDataMac.mm */; };
    32323232                A79546430B5C4CB4007B438F /* DragData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A79546420B5C4CB4007B438F /* DragData.cpp */; };
    3233                 A7AA66D611C5ED6A001D8C8C /* RenderIndicator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7AA66D411C5ED6A001D8C8C /* RenderIndicator.cpp */; };
    3234                 A7AA66D711C5ED6A001D8C8C /* RenderIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = A7AA66D511C5ED6A001D8C8C /* RenderIndicator.h */; };
    32353233                A7AD2F870EC89D07008AB002 /* LinkHash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7AD2F850EC89D07008AB002 /* LinkHash.cpp */; };
    32363234                A7AD2F880EC89D07008AB002 /* LinkHash.h in Headers */ = {isa = PBXBuildFile; fileRef = A7AD2F860EC89D07008AB002 /* LinkHash.h */; settings = {ATTRIBUTES = (Private, ); }; };
     
    97749772                A795463D0B5C4C80007B438F /* DragDataMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DragDataMac.mm; sourceTree = "<group>"; };
    97759773                A79546420B5C4CB4007B438F /* DragData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DragData.cpp; sourceTree = "<group>"; };
    9776                 A7AA66D411C5ED6A001D8C8C /* RenderIndicator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderIndicator.cpp; sourceTree = "<group>"; };
    9777                 A7AA66D511C5ED6A001D8C8C /* RenderIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderIndicator.h; sourceTree = "<group>"; };
    97789774                A7AD2F850EC89D07008AB002 /* LinkHash.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LinkHash.cpp; sourceTree = "<group>"; };
    97799775                A7AD2F860EC89D07008AB002 /* LinkHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinkHash.h; sourceTree = "<group>"; };
     
    1912119117                                08641D4512142F7D008DE9F6 /* RenderImageResourceStyleImage.cpp */,
    1912219118                                08641D4612142F7D008DE9F6 /* RenderImageResourceStyleImage.h */,
    19123                                 A7AA66D411C5ED6A001D8C8C /* RenderIndicator.cpp */,
    19124                                 A7AA66D511C5ED6A001D8C8C /* RenderIndicator.h */,
    1912519119                                BCEA4838097D93020094C9E4 /* RenderInline.cpp */,
    1912619120                                BCEA4839097D93020094C9E4 /* RenderInline.h */,
     
    2211822112                                08F2F00A1213E61700DCEC48 /* RenderImageResource.h in Headers */,
    2211922113                                08641D4812142F7D008DE9F6 /* RenderImageResourceStyleImage.h in Headers */,
    22120                                 A7AA66D711C5ED6A001D8C8C /* RenderIndicator.h in Headers */,
    2212122114                                BCEA4878097D93020094C9E4 /* RenderInline.h in Headers */,
    2212222115                                750D029411D0E7F300BD1B27 /* RenderInputSpeech.h in Headers */,
     
    2498124974                                08F2F0091213E61700DCEC48 /* RenderImageResource.cpp in Sources */,
    2498224975                                08641D4712142F7D008DE9F6 /* RenderImageResourceStyleImage.cpp in Sources */,
    24983                                 A7AA66D611C5ED6A001D8C8C /* RenderIndicator.cpp in Sources */,
    2498424976                                BCEA4877097D93020094C9E4 /* RenderInline.cpp in Sources */,
    2498524977                                750D029311D0E7F300BD1B27 /* RenderInputSpeech.cpp in Sources */,
  • trunk/Source/WebCore/rendering/RenderMeter.h

    r82899 r83596  
    2424#if ENABLE(METER_TAG)
    2525#include "RenderBlock.h"
    26 #include "RenderIndicator.h"
    2726#include "RenderWidget.h"
    2827
     
    3130
    3231class HTMLMeterElement;
    33 class ShadowBlockElement;
    3432
    3533class RenderMeter : public RenderBlock {
  • trunk/Source/WebCore/rendering/RenderingAllInOne.cpp

    r80151 r83596  
    6363#include "RenderImageResource.cpp"
    6464#include "RenderImageResourceStyleImage.cpp"
    65 #include "RenderIndicator.cpp"
    6665#include "RenderInline.cpp"
    6766#include "RenderLayer.cpp"
  • trunk/Source/WebCore/rendering/ShadowElement.cpp

    r76664 r83596  
    3030using namespace HTMLNames;
    3131
    32 PassRefPtr<ShadowBlockElement> ShadowBlockElement::create(HTMLElement* shadowParent)
    33 {
    34     return adoptRef(new ShadowBlockElement(shadowParent));
    35 }
    36 
    37 ShadowBlockElement::ShadowBlockElement(HTMLElement* shadowParent)
    38     : ShadowElement<HTMLDivElement>(divTag, shadowParent)
    39 {
    40 }
    41 
    42 void ShadowBlockElement::layoutAsPart(const IntRect& partRect)
    43 {
    44     RenderBox* parentRenderer = toRenderBox(renderer()->parent());
    45     RenderBox* selfRenderer = toRenderBox(renderer());
    46     IntRect oldRect = selfRenderer->frameRect();
    47 
    48     LayoutStateMaintainer statePusher(parentRenderer->view(), parentRenderer, parentRenderer->size(), parentRenderer->style()->isFlippedBlocksWritingMode());
    49 
    50     if (oldRect.size() != partRect.size())
    51         selfRenderer->setChildNeedsLayout(true, false);
    52 
    53     selfRenderer->layoutIfNeeded();
    54     selfRenderer->setFrameRect(partRect);
    55 
    56     if (selfRenderer->checkForRepaintDuringLayout())
    57         selfRenderer->repaintDuringLayoutIfMoved(oldRect);
    58        
    59     statePusher.pop();
    60     parentRenderer->addOverflowFromChild(selfRenderer);
    61 }
    62 
    63 void ShadowBlockElement::updateStyleForPart(PseudoId pseudoId)
    64 {
    65     if (renderer()->style()->styleType() != pseudoId)
    66         renderer()->setStyle(createStyleForPart(renderer()->parent(), pseudoId));
    67 }
    68 
    69 PassRefPtr<ShadowBlockElement> ShadowBlockElement::createForPart(HTMLElement* shadowParent, PseudoId pseudoId)
    70 {
    71     RefPtr<ShadowBlockElement> part = create(shadowParent);
    72     part->initAsPart(pseudoId);
    73     return part.release();
    74 }
    75 
    76 void ShadowBlockElement::initAsPart(PseudoId pseudoId)
    77 {
    78     RenderObject* parentRenderer = shadowHost()->renderer();
    79     RefPtr<RenderStyle> styleForPart = createStyleForPart(parentRenderer, pseudoId);
    80     setRenderer(createRenderer(parentRenderer->renderArena(), styleForPart.get()));
    81     renderer()->setStyle(styleForPart.release());
    82     setAttached();
    83     setInDocument();
    84 }
    85 
    86 PassRefPtr<RenderStyle> ShadowBlockElement::createStyleForPart(RenderObject* parentRenderer, PseudoId pseudoId)
    87 {
    88     RefPtr<RenderStyle> styleForPart;
    89     RenderStyle* pseudoStyle = parentRenderer->getCachedPseudoStyle(pseudoId);
    90     if (pseudoStyle)
    91         styleForPart = RenderStyle::clone(pseudoStyle);
    92     else
    93         styleForPart = RenderStyle::create();
    94    
    95     styleForPart->inheritFrom(parentRenderer->style());
    96     styleForPart->setDisplay(BLOCK);
    97     styleForPart->setAppearance(NoControlPart);
    98     return styleForPart.release();
    99 }
    100 
    101 bool ShadowBlockElement::partShouldHaveStyle(const RenderObject* parentRenderer, PseudoId pseudoId)
    102 {
    103     // We have some -webkit-appearance values for default styles of parts and
    104     // that appearance get turned off during RenderStyle creation
    105     // if they have background styles specified.
    106     // So !hasAppearance() implies that there are something to be styled.
    107     RenderStyle* pseudoStyle = parentRenderer->getCachedPseudoStyle(pseudoId);
    108     return !(pseudoStyle && pseudoStyle->hasAppearance());
    109 }
    110 
    11132PassRefPtr<ShadowInputElement> ShadowInputElement::create(HTMLElement* shadowParent)
    11233{
  • trunk/Source/WebCore/rendering/ShadowElement.h

    r76664 r83596  
    6262}
    6363
    64 class ShadowBlockElement : public ShadowElement<HTMLDivElement> {
    65 public:
    66     static PassRefPtr<ShadowBlockElement> create(HTMLElement*);
    67     static PassRefPtr<ShadowBlockElement> createForPart(HTMLElement*, PseudoId);
    68     static bool partShouldHaveStyle(const RenderObject* parentRenderer, PseudoId pseudoId);
    69     void layoutAsPart(const IntRect& partRect);
    70     virtual void updateStyleForPart(PseudoId);
    71 
    72 protected:
    73     ShadowBlockElement(HTMLElement*);
    74     void initAsPart(PseudoId pasuedId);
    75 private:
    76     static PassRefPtr<RenderStyle> createStyleForPart(RenderObject*, PseudoId);
    77 };
    78 
    7964class ShadowInputElement : public ShadowElement<HTMLInputElement> {
    8065public:
Note: See TracChangeset for help on using the changeset viewer.