Some AVFoundation source files should be in platform-specific directories
authorjeffm@apple.com <jeffm@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 17 Aug 2011 17:57:00 +0000 (17:57 +0000)
committerjeffm@apple.com <jeffm@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 17 Aug 2011 17:57:00 +0000 (17:57 +0000)
https://bugs.webkit.org/show_bug.cgi?id=66352

Moved platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.* files to platform/graphics/avfoundation/cf,
and moved platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.* files to platform/graphics/avfoundation/objc/.

While I was at it, added svn:eol-style property to the MediaPlayerPrivateAVFoundationObjC.* files.

Also, for some reason, Visual Studio decided to re-sort a couple files in \inspector\front-end\ in WebCore.vcproj, even though
I just re-sorted the project in r93215.

Reviewed by Eric Carlson.

No new tests; no functional change.

* WebCore.vcproj/WebCore.vcproj: Moved platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.* files to platform/graphics/avfoundation/cf.

* WebCore.vcproj/WebCoreMediaQT.vsprops: Added $(ProjectDir)..\platform\graphics\avfoundation\cf to include paths.

* WebCore.xcodeproj/project.pbxproj: Moved platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.* files to platform/graphics/avfoundation/objc/.

* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.cpp: Removed.
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.h: Removed.
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.h: Removed.
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm: Removed.

* platform/graphics/avfoundation/cf: Added.
* platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp: Copied from Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.cpp.
* platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h: Copied from Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.h.

* platform/graphics/avfoundation/objc: Added.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h: Copied from Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.h.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm: Copied from Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@93219 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/WebCore.vcproj/WebCore.vcproj
Source/WebCore/WebCore.vcproj/WebCoreMediaQT.vsprops
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp [moved from Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.cpp with 100% similarity]
Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h [moved from Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.h with 100% similarity]
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h [moved from Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.h with 100% similarity]
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm [moved from Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm with 100% similarity]

index 90032ec..1fbed3a 100644 (file)
@@ -1,3 +1,39 @@
+2011-08-17  Jeff Miller  <jeffm@apple.com>
+
+        Some AVFoundation source files should be in platform-specific directories
+        https://bugs.webkit.org/show_bug.cgi?id=66352
+        
+        Moved platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.* files to platform/graphics/avfoundation/cf,
+        and moved platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.* files to platform/graphics/avfoundation/objc/.
+        
+        While I was at it, added svn:eol-style property to the MediaPlayerPrivateAVFoundationObjC.* files.
+        
+        Also, for some reason, Visual Studio decided to re-sort a couple files in \inspector\front-end\ in WebCore.vcproj, even though
+        I just re-sorted the project in r93215.
+
+        Reviewed by Eric Carlson.
+
+        No new tests; no functional change.
+
+        * WebCore.vcproj/WebCore.vcproj: Moved platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.* files to platform/graphics/avfoundation/cf.
+
+        * WebCore.vcproj/WebCoreMediaQT.vsprops: Added $(ProjectDir)..\platform\graphics\avfoundation\cf to include paths.
+
+        * WebCore.xcodeproj/project.pbxproj: Moved platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.* files to platform/graphics/avfoundation/objc/.
+
+        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.cpp: Removed.
+        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.h: Removed.
+        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.h: Removed.
+        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm: Removed.
+
+        * platform/graphics/avfoundation/cf: Added.
+        * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp: Copied from Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.cpp.
+        * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h: Copied from Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.h.
+
+        * platform/graphics/avfoundation/objc: Added.
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h: Copied from Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.h.
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm: Copied from Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm.
+
 2011-08-17  Luke Macpherson   <macpherson@chromium.org>
 
         Only set m_fontDirty if TextSizeAdjust is actually changed.
index fca0ebd..0632814 100755 (executable)
                                                RelativePath="..\platform\graphics\avfoundation\MediaPlayerPrivateAVFoundation.h"
                                                >
                                        </File>
-                                       <File
-                                               RelativePath="..\platform\graphics\avfoundation\MediaPlayerPrivateAVFoundationCF.cpp"
-                                               >
-                                       </File>
-                                       <File
-                                               RelativePath="..\platform\graphics\avfoundation\MediaPlayerPrivateAVFoundationCF.h"
+                                       <Filter
+                                               Name="cf"
                                                >
-                                       </File>
+                                               <File
+                                                       RelativePath="..\platform\graphics\avfoundation\cf\MediaPlayerPrivateAVFoundationCF.cpp"
+                                                       >
+                                               </File>
+                                               <File
+                                                       RelativePath="..\platform\graphics\avfoundation\cf\MediaPlayerPrivateAVFoundationCF.h"
+                                                       >
+                                               </File>
+                                       </Filter>
                                </Filter>
                        </Filter>
                        <Filter
                                        >
                                </File>
                                <File
-                                       RelativePath="..\inspector\front-end\UglifyJS\JavaScriptFormatter.js"
+                                       RelativePath="..\inspector\front-end\JavaScriptFormatter.js"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\inspector\front-end\JavaScriptFormatter.js"
+                                       RelativePath="..\inspector\front-end\UglifyJS\JavaScriptFormatter.js"
                                        >
                                </File>
                                <File
index 04371c5..44ab030 100644 (file)
@@ -6,7 +6,7 @@
        >
        <Tool
                Name="VCCLCompilerTool"
-               AdditionalIncludeDirectories="&quot;$(WebKitLibrariesDir)\include\CoreAudio&quot;;&quot;$(WebKitLibrariesDir)\include\AVFoundation&quot;;&quot;$(ProjectDir)..\platform\graphics\avfoundation&quot;"
+               AdditionalIncludeDirectories="&quot;$(WebKitLibrariesDir)\include\CoreAudio&quot;;&quot;$(WebKitLibrariesDir)\include\AVFoundation&quot;;&quot;$(ProjectDir)..\platform\graphics\avfoundation&quot;;&quot;$(ProjectDir)..\platform\graphics\avfoundation\cf&quot;"
        />
        <Tool
                Name="VCLinkerTool"
index 8b83be5..83957cd 100644 (file)
                06E81EEC0AB5DA9700C87837 /* LocalCurrentGraphicsContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = 06E81EEB0AB5DA9700C87837 /* LocalCurrentGraphicsContext.mm */; };
                0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */ = {isa = PBXBuildFile; fileRef = 0709FC4D1025DEE30059CDBA /* AccessibilitySlider.h */; };
                072C8B11131C518600A4FCE9 /* MediaPlayerPrivateAVFoundation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 076F0D0912B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.cpp */; };
-               072C8B12131C518B00A4FCE9 /* MediaPlayerPrivateAVFoundationObjC.mm in Sources */ = {isa = PBXBuildFile; fileRef = 076F0D0C12B8192700C26AA4 /* MediaPlayerPrivateAVFoundationObjC.mm */; };
                0735EE6A0F40C5E4004A2604 /* MediaPlayerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 0735EE690F40C5E4004A2604 /* MediaPlayerProxy.h */; settings = {ATTRIBUTES = (Private, ); }; };
                076F0D0E12B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = 076F0D0A12B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.h */; };
-               076F0D0F12B8192700C26AA4 /* MediaPlayerPrivateAVFoundationObjC.h in Headers */ = {isa = PBXBuildFile; fileRef = 076F0D0B12B8192700C26AA4 /* MediaPlayerPrivateAVFoundationObjC.h */; };
                07B0113F1032242200FBDC33 /* AccessibilityMediaControls.h in Headers */ = {isa = PBXBuildFile; fileRef = 07B0113E1032242200FBDC33 /* AccessibilityMediaControls.h */; };
                0806E57A12893045007CED32 /* SVGMatrix.h in Headers */ = {isa = PBXBuildFile; fileRef = 0806E57912893045007CED32 /* SVGMatrix.h */; settings = {ATTRIBUTES = (Private, ); }; };
                080E49261255F3BD00EFCA27 /* SVGTextLayoutEngineBaseline.h in Headers */ = {isa = PBXBuildFile; fileRef = 080E49221255F3BD00EFCA27 /* SVGTextLayoutEngineBaseline.h */; };
                DD763BB20992C2C900740B8E /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DD763BB10992C2C900740B8E /* libxml2.dylib */; };
                DD7CDF250A23CF9800069928 /* CSSUnknownRule.h in Headers */ = {isa = PBXBuildFile; fileRef = A80E6CCE0A1989CA007FB8C5 /* CSSUnknownRule.h */; };
                DDE63ED50B7D45A800226998 /* DOMTextEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 933A14750B7D1BAF00A53FFD /* DOMTextEvent.h */; };
+               DF9AFD7213FC31D80015FEB7 /* MediaPlayerPrivateAVFoundationObjC.h in Headers */ = {isa = PBXBuildFile; fileRef = DF9AFD7013FC31D80015FEB7 /* MediaPlayerPrivateAVFoundationObjC.h */; };
+               DF9AFD7313FC31D80015FEB7 /* MediaPlayerPrivateAVFoundationObjC.mm in Sources */ = {isa = PBXBuildFile; fileRef = DF9AFD7113FC31D80015FEB7 /* MediaPlayerPrivateAVFoundationObjC.mm */; };
                E0FEF372B17C53EAC1C1FBEE /* EventSource.h in Headers */ = {isa = PBXBuildFile; fileRef = E0FEF371B17C53EAC1C1FBEE /* EventSource.h */; };
                E0FEF372B27C53EAC1C1FBEE /* EventSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */; };
                E0FEF372B37C53EAC1C1FBEE /* JSEventSource.h in Headers */ = {isa = PBXBuildFile; fileRef = E0FEF371B37C53EAC1C1FBEE /* JSEventSource.h */; };
                0735EE690F40C5E4004A2604 /* MediaPlayerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlayerProxy.h; sourceTree = "<group>"; };
                076F0D0912B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaPlayerPrivateAVFoundation.cpp; sourceTree = "<group>"; };
                076F0D0A12B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlayerPrivateAVFoundation.h; sourceTree = "<group>"; };
-               076F0D0B12B8192700C26AA4 /* MediaPlayerPrivateAVFoundationObjC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlayerPrivateAVFoundationObjC.h; sourceTree = "<group>"; };
-               076F0D0C12B8192700C26AA4 /* MediaPlayerPrivateAVFoundationObjC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MediaPlayerPrivateAVFoundationObjC.mm; sourceTree = "<group>"; };
                079F5E4B0F3BEBEA005E0782 /* MediaPlayerPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlayerPrivate.h; sourceTree = "<group>"; };
                07AFE5900F1446BD00841617 /* mediaControlsQuickTime.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = mediaControlsQuickTime.css; sourceTree = "<group>"; };
                07B0113E1032242200FBDC33 /* AccessibilityMediaControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityMediaControls.h; sourceTree = "<group>"; };
                DB23C2CA0A508D29002489EB /* IndentOutdentCommand.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = IndentOutdentCommand.h; sourceTree = "<group>"; };
                DD05FE0B0B8BA3C6009ACDFE /* WebCoreObjCExtras.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCoreObjCExtras.h; sourceTree = "<group>"; };
                DD763BB10992C2C900740B8E /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = /usr/lib/libxml2.dylib; sourceTree = "<absolute>"; };
+               DF9AFD7013FC31D80015FEB7 /* MediaPlayerPrivateAVFoundationObjC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MediaPlayerPrivateAVFoundationObjC.h; path = objc/MediaPlayerPrivateAVFoundationObjC.h; sourceTree = "<group>"; };
+               DF9AFD7113FC31D80015FEB7 /* MediaPlayerPrivateAVFoundationObjC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MediaPlayerPrivateAVFoundationObjC.mm; path = objc/MediaPlayerPrivateAVFoundationObjC.mm; sourceTree = "<group>"; };
                E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = EventSource.idl; sourceTree = "<group>"; };
                E0FEF371B17C53EAC1C1FBEE /* EventSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventSource.h; sourceTree = "<group>"; };
                E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventSource.cpp; sourceTree = "<group>"; };
                076F0D0812B8192700C26AA4 /* avfoundation */ = {
                        isa = PBXGroup;
                        children = (
+                               DF9AFD6F13FC31B00015FEB7 /* objc */,
                                076F0D0912B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.cpp */,
                                076F0D0A12B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.h */,
-                               076F0D0B12B8192700C26AA4 /* MediaPlayerPrivateAVFoundationObjC.h */,
-                               076F0D0C12B8192700C26AA4 /* MediaPlayerPrivateAVFoundationObjC.mm */,
                        );
                        path = avfoundation;
                        sourceTree = "<group>";
                        tabWidth = 4;
                        usesTabs = 0;
                };
+               DF9AFD6F13FC31B00015FEB7 /* objc */ = {
+                       isa = PBXGroup;
+                       children = (
+                               DF9AFD7013FC31D80015FEB7 /* MediaPlayerPrivateAVFoundationObjC.h */,
+                               DF9AFD7113FC31D80015FEB7 /* MediaPlayerPrivateAVFoundationObjC.mm */,
+                       );
+                       name = objc;
+                       sourceTree = "<group>";
+               };
                E1C8BE4B0E8BD0D10064CB7D /* Threads */ = {
                        isa = PBXGroup;
                        children = (
                                A8EA800E0A19516E00A8EF5F /* MediaList.h in Headers */,
                                E44613E40CD681A200FADA75 /* MediaPlayer.h in Headers */,
                                076F0D0E12B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.h in Headers */,
-                               076F0D0F12B8192700C26AA4 /* MediaPlayerPrivateAVFoundationObjC.h in Headers */,
                                E44613E60CD681A900FADA75 /* MediaPlayerPrivateQTKit.h in Headers */,
                                0735EE6A0F40C5E4004A2604 /* MediaPlayerProxy.h in Headers */,
                                4E19592A0A39DACC00220FE5 /* MediaQuery.h in Headers */,
                                BCBB8ABB13F1AFB000734DF0 /* PODRedBlackTree.h in Headers */,
                                FD6F252D13F5EF0E0065165F /* MediaElementAudioSourceNode.h in Headers */,
                                FD23A12613F5FA5900F67001 /* JSMediaElementAudioSourceNode.h in Headers */,
+                               DF9AFD7213FC31D80015FEB7 /* MediaPlayerPrivateAVFoundationObjC.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                A8EA80090A19516E00A8EF5F /* MediaList.cpp in Sources */,
                                E44613E30CD6819F00FADA75 /* MediaPlayer.cpp in Sources */,
                                072C8B11131C518600A4FCE9 /* MediaPlayerPrivateAVFoundation.cpp in Sources */,
-                               072C8B12131C518B00A4FCE9 /* MediaPlayerPrivateAVFoundationObjC.mm in Sources */,
                                E44613E50CD681A600FADA75 /* MediaPlayerPrivateQTKit.mm in Sources */,
                                4E1959290A39DACC00220FE5 /* MediaQuery.cpp in Sources */,
                                4E19592B0A39DACC00220FE5 /* MediaQueryEvaluator.cpp in Sources */,
                                FD6F252C13F5EF0E0065165F /* MediaElementAudioSourceNode.cpp in Sources */,
                                FD23A12513F5FA5900F67001 /* JSMediaElementAudioSourceNode.cpp in Sources */,
                                1A1414B513A0F0500019996C /* WebKitFontFamilyNames.cpp in Sources */,
+                               DF9AFD7313FC31D80015FEB7 /* MediaPlayerPrivateAVFoundationObjC.mm in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };