2009-06-15 Anders Carlsson <andersca@apple.com>
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 15 Jun 2009 18:39:36 +0000 (18:39 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 15 Jun 2009 18:39:36 +0000 (18:39 +0000)
        Reviewed by Kevin Decker.

        Add Core Animation movie plug-in example.

        * NetscapeCoreAnimationMoviePlugin: Added.
        * NetscapeCoreAnimationMoviePlugin/English.lproj: Added.
        * NetscapeCoreAnimationMoviePlugin/English.lproj/InfoPlist.strings: Added.
        * NetscapeCoreAnimationMoviePlugin/Info.plist: Added.
        * NetscapeCoreAnimationMoviePlugin/MovieControllerLayer.h: Added.
        * NetscapeCoreAnimationMoviePlugin/MovieControllerLayer.m: Added.
        (createImageNamed):
        (-[MovieControllerLayer init]):
        (-[MovieControllerLayer dealloc]):
        (-[MovieControllerLayer _playPauseButtonRect]):
        (-[MovieControllerLayer _sliderRect]):
        (-[MovieControllerLayer _sliderThumbRect]):
        (-[MovieControllerLayer _innerSliderRect]):
        (-[MovieControllerLayer _drawPlayPauseButtonInContext:]):
        (-[MovieControllerLayer _drawSliderInContext:]):
        (-[MovieControllerLayer drawInContext:]):
        (-[MovieControllerLayer _currentTime]):
        (-[MovieControllerLayer _duration]):
        (-[MovieControllerLayer _isPlaying]):
        (-[MovieControllerLayer _updateTime:]):
        (-[MovieControllerLayer _rateDidChange:]):
        (-[MovieControllerLayer _timeDidChange:]):
        (-[MovieControllerLayer actionForKey:]):
        (-[MovieControllerLayer setMovie:]):
        (-[MovieControllerLayer _setNewTimeForThumbCenterX:]):
        (-[MovieControllerLayer handleMouseDown:]):
        (-[MovieControllerLayer handleMouseUp:]):
        (-[MovieControllerLayer handleMouseDragged:]):
        * NetscapeCoreAnimationMoviePlugin/NetscapeCoreAnimationMoviePlugin.xcodeproj: Added.
        * NetscapeCoreAnimationMoviePlugin/NetscapeCoreAnimationMoviePlugin.xcodeproj/project.pbxproj: Added.
        * NetscapeCoreAnimationMoviePlugin/Pause.tiff: Added.
        * NetscapeCoreAnimationMoviePlugin/Play.tiff: Added.
        * NetscapeCoreAnimationMoviePlugin/SliderTrackCenter.tiff: Added.
        * NetscapeCoreAnimationMoviePlugin/SliderTrackLeft.tiff: Added.
        * NetscapeCoreAnimationMoviePlugin/SliderTrackRight.tiff: Added.
        * NetscapeCoreAnimationMoviePlugin/Thumb.tiff: Added.
        * NetscapeCoreAnimationMoviePlugin/main.m: Added.
        (NP_Initialize):
        (NP_GetEntryPoints):
        (NP_Shutdown):
        (NPP_New):
        (NPP_Destroy):
        (NPP_SetWindow):
        (NPP_NewStream):
        (NPP_DestroyStream):
        (NPP_WriteReady):
        (NPP_Write):
        (NPP_StreamAsFile):
        (NPP_Print):
        (handleMouseDown):
        (togglePlayPause):
        (handleMouseUp):
        (handleMouseDragged):
        (handleMouseEntered):
        (handleMouseExited):
        (handleKeyDown):
        (handleScrollEvent):
        (NPP_HandleEvent):
        (NPP_URLNotify):
        (NPP_GetValue):
        (NPP_SetValue):
        * NetscapeCoreAnimationMoviePlugin/test.html: Added.

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

14 files changed:
WebKitExamplePlugins/ChangeLog
WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/English.lproj/InfoPlist.strings [new file with mode: 0644]
WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/Info.plist [new file with mode: 0644]
WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/MovieControllerLayer.h [new file with mode: 0644]
WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/MovieControllerLayer.m [new file with mode: 0644]
WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/NetscapeCoreAnimationMoviePlugin.xcodeproj/project.pbxproj [new file with mode: 0644]
WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/Pause.tiff [new file with mode: 0644]
WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/Play.tiff [new file with mode: 0644]
WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/SliderTrackCenter.tiff [new file with mode: 0644]
WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/SliderTrackLeft.tiff [new file with mode: 0644]
WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/SliderTrackRight.tiff [new file with mode: 0644]
WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/Thumb.tiff [new file with mode: 0644]
WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/main.m [new file with mode: 0644]
WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/test.html [new file with mode: 0755]

index 71fe8a0..85d53d6 100644 (file)
@@ -1,3 +1,72 @@
+2009-06-15  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Kevin Decker.
+
+        Add Core Animation movie plug-in example.
+        
+        * NetscapeCoreAnimationMoviePlugin: Added.
+        * NetscapeCoreAnimationMoviePlugin/English.lproj: Added.
+        * NetscapeCoreAnimationMoviePlugin/English.lproj/InfoPlist.strings: Added.
+        * NetscapeCoreAnimationMoviePlugin/Info.plist: Added.
+        * NetscapeCoreAnimationMoviePlugin/MovieControllerLayer.h: Added.
+        * NetscapeCoreAnimationMoviePlugin/MovieControllerLayer.m: Added.
+        (createImageNamed):
+        (-[MovieControllerLayer init]):
+        (-[MovieControllerLayer dealloc]):
+        (-[MovieControllerLayer _playPauseButtonRect]):
+        (-[MovieControllerLayer _sliderRect]):
+        (-[MovieControllerLayer _sliderThumbRect]):
+        (-[MovieControllerLayer _innerSliderRect]):
+        (-[MovieControllerLayer _drawPlayPauseButtonInContext:]):
+        (-[MovieControllerLayer _drawSliderInContext:]):
+        (-[MovieControllerLayer drawInContext:]):
+        (-[MovieControllerLayer _currentTime]):
+        (-[MovieControllerLayer _duration]):
+        (-[MovieControllerLayer _isPlaying]):
+        (-[MovieControllerLayer _updateTime:]):
+        (-[MovieControllerLayer _rateDidChange:]):
+        (-[MovieControllerLayer _timeDidChange:]):
+        (-[MovieControllerLayer actionForKey:]):
+        (-[MovieControllerLayer setMovie:]):
+        (-[MovieControllerLayer _setNewTimeForThumbCenterX:]):
+        (-[MovieControllerLayer handleMouseDown:]):
+        (-[MovieControllerLayer handleMouseUp:]):
+        (-[MovieControllerLayer handleMouseDragged:]):
+        * NetscapeCoreAnimationMoviePlugin/NetscapeCoreAnimationMoviePlugin.xcodeproj: Added.
+        * NetscapeCoreAnimationMoviePlugin/NetscapeCoreAnimationMoviePlugin.xcodeproj/project.pbxproj: Added.
+        * NetscapeCoreAnimationMoviePlugin/Pause.tiff: Added.
+        * NetscapeCoreAnimationMoviePlugin/Play.tiff: Added.
+        * NetscapeCoreAnimationMoviePlugin/SliderTrackCenter.tiff: Added.
+        * NetscapeCoreAnimationMoviePlugin/SliderTrackLeft.tiff: Added.
+        * NetscapeCoreAnimationMoviePlugin/SliderTrackRight.tiff: Added.
+        * NetscapeCoreAnimationMoviePlugin/Thumb.tiff: Added.
+        * NetscapeCoreAnimationMoviePlugin/main.m: Added.
+        (NP_Initialize):
+        (NP_GetEntryPoints):
+        (NP_Shutdown):
+        (NPP_New):
+        (NPP_Destroy):
+        (NPP_SetWindow):
+        (NPP_NewStream):
+        (NPP_DestroyStream):
+        (NPP_WriteReady):
+        (NPP_Write):
+        (NPP_StreamAsFile):
+        (NPP_Print):
+        (handleMouseDown):
+        (togglePlayPause):
+        (handleMouseUp):
+        (handleMouseDragged):
+        (handleMouseEntered):
+        (handleMouseExited):
+        (handleKeyDown):
+        (handleScrollEvent):
+        (NPP_HandleEvent):
+        (NPP_URLNotify):
+        (NPP_GetValue):
+        (NPP_SetValue):
+        * NetscapeCoreAnimationMoviePlugin/test.html: Added.
+
 2009-04-27  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Adam Roben.
diff --git a/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/English.lproj/InfoPlist.strings b/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/English.lproj/InfoPlist.strings
new file mode 100644 (file)
index 0000000..5e45963
Binary files /dev/null and b/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/English.lproj/InfoPlist.strings differ
diff --git a/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/Info.plist b/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/Info.plist
new file mode 100644 (file)
index 0000000..5809a14
--- /dev/null
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+       <key>CFBundleDevelopmentRegion</key>
+       <string>English</string>
+       <key>CFBundleExecutable</key>
+       <string>NetscapeCoreAnimationMoviePlugin</string>
+       <key>CFBundleIconFile</key>
+       <string></string>
+       <key>CFBundleIdentifier</key>
+       <string>com.apple.netscapecoreanimationmovieplugin</string>
+       <key>CFBundleInfoDictionaryVersion</key>
+       <string>6.0</string>
+       <key>CFBundlePackageType</key>
+       <string>BRPL</string>
+       <key>CFBundleShortVersionString</key>
+       <string>1.0</string>
+       <key>CFBundleSignature</key>
+       <string>????</string>
+       <key>CFBundleVersion</key>
+       <string>1.0</string>
+       <key>WebPluginDescription</key>
+       <string>Simple Netscape plug-in that draws using Core Animation and handles events using the Cocoa event model</string>
+       <key>WebPluginMIMETypes</key>
+       <dict>
+               <key>test/x-netscape-core-animation-movie-plugin</key>
+               <dict>
+                       <key>WebPluginTypeDescription</key>
+                       <string>Netscape Core Animation Movie Plug-in</string>
+               </dict>
+       </dict>
+       <key>WebPluginName</key>
+       <string>Netscape Core Animation Movie Plug-in</string>
+</dict>
+</plist>
diff --git a/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/MovieControllerLayer.h b/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/MovieControllerLayer.h
new file mode 100644 (file)
index 0000000..d29c916
--- /dev/null
@@ -0,0 +1,75 @@
+/*
+     File: MovieControllerLayer.h
+ Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple
+ Inc. ("Apple") in consideration of your agreement to the following
+ terms, and your use, installation, modification or redistribution of
+ this Apple software constitutes acceptance of these terms.  If you do
+ not agree with these terms, please do not use, install, modify or
+ redistribute this Apple software.
+ In consideration of your agreement to abide by the following terms, and
+ subject to these terms, Apple grants you a personal, non-exclusive
+ license, under Apple's copyrights in this original Apple software (the
+ "Apple Software"), to use, reproduce, modify and redistribute the Apple
+ Software, with or without modifications, in source and/or binary forms;
+ provided that if you redistribute the Apple Software in its entirety and
+ without modifications, you must retain this notice and the following
+ text and disclaimers in all such redistributions of the Apple Software.
+ Neither the name, trademarks, service marks or logos of Apple Inc. may
+ be used to endorse or promote products derived from the Apple Software
+ without specific prior written permission from Apple.  Except as
+ expressly stated in this notice, no other rights or licenses, express or
+ implied, are granted by Apple herein, including but not limited to any
+ patent rights that may be infringed by your derivative works or by other
+ works in which the Apple Software may be incorporated.
+ The Apple Software is provided by Apple on an "AS IS" basis.  APPLE
+ MAKES NO WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION
+ THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND
+ OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.
+ IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL
+ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION,
+ MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED
+ AND WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE),
+ STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ Copyright (C) 2009 Apple Inc. All Rights Reserved.
+ */
+
+
+#import <QuartzCore/QuartzCore.h>
+
+@class QTMovie;
+
+@interface MovieControllerLayer : CALayer {
+    CGImageRef _playImage;
+    CGImageRef _pauseImage;
+    
+    CGImageRef _sliderTrackLeft;
+    CGImageRef _sliderTrackRight;
+    CGImageRef _sliderTrackCenter;
+    
+    CGImageRef _thumb;
+    
+    QTMovie *_movie;
+    NSTimer *_updateTimeTimer;
+    
+    BOOL _wasPlayingBeforeMouseDown;
+    BOOL _isScrubbing;
+    CGFloat _mouseDownXDelta;
+}
+
+- (void)setMovie:(QTMovie *)movie;
+
+- (void)handleMouseDown:(CGPoint)point;
+- (void)handleMouseUp:(CGPoint)point;
+- (void)handleMouseDragged:(CGPoint)point;
+
+@end
diff --git a/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/MovieControllerLayer.m b/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/MovieControllerLayer.m
new file mode 100644 (file)
index 0000000..171dab4
--- /dev/null
@@ -0,0 +1,355 @@
+/*
+     File: MovieControllerLayer.m
+ Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple
+ Inc. ("Apple") in consideration of your agreement to the following
+ terms, and your use, installation, modification or redistribution of
+ this Apple software constitutes acceptance of these terms.  If you do
+ not agree with these terms, please do not use, install, modify or
+ redistribute this Apple software.
+ In consideration of your agreement to abide by the following terms, and
+ subject to these terms, Apple grants you a personal, non-exclusive
+ license, under Apple's copyrights in this original Apple software (the
+ "Apple Software"), to use, reproduce, modify and redistribute the Apple
+ Software, with or without modifications, in source and/or binary forms;
+ provided that if you redistribute the Apple Software in its entirety and
+ without modifications, you must retain this notice and the following
+ text and disclaimers in all such redistributions of the Apple Software.
+ Neither the name, trademarks, service marks or logos of Apple Inc. may
+ be used to endorse or promote products derived from the Apple Software
+ without specific prior written permission from Apple.  Except as
+ expressly stated in this notice, no other rights or licenses, express or
+ implied, are granted by Apple herein, including but not limited to any
+ patent rights that may be infringed by your derivative works or by other
+ works in which the Apple Software may be incorporated.
+ The Apple Software is provided by Apple on an "AS IS" basis.  APPLE
+ MAKES NO WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION
+ THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND
+ OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.
+ IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL
+ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION,
+ MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED
+ AND WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE),
+ STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ Copyright (C) 2009 Apple Inc. All Rights Reserved.
+ */
+
+#import "MovieControllerLayer.h"
+
+#import <QTKit/QTKit.h>
+
+@interface MovieControllerLayer ()
+- (BOOL)_isPlaying;
+- (NSTimeInterval)_currentTime;
+- (NSTimeInterval)_duration;
+@end
+
+@implementation MovieControllerLayer
+
+static CGImageRef createImageNamed(NSString *name)
+{
+    NSURL *url = [[NSBundle bundleForClass:[MovieControllerLayer class]] URLForResource:name withExtension:@"tiff"];
+    
+    if (!url)
+        return NULL;
+    
+    CGImageSourceRef imageSource = CGImageSourceCreateWithURL((CFURLRef)url, NULL);
+    if (!imageSource)
+        return NULL;
+    
+    CGImageRef image = CGImageSourceCreateImageAtIndex(imageSource, 0, NULL);
+    CFRelease(imageSource);
+    
+    return image;
+}
+
+- (id)init
+{
+    if (self = [super init]) {
+        self.needsDisplayOnBoundsChange = YES;
+        self.frame = CGRectMake(0, 0, 0, 25);
+        self.autoresizingMask = kCALayerWidthSizable;
+        
+        _playImage = createImageNamed(@"Play");
+        _pauseImage = createImageNamed(@"Pause");
+        _sliderTrackLeft = createImageNamed(@"SliderTrackLeft");
+        _sliderTrackRight = createImageNamed(@"SliderTrackRight");
+        _sliderTrackCenter = createImageNamed(@"SliderTrackCenter");
+        
+        _thumb = createImageNamed(@"Thumb");
+    }
+    
+    return self;
+}
+
+- (void)dealloc
+{
+    CGImageRelease(_playImage);
+    CGImageRelease(_pauseImage);
+    
+    CGImageRelease(_sliderTrackLeft);
+    CGImageRelease(_sliderTrackRight);
+    CGImageRelease(_sliderTrackCenter);
+    
+    CGImageRelease(_thumb);
+    
+    [self setMovie:nil];
+    [_updateTimeTimer invalidate];
+
+    [super dealloc];
+}
+
+#pragma mark Drawing
+
+- (CGRect)_playPauseButtonRect
+{
+    return CGRectMake(0, 0, 25, 25);
+}
+
+- (CGRect)_sliderRect
+{
+    CGFloat sliderYPosition = (self.bounds.size.height - CGImageGetHeight(_sliderTrackLeft)) / 2.0;
+    CGFloat playPauseButtonWidth = [self _playPauseButtonRect].size.width;
+    
+    return CGRectMake(playPauseButtonWidth, sliderYPosition, 
+                      self.bounds.size.width - playPauseButtonWidth - 7, CGImageGetHeight(_sliderTrackLeft));
+}
+
+- (CGRect)_sliderThumbRect
+{
+    CGRect sliderRect = [self _sliderRect];
+
+    CGFloat fraction = 0.0;
+    if (_movie)
+        fraction = [self _currentTime] / [self _duration];
+  
+    CGFloat x = fraction * (CGRectGetWidth(sliderRect) - CGImageGetWidth(_thumb));
+    
+    return CGRectMake(CGRectGetMinX(sliderRect) + x, CGRectGetMinY(sliderRect) - 1, 
+                      CGImageGetWidth(_thumb), CGImageGetHeight(_thumb));
+}
+
+- (CGRect)_innerSliderRect
+{
+    return CGRectInset([self _sliderRect], CGRectGetWidth([self _sliderThumbRect]) / 2, 0);
+}
+
+- (void)_drawPlayPauseButtonInContext:(CGContextRef)context
+{
+    CGContextDrawImage(context, [self _playPauseButtonRect], [self _isPlaying] ? _pauseImage : _playImage);
+}
+
+- (void)_drawSliderInContext:(CGContextRef)context
+{
+    // Draw the thumb
+    CGRect sliderThumbRect = [self _sliderThumbRect];
+    CGContextDrawImage(context, sliderThumbRect, _thumb);
+    
+    CGRect sliderRect = [self _sliderRect];
+    
+    // Draw left part
+    CGRect sliderLeftTrackRect = CGRectMake(CGRectGetMinX(sliderRect), CGRectGetMinY(sliderRect), 
+                                            CGImageGetWidth(_sliderTrackLeft), CGImageGetHeight(_sliderTrackLeft));
+    CGContextDrawImage(context, sliderLeftTrackRect, _sliderTrackLeft);
+    
+    // Draw center part
+    CGRect sliderCenterTrackRect = CGRectInset(sliderRect, CGImageGetWidth(_sliderTrackLeft), 0);
+    CGContextDrawImage(context, sliderCenterTrackRect, _sliderTrackCenter);
+    
+    // Draw right part
+    CGRect sliderRightTrackRect = CGRectMake(CGRectGetMaxX(sliderCenterTrackRect), CGRectGetMinY(sliderRect), 
+                                             CGImageGetWidth(_sliderTrackRight), CGImageGetHeight(_sliderTrackRight));
+    CGContextDrawImage(context, sliderRightTrackRect, _sliderTrackRight);
+    
+}
+
+- (void)drawInContext:(CGContextRef)context
+{
+    CGContextSaveGState(context);
+    CGContextSetFillColorWithColor(context, CGColorGetConstantColor(kCGColorBlack));
+    CGContextFillRect(context, self.bounds);
+    CGContextRestoreGState(context);
+    
+    [self _drawPlayPauseButtonInContext:context];
+    [self _drawSliderInContext:context];
+}
+
+#pragma mark Movie handling
+
+- (NSTimeInterval)_currentTime
+{
+    if (!_movie)
+        return 0;
+    
+    QTTime time = [_movie currentTime];
+    NSTimeInterval timeInterval;
+    if (!QTGetTimeInterval(time, &timeInterval))
+        return 0;
+    
+    return timeInterval;
+}
+
+- (NSTimeInterval)_duration
+{
+    if (!_movie)
+        return 0;
+    
+    QTTime time = [_movie duration];
+    NSTimeInterval timeInterval;
+    if (!QTGetTimeInterval(time, &timeInterval))
+        return 0;
+    
+    return timeInterval;
+}
+
+- (BOOL)_isPlaying
+{
+    return [_movie rate] != 0.0;
+}
+
+- (void)_updateTime:(NSTimer *)timer
+{
+    [self setNeedsDisplay];
+}
+
+- (void)_rateDidChange:(NSNotification *)notification
+{
+    float rate = [[[notification userInfo] objectForKey:QTMovieRateDidChangeNotificationParameter] floatValue];
+    
+    if (rate == 0.0) {
+        [_updateTimeTimer invalidate];
+        _updateTimeTimer = nil;
+    } else
+        _updateTimeTimer = [NSTimer scheduledTimerWithTimeInterval:0.035 target:self selector:@selector(_updateTime:) userInfo:nil repeats:YES];
+    
+    [self setNeedsDisplay];
+}
+
+- (void)_timeDidChange:(NSNotification *)notification
+{
+    [self setNeedsDisplay];
+}
+
+- (id<CAAction>)actionForKey:(NSString *)key
+{
+    // We don't want to animate the contents of the layer.
+    if ([key isEqualToString:@"contents"])
+        return nil;
+    
+    return [super actionForKey:key];
+}
+
+- (void)setMovie:(QTMovie *)movie
+{
+    if (_movie == movie)
+        return;
+    
+    if (_movie) {
+        [[NSNotificationCenter defaultCenter] removeObserver:self 
+                                                        name:QTMovieRateDidChangeNotification 
+                                                      object:_movie];
+        [[NSNotificationCenter defaultCenter] removeObserver:self 
+                                                        name:QTMovieTimeDidChangeNotification 
+                                                      object:_movie];
+        [_movie release];
+    }
+    
+    _movie = [movie retain];
+    
+    if (_movie) {
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(_rateDidChange:) 
+                                                     name:QTMovieRateDidChangeNotification 
+                                                   object:_movie];
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(_timeDidChange:) 
+                                                     name:QTMovieTimeDidChangeNotification 
+                                                   object:_movie];
+        [self setNeedsDisplay];
+    }
+    
+}
+
+# pragma mark Event handling
+
+- (void)_setNewTimeForThumbCenterX:(CGFloat)centerX
+{
+    CGRect innerRect = [self _innerSliderRect];
+    
+    CGFloat fraction = (centerX - CGRectGetMinX(innerRect)) / CGRectGetWidth(innerRect);
+    if (fraction > 1.0)
+        fraction = 1.0;
+    else if (fraction < 0.0)
+        fraction = 0.0;
+    
+    NSTimeInterval newTime = fraction * [self _duration];
+    
+    [_movie setCurrentTime:QTMakeTimeWithTimeInterval(newTime)];
+    [self setNeedsDisplay];    
+}
+
+- (void)handleMouseDown:(CGPoint)point
+{
+    if (!_movie)
+        return;
+
+    if (CGRectContainsPoint([self _sliderRect], point)) {
+        _wasPlayingBeforeMouseDown = [self _isPlaying];
+        _isScrubbing = YES;
+
+        [_movie stop];
+        if (CGRectContainsPoint([self _sliderThumbRect], point))
+            _mouseDownXDelta = point.x - CGRectGetMidX([self _sliderThumbRect]);
+        else {
+            [self _setNewTimeForThumbCenterX:point.x];
+            _mouseDownXDelta = 0;
+        }
+    }
+}
+
+- (void)handleMouseUp:(CGPoint)point
+{
+    if (!_movie)
+        return;
+    
+    if (_isScrubbing) {
+        _isScrubbing = NO;
+        _mouseDownXDelta = 0;
+        
+        if (_wasPlayingBeforeMouseDown)
+            [_movie play];
+        return;
+    }
+    
+    if (CGRectContainsPoint([self _playPauseButtonRect], point)) {
+        if ([self _isPlaying])
+            [_movie stop];
+        else
+            [_movie play];
+        return;
+    }
+}
+
+- (void)handleMouseDragged:(CGPoint)point
+{
+    if (!_movie)
+        return;
+
+    if (!_isScrubbing)
+        return;
+
+    point.x -= _mouseDownXDelta;
+
+    [self _setNewTimeForThumbCenterX:point.x];
+}
+
+@end
diff --git a/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/NetscapeCoreAnimationMoviePlugin.xcodeproj/project.pbxproj b/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/NetscapeCoreAnimationMoviePlugin.xcodeproj/project.pbxproj
new file mode 100644 (file)
index 0000000..dad0a47
--- /dev/null
@@ -0,0 +1,272 @@
+// !$*UTF8*$!
+{
+       archiveVersion = 1;
+       classes = {
+       };
+       objectVersion = 46;
+       objects = {
+
+/* Begin PBXBuildFile section */
+               1A624E590DCBC7F6006898C8 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A624E580DCBC7F6006898C8 /* main.m */; };
+               1A6250420DCBC81B006898C8 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A6250410DCBC81B006898C8 /* Cocoa.framework */; };
+               1A80001B0FDB2C85000F3646 /* MovieControllerLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A80001A0FDB2C85000F3646 /* MovieControllerLayer.m */; };
+               1A80011A0FDB2CB2000F3646 /* Pause.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1A8001140FDB2CB2000F3646 /* Pause.tiff */; };
+               1A80011B0FDB2CB2000F3646 /* Play.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1A8001150FDB2CB2000F3646 /* Play.tiff */; };
+               1A80011C0FDB2CB2000F3646 /* SliderTrackCenter.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1A8001160FDB2CB2000F3646 /* SliderTrackCenter.tiff */; };
+               1A80011D0FDB2CB2000F3646 /* SliderTrackLeft.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1A8001170FDB2CB2000F3646 /* SliderTrackLeft.tiff */; };
+               1A80011E0FDB2CB2000F3646 /* SliderTrackRight.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1A8001180FDB2CB2000F3646 /* SliderTrackRight.tiff */; };
+               1A80011F0FDB2CB2000F3646 /* Thumb.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1A8001190FDB2CB2000F3646 /* Thumb.tiff */; };
+               1A8001470FDB2E65000F3646 /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A8001460FDB2E65000F3646 /* QTKit.framework */; };
+               1A8C87AA0EF2FBB3003F6E81 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A8C87A90EF2FBB3003F6E81 /* QuartzCore.framework */; };
+               8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D5B49A704867FD3000E48DA /* InfoPlist.strings */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+               089C167EFE841241C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+               1A624E580DCBC7F6006898C8 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+               1A6250410DCBC81B006898C8 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+               1A8000190FDB2C85000F3646 /* MovieControllerLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MovieControllerLayer.h; sourceTree = "<group>"; };
+               1A80001A0FDB2C85000F3646 /* MovieControllerLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MovieControllerLayer.m; sourceTree = "<group>"; };
+               1A8001140FDB2CB2000F3646 /* Pause.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Pause.tiff; sourceTree = "<group>"; };
+               1A8001150FDB2CB2000F3646 /* Play.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Play.tiff; sourceTree = "<group>"; };
+               1A8001160FDB2CB2000F3646 /* SliderTrackCenter.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = SliderTrackCenter.tiff; sourceTree = "<group>"; };
+               1A8001170FDB2CB2000F3646 /* SliderTrackLeft.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = SliderTrackLeft.tiff; sourceTree = "<group>"; };
+               1A8001180FDB2CB2000F3646 /* SliderTrackRight.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = SliderTrackRight.tiff; sourceTree = "<group>"; };
+               1A8001190FDB2CB2000F3646 /* Thumb.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Thumb.tiff; sourceTree = "<group>"; };
+               1A8001460FDB2E65000F3646 /* QTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = /System/Library/Frameworks/QTKit.framework; sourceTree = "<absolute>"; };
+               1A8C87A90EF2FBB3003F6E81 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = /System/Library/Frameworks/QuartzCore.framework; sourceTree = "<absolute>"; };
+               8D576316048677EA00EA77CD /* NetscapeCoreAnimationMoviePlugin.plugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NetscapeCoreAnimationMoviePlugin.plugin; sourceTree = BUILT_PRODUCTS_DIR; };
+               8D576317048677EA00EA77CD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+               8D576313048677EA00EA77CD /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               1A6250420DCBC81B006898C8 /* Cocoa.framework in Frameworks */,
+                               1A8C87AA0EF2FBB3003F6E81 /* QuartzCore.framework in Frameworks */,
+                               1A8001470FDB2E65000F3646 /* QTKit.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+               089C166AFE841209C02AAC07 /* NetscapeCoreAnimationMoviePlugin */ = {
+                       isa = PBXGroup;
+                       children = (
+                               08FB77AFFE84173DC02AAC07 /* Source */,
+                               089C167CFE841241C02AAC07 /* Resources */,
+                               089C1671FE841209C02AAC07 /* External Frameworks and Libraries */,
+                               19C28FB6FE9D52B211CA2CBB /* Products */,
+                               1A8001460FDB2E65000F3646 /* QTKit.framework */,
+                       );
+                       name = NetscapeCoreAnimationMoviePlugin;
+                       sourceTree = "<group>";
+               };
+               089C1671FE841209C02AAC07 /* External Frameworks and Libraries */ = {
+                       isa = PBXGroup;
+                       children = (
+                               1A6250410DCBC81B006898C8 /* Cocoa.framework */,
+                               1A8C87A90EF2FBB3003F6E81 /* QuartzCore.framework */,
+                       );
+                       name = "External Frameworks and Libraries";
+                       sourceTree = "<group>";
+               };
+               089C167CFE841241C02AAC07 /* Resources */ = {
+                       isa = PBXGroup;
+                       children = (
+                               1A8001140FDB2CB2000F3646 /* Pause.tiff */,
+                               1A8001150FDB2CB2000F3646 /* Play.tiff */,
+                               1A8001160FDB2CB2000F3646 /* SliderTrackCenter.tiff */,
+                               1A8001170FDB2CB2000F3646 /* SliderTrackLeft.tiff */,
+                               1A8001180FDB2CB2000F3646 /* SliderTrackRight.tiff */,
+                               1A8001190FDB2CB2000F3646 /* Thumb.tiff */,
+                               8D576317048677EA00EA77CD /* Info.plist */,
+                               8D5B49A704867FD3000E48DA /* InfoPlist.strings */,
+                       );
+                       name = Resources;
+                       sourceTree = "<group>";
+               };
+               08FB77AFFE84173DC02AAC07 /* Source */ = {
+                       isa = PBXGroup;
+                       children = (
+                               1A624E580DCBC7F6006898C8 /* main.m */,
+                               1A8000190FDB2C85000F3646 /* MovieControllerLayer.h */,
+                               1A80001A0FDB2C85000F3646 /* MovieControllerLayer.m */,
+                       );
+                       name = Source;
+                       sourceTree = "<group>";
+               };
+               19C28FB6FE9D52B211CA2CBB /* Products */ = {
+                       isa = PBXGroup;
+                       children = (
+                               8D576316048677EA00EA77CD /* NetscapeCoreAnimationMoviePlugin.plugin */,
+                       );
+                       name = Products;
+                       sourceTree = "<group>";
+               };
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+               8D57630D048677EA00EA77CD /* NetscapeCoreAnimationMoviePlugin */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = 149C298308902C53008A9EFC /* Build configuration list for PBXNativeTarget "NetscapeCoreAnimationMoviePlugin" */;
+                       buildPhases = (
+                               8D576311048677EA00EA77CD /* Sources */,
+                               8D57630F048677EA00EA77CD /* Resources */,
+                               8D576313048677EA00EA77CD /* Frameworks */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                       );
+                       name = NetscapeCoreAnimationMoviePlugin;
+                       productInstallPath = "$(HOME)/Library/Bundles";
+                       productName = NetscapeCoreAnimationMoviePlugin;
+                       productReference = 8D576316048677EA00EA77CD /* NetscapeCoreAnimationMoviePlugin.plugin */;
+                       productType = "com.apple.product-type.bundle";
+               };
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+               089C1669FE841209C02AAC07 /* Project object */ = {
+                       isa = PBXProject;
+                       buildConfigurationList = 149C298708902C53008A9EFC /* Build configuration list for PBXProject "NetscapeCoreAnimationMoviePlugin" */;
+                       compatibilityVersion = "Xcode 3.2";
+                       hasScannedForEncodings = 1;
+                       mainGroup = 089C166AFE841209C02AAC07 /* NetscapeCoreAnimationMoviePlugin */;
+                       projectDirPath = "";
+                       projectRoot = "";
+                       targets = (
+                               8D57630D048677EA00EA77CD /* NetscapeCoreAnimationMoviePlugin */,
+                       );
+               };
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+               8D57630F048677EA00EA77CD /* Resources */ = {
+                       isa = PBXResourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */,
+                               1A80011A0FDB2CB2000F3646 /* Pause.tiff in Resources */,
+                               1A80011B0FDB2CB2000F3646 /* Play.tiff in Resources */,
+                               1A80011C0FDB2CB2000F3646 /* SliderTrackCenter.tiff in Resources */,
+                               1A80011D0FDB2CB2000F3646 /* SliderTrackLeft.tiff in Resources */,
+                               1A80011E0FDB2CB2000F3646 /* SliderTrackRight.tiff in Resources */,
+                               1A80011F0FDB2CB2000F3646 /* Thumb.tiff in Resources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+               8D576311048677EA00EA77CD /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               1A624E590DCBC7F6006898C8 /* main.m in Sources */,
+                               1A80001B0FDB2C85000F3646 /* MovieControllerLayer.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+               8D5B49A704867FD3000E48DA /* InfoPlist.strings */ = {
+                       isa = PBXVariantGroup;
+                       children = (
+                               089C167EFE841241C02AAC07 /* English */,
+                       );
+                       name = InfoPlist.strings;
+                       sourceTree = "<group>";
+               };
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+               149C298408902C53008A9EFC /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               COPY_PHASE_STRIP = NO;
+                               GCC_DEBUGGING_SYMBOLS = full;
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
+                               GCC_MODEL_TUNING = G5;
+                               GCC_OPTIMIZATION_LEVEL = 0;
+                               INFOPLIST_FILE = Info.plist;
+                               INSTALL_PATH = "$(HOME)/Library/Bundles";
+                               PRODUCT_NAME = NetscapeCoreAnimationMoviePlugin;
+                               WRAPPER_EXTENSION = plugin;
+                               ZERO_LINK = YES;
+                       };
+                       name = Debug;
+               };
+               149C298508902C53008A9EFC /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ARCHS = (
+                                       ppc,
+                                       i386,
+                               );
+                               GCC_DEBUGGING_SYMBOLS = full;
+                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+                               GCC_MODEL_TUNING = G5;
+                               GCC_OPTIMIZATION_LEVEL = 0;
+                               INFOPLIST_FILE = Info.plist;
+                               INSTALL_PATH = "$(HOME)/Library/Bundles";
+                               PRODUCT_NAME = NetscapeCoreAnimationMoviePlugin;
+                               WRAPPER_EXTENSION = plugin;
+                       };
+                       name = Release;
+               };
+               149C298808902C53008A9EFC /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+                               ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "ppc i386 ppc64 x86_64";
+                               GCC_C_LANGUAGE_STANDARD = c99;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES;
+                               GCC_WARN_UNUSED_VARIABLE = YES;
+                               PREBINDING = NO;
+                               SDKROOT = macosx10.6;
+                       };
+                       name = Debug;
+               };
+               149C298908902C53008A9EFC /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ARCHS = i386;
+                               ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "ppc i386 ppc64 x86_64";
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES;
+                               GCC_WARN_UNUSED_VARIABLE = YES;
+                               PREBINDING = NO;
+                       };
+                       name = Release;
+               };
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+               149C298308902C53008A9EFC /* Build configuration list for PBXNativeTarget "NetscapeCoreAnimationMoviePlugin" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               149C298408902C53008A9EFC /* Debug */,
+                               149C298508902C53008A9EFC /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               149C298708902C53008A9EFC /* Build configuration list for PBXProject "NetscapeCoreAnimationMoviePlugin" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               149C298808902C53008A9EFC /* Debug */,
+                               149C298908902C53008A9EFC /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+/* End XCConfigurationList section */
+       };
+       rootObject = 089C1669FE841209C02AAC07 /* Project object */;
+}
diff --git a/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/Pause.tiff b/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/Pause.tiff
new file mode 100644 (file)
index 0000000..b46fa57
Binary files /dev/null and b/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/Pause.tiff differ
diff --git a/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/Play.tiff b/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/Play.tiff
new file mode 100644 (file)
index 0000000..3071a6f
Binary files /dev/null and b/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/Play.tiff differ
diff --git a/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/SliderTrackCenter.tiff b/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/SliderTrackCenter.tiff
new file mode 100644 (file)
index 0000000..bef6508
Binary files /dev/null and b/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/SliderTrackCenter.tiff differ
diff --git a/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/SliderTrackLeft.tiff b/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/SliderTrackLeft.tiff
new file mode 100644 (file)
index 0000000..1609297
Binary files /dev/null and b/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/SliderTrackLeft.tiff differ
diff --git a/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/SliderTrackRight.tiff b/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/SliderTrackRight.tiff
new file mode 100644 (file)
index 0000000..270c42b
Binary files /dev/null and b/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/SliderTrackRight.tiff differ
diff --git a/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/Thumb.tiff b/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/Thumb.tiff
new file mode 100644 (file)
index 0000000..392ce56
Binary files /dev/null and b/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/Thumb.tiff differ
diff --git a/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/main.m b/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/main.m
new file mode 100644 (file)
index 0000000..6766bc6
--- /dev/null
@@ -0,0 +1,393 @@
+/*
+     File: MovieControllerLayer.m
+ Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple
+ Inc. ("Apple") in consideration of your agreement to the following
+ terms, and your use, installation, modification or redistribution of
+ this Apple software constitutes acceptance of these terms.  If you do
+ not agree with these terms, please do not use, install, modify or
+ redistribute this Apple software.
+ In consideration of your agreement to abide by the following terms, and
+ subject to these terms, Apple grants you a personal, non-exclusive
+ license, under Apple's copyrights in this original Apple software (the
+ "Apple Software"), to use, reproduce, modify and redistribute the Apple
+ Software, with or without modifications, in source and/or binary forms;
+ provided that if you redistribute the Apple Software in its entirety and
+ without modifications, you must retain this notice and the following
+ text and disclaimers in all such redistributions of the Apple Software.
+ Neither the name, trademarks, service marks or logos of Apple Inc. may
+ be used to endorse or promote products derived from the Apple Software
+ without specific prior written permission from Apple.  Except as
+ expressly stated in this notice, no other rights or licenses, express or
+ implied, are granted by Apple herein, including but not limited to any
+ patent rights that may be infringed by your derivative works or by other
+ works in which the Apple Software may be incorporated.
+ The Apple Software is provided by Apple on an "AS IS" basis.  APPLE
+ MAKES NO WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION
+ THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND
+ OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.
+ IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL
+ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION,
+ MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED
+ AND WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE),
+ STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ Copyright (C) 2009 Apple Inc. All Rights Reserved.
+ */
+
+#import <WebKit/npapi.h>
+#import <WebKit/npfunctions.h>
+#import <WebKit/npruntime.h>
+
+#import <QuartzCore/QuartzCore.h>
+#import <QTKit/QTKit.h>
+
+#import "MovieControllerLayer.h"
+
+// Browser function table
+static NPNetscapeFuncs* browser;
+
+// Structure for per-instance storage
+typedef struct PluginObject
+{
+    NPP npp;
+    
+    NPWindow window;
+    
+    CALayer *rootLayer;
+    MovieControllerLayer *controllerLayer;
+    QTMovieLayer *movieLayer;
+    
+    CALayer *mouseDownLayer;
+    
+    NSURL *movieURL;
+    QTMovie *movie;
+} PluginObject;
+
+NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, char* argn[], char* argv[], NPSavedData* saved);
+NPError NPP_Destroy(NPP instance, NPSavedData** save);
+NPError NPP_SetWindow(NPP instance, NPWindow* window);
+NPError NPP_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16* stype);
+NPError NPP_DestroyStream(NPP instance, NPStream* stream, NPReason reason);
+int32 NPP_WriteReady(NPP instance, NPStream* stream);
+int32 NPP_Write(NPP instance, NPStream* stream, int32 offset, int32 len, void* buffer);
+void NPP_StreamAsFile(NPP instance, NPStream* stream, const char* fname);
+void NPP_Print(NPP instance, NPPrint* platformPrint);
+int16 NPP_HandleEvent(NPP instance, void* event);
+void NPP_URLNotify(NPP instance, const char* URL, NPReason reason, void* notifyData);
+NPError NPP_GetValue(NPP instance, NPPVariable variable, void *value);
+NPError NPP_SetValue(NPP instance, NPNVariable variable, void *value);
+
+#pragma export on
+// Mach-o entry points
+NPError NP_Initialize(NPNetscapeFuncs *browserFuncs);
+NPError NP_GetEntryPoints(NPPluginFuncs *pluginFuncs);
+void NP_Shutdown(void);
+#pragma export off
+
+NPError NP_Initialize(NPNetscapeFuncs* browserFuncs)
+{
+    browser = browserFuncs;
+    return NPERR_NO_ERROR;
+}
+
+NPError NP_GetEntryPoints(NPPluginFuncs* pluginFuncs)
+{
+    pluginFuncs->version = 11;
+    pluginFuncs->size = sizeof(pluginFuncs);
+    pluginFuncs->newp = NPP_New;
+    pluginFuncs->destroy = NPP_Destroy;
+    pluginFuncs->setwindow = NPP_SetWindow;
+    pluginFuncs->newstream = NPP_NewStream;
+    pluginFuncs->destroystream = NPP_DestroyStream;
+    pluginFuncs->asfile = NPP_StreamAsFile;
+    pluginFuncs->writeready = NPP_WriteReady;
+    pluginFuncs->write = (NPP_WriteProcPtr)NPP_Write;
+    pluginFuncs->print = NPP_Print;
+    pluginFuncs->event = NPP_HandleEvent;
+    pluginFuncs->urlnotify = NPP_URLNotify;
+    pluginFuncs->getvalue = NPP_GetValue;
+    pluginFuncs->setvalue = NPP_SetValue;
+    
+    return NPERR_NO_ERROR;
+}
+
+void NP_Shutdown(void)
+{
+
+}
+
+NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, char* argn[], char* argv[], NPSavedData* saved)
+{
+    // Create per-instance storage
+    PluginObject *obj = (PluginObject *)malloc(sizeof(PluginObject));
+    bzero(obj, sizeof(PluginObject));
+    
+    obj->npp = instance;
+    instance->pdata = obj;
+    
+    // Ask the browser if it supports the Core Animation drawing model
+    NPBool supportsCoreAnimation;
+    if (browser->getvalue(instance, NPNVsupportsCoreAnimationBool, &supportsCoreAnimation) != NPERR_NO_ERROR)
+        supportsCoreAnimation = FALSE;
+    
+    if (!supportsCoreAnimation)
+        return NPERR_INCOMPATIBLE_VERSION_ERROR;
+    
+    // If the browser supports the Core Animation drawing model, enable it.
+    browser->setvalue(instance, NPPVpluginDrawingModel, (void *)NPDrawingModelCoreAnimation);
+
+    // If the browser supports the Cocoa event model, enable it.
+    NPBool supportsCocoa;
+    if (browser->getvalue(instance, NPNVsupportsCocoaBool, &supportsCocoa) != NPERR_NO_ERROR)
+        supportsCocoa = FALSE;
+    
+    if (!supportsCocoa)
+        return NPERR_INCOMPATIBLE_VERSION_ERROR;
+    
+    browser->setvalue(instance, NPPVpluginEventModel, (void *)NPEventModelCocoa);
+    
+    for (int16 i = 0; i < argc; i++) {
+        if (strcasecmp(argn[i], "movieurl") == 0) {
+            NSString *urlString = [NSString stringWithUTF8String:argv[i]];
+            if (urlString) 
+                obj->movieURL = [[NSURL URLWithString:urlString] retain];
+            break;
+        }
+        
+    }
+    
+    return NPERR_NO_ERROR;
+}
+
+NPError NPP_Destroy(NPP instance, NPSavedData** save)
+{
+    // Free per-instance storage
+    PluginObject *obj = instance->pdata;
+
+    [obj->movie stop];
+    [obj->rootLayer release];
+    
+    free(obj);
+    
+    return NPERR_NO_ERROR;
+}
+
+NPError NPP_SetWindow(NPP instance, NPWindow* window)
+{
+    PluginObject *obj = instance->pdata;
+    obj->window = *window;
+
+    return NPERR_NO_ERROR;
+}
+
+NPError NPP_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16* stype)
+{
+    *stype = NP_ASFILEONLY;
+    return NPERR_NO_ERROR;
+}
+
+NPError NPP_DestroyStream(NPP instance, NPStream* stream, NPReason reason)
+{
+    return NPERR_NO_ERROR;
+}
+
+int32 NPP_WriteReady(NPP instance, NPStream* stream)
+{
+    return 0;
+}
+
+int32 NPP_Write(NPP instance, NPStream* stream, int32 offset, int32 len, void* buffer)
+{
+    return 0;
+}
+
+void NPP_StreamAsFile(NPP instance, NPStream* stream, const char* fname)
+{
+}
+
+void NPP_Print(NPP instance, NPPrint* platformPrint)
+{
+
+}
+
+static void handleMouseDown(PluginObject *obj, NPCocoaEvent *event)
+{
+    CGPoint point = CGPointMake(event->data.mouse.pluginX, 
+                                // Flip the y coordinate
+                                obj->window.height - event->data.mouse.pluginY);
+    
+    obj->mouseDownLayer = [obj->rootLayer hitTest:point];
+    if (obj->mouseDownLayer == obj->controllerLayer) {
+        [obj->controllerLayer handleMouseDown:[obj->rootLayer convertPoint:point toLayer:obj->controllerLayer]];
+        return;
+    }    
+}
+
+static void togglePlayPause(PluginObject *obj)
+{
+    if (!obj->movie)
+        return;
+    
+    if ([obj->movie rate] == 0)
+        [obj->movie play];
+    else
+        [obj->movie stop];
+
+}
+
+static void handleMouseUp(PluginObject *obj, NPCocoaEvent *event)
+{
+    CGPoint point = CGPointMake(event->data.mouse.pluginX, 
+                                // Flip the y coordinate
+                                obj->window.height - event->data.mouse.pluginY);
+
+    CALayer *mouseDownLayer = obj->mouseDownLayer;
+    obj->mouseDownLayer = nil;
+    if (mouseDownLayer == obj->controllerLayer) {
+        [obj->controllerLayer handleMouseUp:[obj->rootLayer convertPoint:point toLayer:obj->controllerLayer]];
+        return;
+    }
+}
+
+static void handleMouseDragged(PluginObject *obj, NPCocoaEvent *event)
+{
+    CGPoint point = CGPointMake(event->data.mouse.pluginX, 
+                                // Flip the y coordinate
+                                obj->window.height - event->data.mouse.pluginY);
+    
+    if (obj->mouseDownLayer == obj->controllerLayer) {
+        [obj->controllerLayer handleMouseDragged:[obj->rootLayer convertPoint:point toLayer:obj->controllerLayer]];
+        return;
+    }    
+}
+
+static void handleMouseEntered(PluginObject *obj)
+{
+    // Show the controller layer.
+    obj->controllerLayer.opacity = 1.0;
+}
+
+static void handleMouseExited(PluginObject *obj)
+{
+    // Hide the controller layer if the movie is playing.
+    if ([obj->movie rate])
+        obj->controllerLayer.opacity = 0.0;
+}
+
+static int handleKeyDown(PluginObject *obj, NPCocoaEvent *event)
+{
+    NSString *characters = (NSString *)event->data.key.characters;
+    
+    if ([characters length] == 1 && [characters characterAtIndex:0] == ' ') {
+        togglePlayPause(obj);
+        return 1;
+    }
+    
+    return 0;
+}
+
+
+static int handleScrollEvent(PluginObject *obj, NPCocoaEvent *event)
+{
+    double delta = event->data.mouse.deltaY;
+    if (delta < 0)
+        [obj->movie stepForward];
+    else
+        [obj->movie stepBackward];
+    return 0;
+}
+
+
+
+int16 NPP_HandleEvent(NPP instance, void* event)
+{
+    PluginObject *obj = instance->pdata;
+
+    NPCocoaEvent *cocoaEvent = event;
+    
+    switch(cocoaEvent->type) {
+        case NPCocoaEventMouseDown:
+            handleMouseDown(obj, cocoaEvent);
+            return 1;
+        case NPCocoaEventMouseUp:
+            handleMouseUp(obj, cocoaEvent);
+            return 1;
+        case NPCocoaEventMouseDragged:
+            handleMouseDragged(obj, cocoaEvent);
+            return 1;
+        case NPCocoaEventMouseEntered:
+            handleMouseEntered(obj);
+            return 1;
+        case NPCocoaEventMouseExited:
+            handleMouseExited(obj);
+            return 1;
+        case NPCocoaEventKeyDown:
+            return handleKeyDown(obj, cocoaEvent);
+        case NPCocoaEventScrollWheel:
+            return handleScrollEvent(obj, cocoaEvent);
+    }
+    
+    return 0;
+}
+
+void NPP_URLNotify(NPP instance, const char* url, NPReason reason, void* notifyData)
+{
+
+}
+
+NPError NPP_GetValue(NPP instance, NPPVariable variable, void *value)
+{
+    PluginObject *obj = instance->pdata;
+
+    switch (variable) {
+        case NPPVpluginCoreAnimationLayer:
+            if (!obj->rootLayer) {
+                // Setup layer hierarchy.
+                obj->rootLayer = [[CALayer layer] retain];
+                
+                obj->movieLayer = [QTMovieLayer layer];
+                obj->movieLayer.autoresizingMask = kCALayerWidthSizable | kCALayerHeightSizable;
+                [obj->rootLayer addSublayer:obj->movieLayer];
+
+                obj->controllerLayer = [MovieControllerLayer layer];
+                [obj->rootLayer addSublayer:obj->controllerLayer];
+                
+                if (obj->movieURL) {
+                    NSDictionary *attributes = [NSDictionary dictionaryWithObjectsAndKeys:obj->movieURL, QTMovieURLAttribute,
+                                                [NSNumber numberWithBool:YES], QTMovieOpenForPlaybackAttribute, 
+                                                [NSNumber numberWithBool:YES], QTMovieLoopsAttribute, 
+                                                nil];
+                    obj->movie = [QTMovie movieWithAttributes:attributes error:nil];
+
+                    if (obj->movie) {
+                        obj->movieLayer.movie = obj->movie;
+                        [obj->controllerLayer setMovie:obj->movie];
+                    }
+                }
+                    
+            }
+            
+            // Make sure to return a retained layer
+            *((CALayer **)value) = [obj->rootLayer retain];
+            
+            return NPERR_NO_ERROR;
+            
+        default:
+            return NPERR_GENERIC_ERROR;
+    }
+}
+
+NPError NPP_SetValue(NPP instance, NPNVariable variable, void *value)
+{
+    return NPERR_GENERIC_ERROR;
+}
diff --git a/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/test.html b/WebKitExamplePlugins/NetscapeCoreAnimationMoviePlugin/test.html
new file mode 100755 (executable)
index 0000000..0ffb77b
--- /dev/null
@@ -0,0 +1,18 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
+<html>
+<head>
+<title>Netscape Core Animation Movie Plug-In</title>
+</head>
+<body>
+<div>
+<!--
+    <embed width="848" height="480" movieurl="http://movies.apple.com/movies/disney/up/up-tlr2_480p.mov"
+        type="test/x-netscape-core-animation-movie-plugin"></embed>
+-->
+    <embed width="1280" height="720" movieurl="http://movies.apple.com/movies/disney/up/up-tlr2_720p.mov"
+        type="test/x-netscape-core-animation-movie-plugin"></embed>
+
+
+</div>
+</body>
+</html>