Changeset 83636 in webkit
- Timestamp:
- Apr 12, 2011 1:59:36 PM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 9 edited
- 2 moved
-
Android.mk (modified) (2 diffs)
-
CMakeLists.txt (modified) (1 diff)
-
ChangeLog (modified) (1 diff)
-
GNUmakefile.list.am (modified) (2 diffs)
-
WebCore.gypi (modified) (2 diffs)
-
WebCore.pro (modified) (1 diff)
-
WebCore.vcproj/WebCore.vcproj (modified) (2 diffs)
-
WebCore.xcodeproj/project.pbxproj (modified) (13 diffs)
-
html/shadow/MediaControlElements.cpp (moved) (moved from trunk/Source/WebCore/rendering/MediaControlElements.cpp) (1 diff)
-
html/shadow/MediaControlElements.h (moved) (moved from trunk/Source/WebCore/rendering/MediaControlElements.h) (1 diff)
-
rendering/RenderingAllInOne.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/Android.mk
r83545 r83636 356 356 html/parser/XSSFilter.cpp \ 357 357 \ 358 html/shadow/MediaControlElements.cpp \ 358 359 html/shadow/MediaControlRootElement.cpp \ 359 360 html/shadow/MeterShadowElement.cpp \ … … 678 679 rendering/InlineTextBox.cpp \ 679 680 rendering/LayoutState.cpp \ 680 rendering/MediaControlElements.cpp \681 681 rendering/PointerEventsHitRules.cpp \ 682 682 rendering/RenderApplet.cpp \ -
trunk/Source/WebCore/CMakeLists.txt
r83596 r83636 1895 1895 html/HTMLSourceElement.cpp 1896 1896 html/HTMLVideoElement.cpp 1897 html/shadow/MediaControlElements.cpp 1897 1898 html/TimeRanges.cpp 1898 1899 platform/graphics/MediaPlayer.cpp 1899 rendering/MediaControlElements.cpp1900 1900 rendering/RenderMedia.cpp 1901 1901 rendering/RenderVideo.cpp -
trunk/Source/WebCore/ChangeLog
r83634 r83636 1 2011-04-12 Dimitri Glazkov <dglazkov@chromium.org> 2 3 Reviewed by Eric Seidel. 4 5 Move MediaControlElements to html/shadow. 6 https://bugs.webkit.org/show_bug.cgi?id=58347 7 8 Mechanical move of the files. 9 10 * Android.mk: Updated the build file. 11 * CMakeLists.txt: Ditto. 12 * GNUmakefile.list.am: Ditto. 13 * WebCore.gypi: Ditto. 14 * WebCore.pro: Ditto. 15 * WebCore.vcproj/WebCore.vcproj: Ditto. 16 * WebCore.xcodeproj/project.pbxproj: Ditto, also ran sort-XCode-project-files. 17 * html/shadow/MediaControlElements.cpp: Copied from Source/WebCore/rendering/MediaControlElements.cpp. 18 (WebCore::MediaControlFullscreenButtonElement::defaultEventHandler): 19 * html/shadow/MediaControlElements.h: Copied from Source/WebCore/rendering/MediaControlElements.h. 20 * rendering/MediaControlElements.cpp: Removed. 21 * rendering/MediaControlElements.h: Removed. 22 * rendering/RenderingAllInOne.cpp: Removed the files that were moved. 23 1 24 2011-04-12 Luiz Agostini <luiz.agostini@openbossa.org> 2 25 -
trunk/Source/WebCore/GNUmakefile.list.am
r83608 r83636 1841 1841 Source/WebCore/html/parser/XSSFilter.cpp \ 1842 1842 Source/WebCore/html/parser/XSSFilter.h \ 1843 Source/WebCore/html/shadow/MediaControlElements.cpp \ 1844 Source/WebCore/html/shadow/MediaControlElements.h \ 1843 1845 Source/WebCore/html/shadow/MediaControlRootElement.cpp \ 1844 1846 Source/WebCore/html/shadow/MediaControlRootElement.h \ … … 2724 2726 Source/WebCore/rendering/LayoutState.cpp \ 2725 2727 Source/WebCore/rendering/LayoutState.h \ 2726 Source/WebCore/rendering/MediaControlElements.cpp \2727 Source/WebCore/rendering/MediaControlElements.h \2728 2728 Source/WebCore/rendering/OverlapTestRequestClient.h \ 2729 2729 Source/WebCore/rendering/PaintInfo.h \ -
trunk/Source/WebCore/WebCore.gypi
r83596 r83636 3164 3164 'html/parser/XSSFilter.cpp', 3165 3165 'html/parser/XSSFilter.h', 3166 'html/shadow/MediaControlElements.cpp', 3167 'html/shadow/MediaControlElements.h', 3166 3168 'html/shadow/MediaControlRootElement.cpp', 3167 3169 'html/shadow/MediaControlRootElement.h', … … 5119 5121 'rendering/InlineTextBox.cpp', 5120 5122 'rendering/LayoutState.cpp', 5121 'rendering/MediaControlElements.cpp',5122 'rendering/MediaControlElements.h',5123 5123 'rendering/PointerEventsHitRules.cpp', 5124 5124 'rendering/PointerEventsHitRules.h', -
trunk/Source/WebCore/WebCore.pro
r83596 r83636 2933 2933 html/HTMLSourceElement.cpp \ 2934 2934 html/HTMLVideoElement.cpp \ 2935 html/shadow/MediaControlElements.cpp \ 2935 2936 html/TimeRanges.cpp \ 2936 2937 platform/graphics/MediaPlayer.cpp \ 2937 rendering/MediaControlElements.cpp \2938 2938 rendering/RenderVideo.cpp \ 2939 2939 rendering/RenderMedia.cpp -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r83596 r83636 32923 32923 </File> 32924 32924 <File 32925 RelativePath="..\rendering\MediaControlElements.cpp"32926 >32927 <FileConfiguration32928 Name="Debug|Win32"32929 ExcludedFromBuild="true"32930 >32931 <Tool32932 Name="VCCLCompilerTool"32933 />32934 </FileConfiguration>32935 <FileConfiguration32936 Name="Release|Win32"32937 ExcludedFromBuild="true"32938 >32939 <Tool32940 Name="VCCLCompilerTool"32941 />32942 </FileConfiguration>32943 <FileConfiguration32944 Name="Debug_Cairo_CFLite|Win32"32945 ExcludedFromBuild="true"32946 >32947 <Tool32948 Name="VCCLCompilerTool"32949 />32950 </FileConfiguration>32951 <FileConfiguration32952 Name="Release_Cairo_CFLite|Win32"32953 ExcludedFromBuild="true"32954 >32955 <Tool32956 Name="VCCLCompilerTool"32957 />32958 </FileConfiguration>32959 <FileConfiguration32960 Name="Debug_All|Win32"32961 ExcludedFromBuild="true"32962 >32963 <Tool32964 Name="VCCLCompilerTool"32965 />32966 </FileConfiguration>32967 <FileConfiguration32968 Name="Production|Win32"32969 ExcludedFromBuild="true"32970 >32971 <Tool32972 Name="VCCLCompilerTool"32973 />32974 </FileConfiguration>32975 </File>32976 <File32977 RelativePath="..\rendering\MediaControlElements.h"32978 >32979 </File>32980 <File32981 32925 RelativePath="..\rendering\PaintInfo.h" 32982 32926 > … … 56629 56573 Name="shadow" 56630 56574 > 56575 <File 56576 RelativePath="..\html\shadow\MediaControlElements.cpp" 56577 > 56578 </File> 56579 <File 56580 RelativePath="..\html\shadow\MediaControlElements.h" 56581 > 56582 </File> 56631 56583 <File 56632 56584 RelativePath="..\html\shadow\MediaControlRootElement.cpp" -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r83596 r83636 904 904 416E75CB0EDF90C700360E1D /* ScriptCallFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 416E75C90EDF90C700360E1D /* ScriptCallFrame.h */; }; 905 905 416E75CC0EDF90C700360E1D /* ScriptCallFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 416E75CA0EDF90C700360E1D /* ScriptCallFrame.cpp */; }; 906 417253AA1354BBBC00360F2A /* MediaControlElements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 417253A81354BBBC00360F2A /* MediaControlElements.cpp */; }; 907 417253AB1354BBBC00360F2A /* MediaControlElements.h in Headers */ = {isa = PBXBuildFile; fileRef = 417253A91354BBBC00360F2A /* MediaControlElements.h */; }; 906 908 41885B9311B6FDA6003383BB /* FormSubmission.h in Headers */ = {isa = PBXBuildFile; fileRef = 41885B9111B6FDA6003383BB /* FormSubmission.h */; settings = {ATTRIBUTES = (Private, ); }; }; 907 909 41885B9411B6FDA6003383BB /* FormSubmission.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41885B9211B6FDA6003383BB /* FormSubmission.cpp */; }; … … 4093 4095 ABDDFE790A5C6E7000A3E11D /* RenderMenuList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABDDFE730A5C6E6F00A3E11D /* RenderMenuList.cpp */; }; 4094 4096 ABDDFE7A0A5C6E7000A3E11D /* RenderMenuList.h in Headers */ = {isa = PBXBuildFile; fileRef = ABDDFE740A5C6E7000A3E11D /* RenderMenuList.h */; }; 4095 ABFE7E120D32FAF60066F4D2 /* MediaControlElements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE7E100D32FAF50066F4D2 /* MediaControlElements.cpp */; };4096 ABFE7E130D32FAF60066F4D2 /* MediaControlElements.h in Headers */ = {isa = PBXBuildFile; fileRef = ABFE7E110D32FAF50066F4D2 /* MediaControlElements.h */; };4097 4097 ADDF1AD71257CD9A0003A759 /* RenderSVGPath.h in Headers */ = {isa = PBXBuildFile; fileRef = ADDF1AD51257CD9A0003A759 /* RenderSVGPath.h */; }; 4098 4098 B0149E7D11A4B21500196A7B /* AsyncImageResizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B0149E7911A4B21500196A7B /* AsyncImageResizer.cpp */; }; … … 7375 7375 416E75C90EDF90C700360E1D /* ScriptCallFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptCallFrame.h; sourceTree = "<group>"; }; 7376 7376 416E75CA0EDF90C700360E1D /* ScriptCallFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptCallFrame.cpp; sourceTree = "<group>"; }; 7377 417253A81354BBBC00360F2A /* MediaControlElements.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaControlElements.cpp; sourceTree = "<group>"; }; 7378 417253A91354BBBC00360F2A /* MediaControlElements.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaControlElements.h; sourceTree = "<group>"; }; 7377 7379 41885B9111B6FDA6003383BB /* FormSubmission.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormSubmission.h; sourceTree = "<group>"; }; 7378 7380 41885B9211B6FDA6003383BB /* FormSubmission.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormSubmission.cpp; sourceTree = "<group>"; }; … … 10382 10384 ABDDFE730A5C6E6F00A3E11D /* RenderMenuList.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderMenuList.cpp; sourceTree = "<group>"; }; 10383 10385 ABDDFE740A5C6E7000A3E11D /* RenderMenuList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderMenuList.h; sourceTree = "<group>"; }; 10384 ABFE7E100D32FAF50066F4D2 /* MediaControlElements.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaControlElements.cpp; sourceTree = "<group>"; };10385 ABFE7E110D32FAF50066F4D2 /* MediaControlElements.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaControlElements.h; sourceTree = "<group>"; };10386 10386 ADDF1AD41257CD9A0003A759 /* RenderSVGPath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGPath.cpp; sourceTree = "<group>"; }; 10387 10387 ADDF1AD51257CD9A0003A759 /* RenderSVGPath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGPath.h; sourceTree = "<group>"; }; … … 13469 13469 isa = PBXGroup; 13470 13470 children = ( 13471 417253A81354BBBC00360F2A /* MediaControlElements.cpp */, 13472 417253A91354BBBC00360F2A /* MediaControlElements.h */, 13471 13473 4157AF7F12F1FB0400A8C6F5 /* MediaControlRootElement.cpp */, 13472 13474 4157AF7E12F1FB0400A8C6F5 /* MediaControlRootElement.h */, … … 19059 19061 2D9066040BE141D400956998 /* LayoutState.cpp */, 19060 19062 2D9066050BE141D400956998 /* LayoutState.h */, 19061 ABFE7E100D32FAF50066F4D2 /* MediaControlElements.cpp */,19062 ABFE7E110D32FAF50066F4D2 /* MediaControlElements.h */,19063 19063 3774ABA30FA21EB400AD7DE9 /* OverlapTestRequestClient.h */, 19064 19064 0885067D11DA045B00182B98 /* PaintInfo.h */, … … 21613 21613 BCD9C2C10C17B69E005C90A2 /* JSNamedNodeMap.h in Headers */, 21614 21614 A9D247F80D757E3400FDF959 /* JSNavigator.h in Headers */, 21615 B1E545E013462B0B0092A545 /* JSNavigatorUserMediaError.h in Headers */, 21616 B1E545E213462B0B0092A545 /* JSNavigatorUserMediaErrorCallback.h in Headers */, 21617 B1E545E413462B0B0092A545 /* JSNavigatorUserMediaSuccessCallback.h in Headers */, 21615 21618 BC9439C3116CF4940048C750 /* JSNodeCustom.h in Headers */, 21616 21619 14115B7309F84CD600CA4FC1 /* JSNodeFilter.h in Headers */, … … 21900 21903 49E911C70EF86D47009D0CAF /* MatrixTransformOperation.h in Headers */, 21901 21904 931BCC611124DFCB00BE70DD /* MediaCanStartListener.h in Headers */, 21902 ABFE7E130D32FAF60066F4D2/* MediaControlElements.h in Headers */,21905 417253AB1354BBBC00360F2A /* MediaControlElements.h in Headers */, 21903 21906 4157AF8012F1FB0400A8C6F5 /* MediaControlRootElement.h in Headers */, 21904 21907 97205AB81239291000B17380 /* MediaDocument.h in Headers */, … … 21942 21945 A9C6E5A60D746458006442E9 /* Navigator.h in Headers */, 21943 21946 E12719C70EEEC16800F61213 /* NavigatorBase.h in Headers */, 21947 B1E54599134629C10092A545 /* NavigatorUserMediaError.h in Headers */, 21948 B1E5459B134629C10092A545 /* NavigatorUserMediaErrorCallback.h in Headers */, 21949 B1E5459D134629C10092A545 /* NavigatorUserMediaSuccessCallback.h in Headers */, 21944 21950 8A309C9F123950BE00CB9204 /* NestingLevelIncrementer.h in Headers */, 21945 21951 656D37430ADBA5DE00A4554D /* NetscapePlugInStreamLoader.h in Headers */, … … 22882 22888 E1BE512E0CF6C512002EA959 /* XSLTUnicodeSort.h in Headers */, 22883 22889 977E2E0F12F0FC9C00C13379 /* XSSFilter.h in Headers */, 22884 B1E54599134629C10092A545 /* NavigatorUserMediaError.h in Headers */,22885 B1E5459B134629C10092A545 /* NavigatorUserMediaErrorCallback.h in Headers */,22886 B1E5459D134629C10092A545 /* NavigatorUserMediaSuccessCallback.h in Headers */,22887 B1E545E013462B0B0092A545 /* JSNavigatorUserMediaError.h in Headers */,22888 B1E545E213462B0B0092A545 /* JSNavigatorUserMediaErrorCallback.h in Headers */,22889 B1E545E413462B0B0092A545 /* JSNavigatorUserMediaSuccessCallback.h in Headers */,22890 22890 ); 22891 22891 runOnlyForDeploymentPostprocessing = 0; … … 24488 24488 A9D247F70D757E3400FDF959 /* JSNavigator.cpp in Sources */, 24489 24489 A9C6E6490D7465D8006442E9 /* JSNavigatorCustom.cpp in Sources */, 24490 B1E545DF13462B0B0092A545 /* JSNavigatorUserMediaError.cpp in Sources */, 24491 B1E545E113462B0B0092A545 /* JSNavigatorUserMediaErrorCallback.cpp in Sources */, 24492 B1E545E313462B0B0092A545 /* JSNavigatorUserMediaSuccessCallback.cpp in Sources */, 24490 24493 14DC0D3709FED073007B0235 /* JSNode.cpp in Sources */, 24491 24494 BCD9C2640C17AA67005C90A2 /* JSNodeCustom.cpp in Sources */, … … 24808 24811 49D5DC2B0F423A73008F20FD /* Matrix3DTransformOperation.cpp in Sources */, 24809 24812 49E911C60EF86D47009D0CAF /* MatrixTransformOperation.cpp in Sources */, 24810 ABFE7E120D32FAF60066F4D2/* MediaControlElements.cpp in Sources */,24813 417253AA1354BBBC00360F2A /* MediaControlElements.cpp in Sources */, 24811 24814 4157AF8112F1FB0400A8C6F5 /* MediaControlRootElement.cpp in Sources */, 24812 24815 97205AB71239291000B17380 /* MediaDocument.cpp in Sources */, … … 25582 25585 E1BE512D0CF6C512002EA959 /* XSLTUnicodeSort.cpp in Sources */, 25583 25586 977E2E0E12F0FC9C00C13379 /* XSSFilter.cpp in Sources */, 25584 B1E545DF13462B0B0092A545 /* JSNavigatorUserMediaError.cpp in Sources */,25585 B1E545E113462B0B0092A545 /* JSNavigatorUserMediaErrorCallback.cpp in Sources */,25586 B1E545E313462B0B0092A545 /* JSNavigatorUserMediaSuccessCallback.cpp in Sources */,25587 25587 ); 25588 25588 runOnlyForDeploymentPostprocessing = 0; -
trunk/Source/WebCore/html/shadow/MediaControlElements.cpp
r83593 r83636 789 789 #if ENABLE(FULLSCREEN_API) 790 790 // Only use the new full screen API if the fullScreenEnabled setting has 791 // been explicitly enabled. Otherwise, use the old fullscreen API.This791 // been explicitly enabled. Otherwise, use the old fullscreen API. This 792 792 // allows apps which embed a WebView to retain the existing full screen 793 793 // video implementation without requiring them to implement their own full -
trunk/Source/WebCore/html/shadow/MediaControlElements.h
r83593 r83636 456 456 // ---------------------------- 457 457 458 } // namespace WebCore458 } // namespace WebCore 459 459 460 460 #endif // ENABLE(VIDEO) -
trunk/Source/WebCore/rendering/RenderingAllInOne.cpp
r83596 r83636 36 36 #include "InlineTextBox.cpp" 37 37 #include "LayoutState.cpp" 38 #include "MediaControlElements.cpp"39 38 #include "PointerEventsHitRules.cpp" 40 39 #include "RenderApplet.cpp"
Note: See TracChangeset
for help on using the changeset viewer.
