Title: [161742] trunk/Source/WebCore
- Revision
- 161742
- Author
- [email protected]
- Date
- 2014-01-10 22:08:50 -0800 (Fri, 10 Jan 2014)
Log Message
Fix MediaPlayerPrivateMediaSourceAVFObjC.o for iOS. Unreviewed build fix.
Import CALayer, which Mac must have been getting some other way.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161741 => 161742)
--- trunk/Source/WebCore/ChangeLog 2014-01-11 06:02:00 UTC (rev 161741)
+++ trunk/Source/WebCore/ChangeLog 2014-01-11 06:08:50 UTC (rev 161742)
@@ -1,5 +1,13 @@
2014-01-10 Joseph Pecoraro <[email protected]>
+ Fix MediaPlayerPrivateMediaSourceAVFObjC.o for iOS. Unreviewed build fix.
+
+ Import CALayer, which Mac must have been getting some other way.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+
+2014-01-10 Joseph Pecoraro <[email protected]>
+
Fix TileGrid.o for iOS. Unreviewed build fix.
Explicitly use namespace std in std::pair.
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (161741 => 161742)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2014-01-11 06:02:00 UTC (rev 161741)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2014-01-11 06:08:50 UTC (rev 161742)
@@ -20,7 +20,7 @@
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#import "config.h"
@@ -35,10 +35,11 @@
#import "SoftLinking.h"
#import <AVFoundation/AVAsset.h>
#import <CoreMedia/CMSync.h>
+#import <QuartzCore/CALayer.h>
#import <objc_runtime.h>
-#import <wtf/NeverDestroyed.h>
#import <wtf/Functional.h>
#import <wtf/MainThread.h>
+#import <wtf/NeverDestroyed.h>
#pragma mark -
#pragma mark Soft Linking
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes