Changeset 87780 in webkit
- Timestamp:
- Jun 1, 2011 12:40:41 AM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 deleted
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/CMakeLists.txt
r87746 r87780 1292 1292 rendering/RootInlineBox.cpp 1293 1293 rendering/ScrollBehavior.cpp 1294 rendering/ShadowElement.cpp1295 1294 rendering/TransformState.cpp 1296 1295 rendering/break_lines.cpp -
trunk/Source/WebCore/ChangeLog
r87779 r87780 1 2011-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 1 30 2011-06-01 Nikolas Zimmermann <nzimmermann@rim.com> 2 31 -
trunk/Source/WebCore/GNUmakefile.list.am
r87708 r87780 2938 2938 Source/WebCore/rendering/ScrollBehavior.cpp \ 2939 2939 Source/WebCore/rendering/ScrollBehavior.h \ 2940 Source/WebCore/rendering/ShadowElement.cpp \2941 Source/WebCore/rendering/ShadowElement.h \2942 2940 Source/WebCore/rendering/VerticalPositionCache.h \ 2943 2941 Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp \ -
trunk/Source/WebCore/WebCore.gypi
r87746 r87780 5358 5358 'rendering/RootInlineBox.cpp', 5359 5359 'rendering/ScrollBehavior.cpp', 5360 'rendering/ShadowElement.cpp',5361 'rendering/ShadowElement.h',5362 5360 'rendering/TableLayout.h', 5363 5361 'rendering/TrailingFloatsRootInlineBox.h', -
trunk/Source/WebCore/WebCore.pro
r87708 r87780 1162 1162 rendering/RootInlineBox.cpp \ 1163 1163 rendering/ScrollBehavior.cpp \ 1164 rendering/ShadowElement.cpp \1165 1164 rendering/TransformState.cpp \ 1166 1165 rendering/style/ContentData.cpp \ … … 2193 2192 rendering/RootInlineBox.h \ 2194 2193 rendering/ScrollBehavior.h \ 2195 rendering/ShadowElement.h \2196 2194 rendering/style/ContentData.h \ 2197 2195 rendering/style/CounterDirectives.h \ -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r87708 r87780 38777 38777 </File> 38778 38778 <File 38779 RelativePath="..\rendering\ShadowElement.cpp"38780 >38781 <FileConfiguration38782 Name="Debug|Win32"38783 ExcludedFromBuild="true"38784 >38785 <Tool38786 Name="VCCLCompilerTool"38787 />38788 </FileConfiguration>38789 <FileConfiguration38790 Name="Release|Win32"38791 ExcludedFromBuild="true"38792 >38793 <Tool38794 Name="VCCLCompilerTool"38795 />38796 </FileConfiguration>38797 <FileConfiguration38798 Name="Debug_Cairo_CFLite|Win32"38799 ExcludedFromBuild="true"38800 >38801 <Tool38802 Name="VCCLCompilerTool"38803 />38804 </FileConfiguration>38805 <FileConfiguration38806 Name="Release_Cairo_CFLite|Win32"38807 ExcludedFromBuild="true"38808 >38809 <Tool38810 Name="VCCLCompilerTool"38811 />38812 </FileConfiguration>38813 <FileConfiguration38814 Name="Debug_All|Win32"38815 ExcludedFromBuild="true"38816 >38817 <Tool38818 Name="VCCLCompilerTool"38819 />38820 </FileConfiguration>38821 <FileConfiguration38822 Name="Production|Win32"38823 ExcludedFromBuild="true"38824 >38825 <Tool38826 Name="VCCLCompilerTool"38827 />38828 </FileConfiguration>38829 </File>38830 <File38831 RelativePath="..\rendering\ShadowElement.h"38832 >38833 </File>38834 <File38835 38779 RelativePath="..\rendering\svg\SVGMarkerData.h" 38836 38780 > -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r87746 r87780 983 983 44A28AAC12DFB8AC00AE923B /* MathMLElementFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 44A28AAB12DFB8AC00AE923B /* MathMLElementFactory.h */; }; 984 984 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 */; };987 985 45099C411370A7800058D513 /* IconURL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45099C401370A7800058D513 /* IconURL.cpp */; }; 988 986 45BAC2B01360BBAB005DA258 /* IconURL.h in Headers */ = {isa = PBXBuildFile; fileRef = 45BAC2AF1360BBAB005DA258 /* IconURL.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 3275 3273 A7DBF8DD1276919C006B6008 /* TextCheckingHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7DBF8DB1276919C006B6008 /* TextCheckingHelper.cpp */; }; 3276 3274 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 */; };3279 3275 A7F5D94F1384F02D00A29A87 /* NodeRenderingContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7F5D94D1384F02D00A29A87 /* NodeRenderingContext.cpp */; }; 3280 3276 A7F5D9501384F02D00A29A87 /* NodeRenderingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = A7F5D94E1384F02D00A29A87 /* NodeRenderingContext.h */; }; … … 9849 9845 A7DBF8DB1276919C006B6008 /* TextCheckingHelper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextCheckingHelper.cpp; sourceTree = "<group>"; }; 9850 9846 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>"; };9853 9847 A7F5D94D1384F02D00A29A87 /* NodeRenderingContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NodeRenderingContext.cpp; sourceTree = "<group>"; }; 9854 9848 A7F5D94E1384F02D00A29A87 /* NodeRenderingContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NodeRenderingContext.h; sourceTree = "<group>"; }; … … 19287 19281 5D925B650F64D4DD00B847F0 /* ScrollBehavior.cpp */, 19288 19282 5D925B660F64D4DD00B847F0 /* ScrollBehavior.h */, 19289 A7F338A111C0EFCA00A320A7 /* ShadowElement.cpp */,19290 A7F338A211C0EFCA00A320A7 /* ShadowElement.h */,19291 19283 A8CFF04C0A154F09000A4234 /* TableLayout.h */, 19292 19284 37FC96DA1104ED71003E1FAD /* TrailingFloatsRootInlineBox.h */, … … 22445 22437 A71C30B91381265E00DBC351 /* ShadowContentSelector.h in Headers */, 22446 22438 BC5EB8C40E82031B00B25965 /* ShadowData.h in Headers */, 22447 A7F338A411C0EFCA00A320A7 /* ShadowElement.h in Headers */,22448 22439 A6D169641346B4C1000EB770 /* ShadowRoot.h in Headers */, 22449 22440 A80E6CE80A1989CA007FB8C5 /* ShadowValue.h in Headers */, … … 25275 25266 A71C30B81381265E00DBC351 /* ShadowContentSelector.cpp in Sources */, 25276 25267 BC5EB8C30E82031B00B25965 /* ShadowData.cpp in Sources */, 25277 A7F338A311C0EFCA00A320A7 /* ShadowElement.cpp in Sources */,25278 25268 A6D169621346B49B000EB770 /* ShadowRoot.cpp in Sources */, 25279 25269 A80E6CF40A1989CA007FB8C5 /* ShadowValue.cpp in Sources */, -
trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp
r87260 r87780 29 29 #include "HTMLInputElement.h" 30 30 #include "HTMLNames.h" 31 #include "ShadowElement.h"32 31 #include "Icon.h" 33 32 #include "LocalizedStrings.h" … … 54 53 const int buttonShadowHeight = 2; 55 54 55 class UploadButton : public HTMLInputElement { 56 public: 57 static PassRefPtr<UploadButton> create(HTMLInputElement*); 58 virtual void detach(); 59 60 private: 61 UploadButton(HTMLInputElement*); 62 }; 63 64 PassRefPtr<UploadButton> UploadButton::create(HTMLInputElement* shadowParent) 65 { 66 return adoptRef(new UploadButton(shadowParent)); 67 } 68 69 void UploadButton::detach() 70 { 71 HTMLInputElement::detach(); 72 setShadowHost(0); 73 } 74 75 UploadButton::UploadButton(HTMLInputElement* shadowParent) 76 : HTMLInputElement(inputTag, shadowParent->document(), 0, false) 77 { 78 setShadowHost(shadowParent); 79 } 80 56 81 RenderFileUploadControl::RenderFileUploadControl(HTMLInputElement* input) 57 82 : RenderBlock(input) … … 155 180 156 181 if (!m_button) { 157 m_button = ShadowInputElement::create(inputElement);182 m_button = UploadButton::create(inputElement); 158 183 m_button->setType("button"); 159 184 m_button->setValue(fileButtonChooseFileLabel()); -
trunk/Source/WebCore/rendering/RenderMeter.cpp
r82899 r87780 28 28 #include "HTMLNames.h" 29 29 #include "RenderTheme.h" 30 #include "ShadowElement.h"31 30 32 31 using namespace std; -
trunk/Source/WebCore/rendering/RenderProgress.cpp
r84156 r87780 29 29 #include "PaintInfo.h" 30 30 #include "RenderTheme.h" 31 #include "ShadowElement.h"32 31 #include <wtf/CurrentTime.h> 33 32 #include <wtf/RefPtr.h> -
trunk/Source/WebCore/rendering/RenderingAllInOne.cpp
r84991 r87780 108 108 #include "RootInlineBox.cpp" 109 109 #include "ScrollBehavior.cpp" 110 #include "ShadowElement.cpp"111 110 #include "TransformState.cpp" 112 111 #include "break_lines.cpp"
Note: See TracChangeset
for help on using the changeset viewer.