2008-12-12 Anders Carlsson <andersca@apple.com>
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Dec 2008 20:29:28 +0000 (20:29 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Dec 2008 20:29:28 +0000 (20:29 +0000)
        Reviewed by Kevin Decker.

        Add a sample Core Animation NPAPI plug-in.

        * NetscapeCocoaPlugin/NetscapeCocoaPlugin.xcodeproj/project.pbxproj:
        * NetscapeCocoaPlugin/main.m:
        (handleDraw):
        (handleMouseEvent):
        (NPP_HandleEvent):
        * NetscapeCoreAnimationPlugin: Added.
        * NetscapeCoreAnimationPlugin/Composition.qtz: Added.
        * NetscapeCoreAnimationPlugin/English.lproj: Added.
        * NetscapeCoreAnimationPlugin/English.lproj/InfoPlist.strings: Added.
        * NetscapeCoreAnimationPlugin/Info.plist: Added.
        * NetscapeCoreAnimationPlugin/NetscapeCoreAnimationPlugin.xcodeproj: Added.
        * NetscapeCoreAnimationPlugin/NetscapeCoreAnimationPlugin.xcodeproj/project.pbxproj: Added.
        * NetscapeCoreAnimationPlugin/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):
        (handleMouseClick):
        (NPP_HandleEvent):
        (NPP_URLNotify):
        (NPP_GetValue):
        (NPP_SetValue):
        * NetscapeCoreAnimationPlugin/test.html: Added.

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

WebKitExamplePlugins/ChangeLog
WebKitExamplePlugins/NetscapeCocoaPlugin/NetscapeCocoaPlugin.xcodeproj/project.pbxproj
WebKitExamplePlugins/NetscapeCocoaPlugin/main.m
WebKitExamplePlugins/NetscapeCoreAnimationPlugin/Composition.qtz [new file with mode: 0644]
WebKitExamplePlugins/NetscapeCoreAnimationPlugin/English.lproj/InfoPlist.strings [new file with mode: 0644]
WebKitExamplePlugins/NetscapeCoreAnimationPlugin/Info.plist [new file with mode: 0644]
WebKitExamplePlugins/NetscapeCoreAnimationPlugin/NetscapeCoreAnimationPlugin.xcodeproj/project.pbxproj [new file with mode: 0644]
WebKitExamplePlugins/NetscapeCoreAnimationPlugin/main.m [new file with mode: 0644]
WebKitExamplePlugins/NetscapeCoreAnimationPlugin/test.html [new file with mode: 0644]

index 9fdea7c..61a0d45 100644 (file)
@@ -1,3 +1,41 @@
+2008-12-12  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Kevin Decker.
+
+        Add a sample Core Animation NPAPI plug-in.
+        
+        * NetscapeCocoaPlugin/NetscapeCocoaPlugin.xcodeproj/project.pbxproj:
+        * NetscapeCocoaPlugin/main.m:
+        (handleDraw):
+        (handleMouseEvent):
+        (NPP_HandleEvent):
+        * NetscapeCoreAnimationPlugin: Added.
+        * NetscapeCoreAnimationPlugin/Composition.qtz: Added.
+        * NetscapeCoreAnimationPlugin/English.lproj: Added.
+        * NetscapeCoreAnimationPlugin/English.lproj/InfoPlist.strings: Added.
+        * NetscapeCoreAnimationPlugin/Info.plist: Added.
+        * NetscapeCoreAnimationPlugin/NetscapeCoreAnimationPlugin.xcodeproj: Added.
+        * NetscapeCoreAnimationPlugin/NetscapeCoreAnimationPlugin.xcodeproj/project.pbxproj: Added.
+        * NetscapeCoreAnimationPlugin/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):
+        (handleMouseClick):
+        (NPP_HandleEvent):
+        (NPP_URLNotify):
+        (NPP_GetValue):
+        (NPP_SetValue):
+        * NetscapeCoreAnimationPlugin/test.html: Added.
+
 2008-12-08  David Kilzer  <ddkilzer@apple.com>
 
         Bug 22555: Sort "children" sections in Xcode project files
index 9703a2d..a0d22ff 100644 (file)
                149C298808902C53008A9EFC /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
+                               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;
                149C298908902C53008A9EFC /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
+                               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;
index 1f66ac1..19a28e8 100644 (file)
@@ -203,9 +203,8 @@ static void handleDraw(PluginObject *obj)
 
 
     [NSGraphicsContext setCurrentContext:context];
-    
+
     NSRect rect = NSMakeRect(0, 0, obj->window.width, obj->window.height);
-    
     [[NSColor lightGrayColor] set];
     [NSBezierPath fillRect:rect];
 
@@ -264,9 +263,20 @@ static void invalidatePlugin(PluginObject *obj)
 
 static void handleMouseEvent(PluginObject *obj, NPCocoaEvent *event)
 {
+    NSWindow *window = ((NP_CGContext *)obj->window.window)->window;
+    // Convert the event coordinates to screen coordinates.
+    
+    NSPoint windowCoordinates = NSMakePoint(0, 0);//obj->window.x + event->data.mouse.pluginX,
+//                                            obj->window.y + event->data.mouse.pluginY);
+
+    NSPoint screenCoordinates = [window convertBaseToScreen:windowCoordinates];
+    
+    NSLog(@"window: %@", window);
+    
     NSString *string = [NSString stringWithFormat:@"Type: %@\n"
                                                    "Modifier flags: 0x%x\n"
                                                    "Coordinates: (%g, %g)\n"
+                                                   "Screen coordinates: (%g, %g)\n"
                                                    "Button number: %d\n"
                                                    "Click count: %d\n"
                                                    "Delta: (%g, %g, %g)",
@@ -274,6 +284,7 @@ static void handleMouseEvent(PluginObject *obj, NPCocoaEvent *event)
                                                    event->data.mouse.modifierFlags,
                                                    event->data.mouse.pluginX,
                                                    event->data.mouse.pluginY,
+                                                   screenCoordinates.x, screenCoordinates.y,
                                                    event->data.mouse.buttonNumber,
                                                    event->data.mouse.clickCount,
                                                    event->data.mouse.deltaX, event->data.mouse.deltaY, event->data.mouse.deltaZ];
@@ -323,6 +334,7 @@ int16 NPP_HandleEvent(NPP instance, void* event)
     
     switch(cocoaEvent->type) {
         case NPCocoaEventFocusChanged:
+            browser->status(instance, cocoaEvent->data.focus.hasFocus ? "Got focus" : "Lost Focus");
             obj->hasFocus = cocoaEvent->data.focus.hasFocus;
             invalidatePlugin(obj);
             return 1;
diff --git a/WebKitExamplePlugins/NetscapeCoreAnimationPlugin/Composition.qtz b/WebKitExamplePlugins/NetscapeCoreAnimationPlugin/Composition.qtz
new file mode 100644 (file)
index 0000000..731376a
Binary files /dev/null and b/WebKitExamplePlugins/NetscapeCoreAnimationPlugin/Composition.qtz differ
diff --git a/WebKitExamplePlugins/NetscapeCoreAnimationPlugin/English.lproj/InfoPlist.strings b/WebKitExamplePlugins/NetscapeCoreAnimationPlugin/English.lproj/InfoPlist.strings
new file mode 100644 (file)
index 0000000..5e45963
Binary files /dev/null and b/WebKitExamplePlugins/NetscapeCoreAnimationPlugin/English.lproj/InfoPlist.strings differ
diff --git a/WebKitExamplePlugins/NetscapeCoreAnimationPlugin/Info.plist b/WebKitExamplePlugins/NetscapeCoreAnimationPlugin/Info.plist
new file mode 100644 (file)
index 0000000..146bc0d
--- /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>NetscapeCoreAnimationPlugin</string>
+       <key>CFBundleIconFile</key>
+       <string></string>
+       <key>CFBundleIdentifier</key>
+       <string>com.apple.netscapecoreanimationplugin</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-plugin</key>
+               <dict>
+                       <key>WebPluginTypeDescription</key>
+                       <string>Netscape Core Animation Plug-in</string>
+               </dict>
+       </dict>
+       <key>WebPluginName</key>
+       <string>Netscape Core Animation Plug-in</string>
+</dict>
+</plist>
diff --git a/WebKitExamplePlugins/NetscapeCoreAnimationPlugin/NetscapeCoreAnimationPlugin.xcodeproj/project.pbxproj b/WebKitExamplePlugins/NetscapeCoreAnimationPlugin/NetscapeCoreAnimationPlugin.xcodeproj/project.pbxproj
new file mode 100644 (file)
index 0000000..9f229fc
--- /dev/null
@@ -0,0 +1,244 @@
+// !$*UTF8*$!
+{
+       archiveVersion = 1;
+       classes = {
+       };
+       objectVersion = 42;
+       objects = {
+
+/* Begin PBXBuildFile section */
+               1A1BA1760EF2FB3200754486 /* Composition.qtz in Resources */ = {isa = PBXBuildFile; fileRef = 1A1BA1750EF2FB3200754486 /* Composition.qtz */; };
+               1A624E590DCBC7F6006898C8 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A624E580DCBC7F6006898C8 /* main.m */; };
+               1A6250420DCBC81B006898C8 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A6250410DCBC81B006898C8 /* Cocoa.framework */; };
+               1A8C86AA0EF2FB8F003F6E81 /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A8C86A90EF2FB8F003F6E81 /* Quartz.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>"; };
+               1A1BA1750EF2FB3200754486 /* Composition.qtz */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; path = Composition.qtz; 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>"; };
+               1A8C86A90EF2FB8F003F6E81 /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = /System/Library/Frameworks/Quartz.framework; sourceTree = "<absolute>"; };
+               1A8C87A90EF2FBB3003F6E81 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = /System/Library/Frameworks/QuartzCore.framework; sourceTree = "<absolute>"; };
+               8D576316048677EA00EA77CD /* NetscapeCoreAnimationPlugin.plugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NetscapeCoreAnimationPlugin.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 */,
+                               1A8C86AA0EF2FB8F003F6E81 /* Quartz.framework in Frameworks */,
+                               1A8C87AA0EF2FBB3003F6E81 /* QuartzCore.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+               089C166AFE841209C02AAC07 /* NetscapeCoreAnimationPlugin */ = {
+                       isa = PBXGroup;
+                       children = (
+                               08FB77AFFE84173DC02AAC07 /* Source */,
+                               089C167CFE841241C02AAC07 /* Resources */,
+                               089C1671FE841209C02AAC07 /* External Frameworks and Libraries */,
+                               19C28FB6FE9D52B211CA2CBB /* Products */,
+                       );
+                       name = NetscapeCoreAnimationPlugin;
+                       sourceTree = "<group>";
+               };
+               089C1671FE841209C02AAC07 /* External Frameworks and Libraries */ = {
+                       isa = PBXGroup;
+                       children = (
+                               1A6250410DCBC81B006898C8 /* Cocoa.framework */,
+                               1A8C86A90EF2FB8F003F6E81 /* Quartz.framework */,
+                               1A8C87A90EF2FBB3003F6E81 /* QuartzCore.framework */,
+                       );
+                       name = "External Frameworks and Libraries";
+                       sourceTree = "<group>";
+               };
+               089C167CFE841241C02AAC07 /* Resources */ = {
+                       isa = PBXGroup;
+                       children = (
+                               1A1BA1750EF2FB3200754486 /* Composition.qtz */,
+                               8D576317048677EA00EA77CD /* Info.plist */,
+                               8D5B49A704867FD3000E48DA /* InfoPlist.strings */,
+                       );
+                       name = Resources;
+                       sourceTree = "<group>";
+               };
+               08FB77AFFE84173DC02AAC07 /* Source */ = {
+                       isa = PBXGroup;
+                       children = (
+                               1A624E580DCBC7F6006898C8 /* main.m */,
+                       );
+                       name = Source;
+                       sourceTree = "<group>";
+               };
+               19C28FB6FE9D52B211CA2CBB /* Products */ = {
+                       isa = PBXGroup;
+                       children = (
+                               8D576316048677EA00EA77CD /* NetscapeCoreAnimationPlugin.plugin */,
+                       );
+                       name = Products;
+                       sourceTree = "<group>";
+               };
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+               8D57630D048677EA00EA77CD /* NetscapeCoreAnimationPlugin */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = 149C298308902C53008A9EFC /* Build configuration list for PBXNativeTarget "NetscapeCoreAnimationPlugin" */;
+                       buildPhases = (
+                               8D576311048677EA00EA77CD /* Sources */,
+                               8D57630F048677EA00EA77CD /* Resources */,
+                               8D576313048677EA00EA77CD /* Frameworks */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                       );
+                       name = NetscapeCoreAnimationPlugin;
+                       productInstallPath = "$(HOME)/Library/Bundles";
+                       productName = NetscapeCoreAnimationPlugin;
+                       productReference = 8D576316048677EA00EA77CD /* NetscapeCoreAnimationPlugin.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 "NetscapeCoreAnimationPlugin" */;
+                       compatibilityVersion = "Xcode 2.4";
+                       hasScannedForEncodings = 1;
+                       mainGroup = 089C166AFE841209C02AAC07 /* NetscapeCoreAnimationPlugin */;
+                       projectDirPath = "";
+                       projectRoot = "";
+                       targets = (
+                               8D57630D048677EA00EA77CD /* NetscapeCoreAnimationPlugin */,
+                       );
+               };
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+               8D57630F048677EA00EA77CD /* Resources */ = {
+                       isa = PBXResourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */,
+                               1A1BA1760EF2FB3200754486 /* Composition.qtz in Resources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+               8D576311048677EA00EA77CD /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               1A624E590DCBC7F6006898C8 /* main.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 = NetscapeCoreAnimationPlugin;
+                               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 = NetscapeCoreAnimationPlugin;
+                               WRAPPER_EXTENSION = plugin;
+                       };
+                       name = Release;
+               };
+               149C298808902C53008A9EFC /* Debug */ = {
+                       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 = 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 "NetscapeCoreAnimationPlugin" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               149C298408902C53008A9EFC /* Debug */,
+                               149C298508902C53008A9EFC /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               149C298708902C53008A9EFC /* Build configuration list for PBXProject "NetscapeCoreAnimationPlugin" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               149C298808902C53008A9EFC /* Debug */,
+                               149C298908902C53008A9EFC /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+/* End XCConfigurationList section */
+       };
+       rootObject = 089C1669FE841209C02AAC07 /* Project object */;
+}
diff --git a/WebKitExamplePlugins/NetscapeCoreAnimationPlugin/main.m b/WebKitExamplePlugins/NetscapeCoreAnimationPlugin/main.m
new file mode 100644 (file)
index 0000000..b620ba5
--- /dev/null
@@ -0,0 +1,245 @@
+/*
+ IMPORTANT:  This Apple software is supplied to you by Apple Computer, 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 Computer, 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.
+ */
+
+#import <WebKit/npapi.h>
+#import <WebKit/npfunctions.h>
+#import <WebKit/npruntime.h>
+
+#import <Cocoa/Cocoa.h>
+#import <Quartz/Quartz.h>
+#import <QuartzCore/QuartzCore.h>
+
+// Browser function table
+static NPNetscapeFuncs* browser;
+
+// Structure for per-instance storage
+typedef struct PluginObject
+{
+    NPP npp;
+    
+    NPWindow window;
+    
+    QCComposition *composition;
+    CALayer *layer;
+    
+} 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);
+    
+    return NPERR_NO_ERROR;
+}
+
+NPError NPP_Destroy(NPP instance, NPSavedData** save)
+{
+    // Free per-instance storage
+    PluginObject *obj = instance->pdata;
+
+    [obj->composition release];
+    [obj->layer 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 handleMouseClick(PluginObject *obj, NPCocoaEvent *event)
+{
+}
+
+int16 NPP_HandleEvent(NPP instance, void* event)
+{
+    PluginObject *obj = instance->pdata;
+
+    NPCocoaEvent *cocoaEvent = event;
+    
+    switch(cocoaEvent->type) {
+        case NPCocoaEventMouseDown:
+            handleMouseClick(obj, cocoaEvent);
+            return 1;
+    }
+    
+    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->layer) {
+                NSString *path = [[NSBundle bundleWithIdentifier:@"com.apple.netscapecoreanimationplugin"] pathForResource:@"Composition" ofType:@"qtz"];
+                
+                obj->composition = [[QCComposition compositionWithFile:path] retain];
+                obj->layer = [[QCCompositionLayer compositionLayerWithComposition:obj->composition] retain];
+            }
+            
+            // Make sure to return a retained layer
+            *((CALayer **)value) = [obj->layer 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/NetscapeCoreAnimationPlugin/test.html b/WebKitExamplePlugins/NetscapeCoreAnimationPlugin/test.html
new file mode 100644 (file)
index 0000000..8e0b4be
--- /dev/null
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
+<html>
+<head>
+<title>Cocoa Netscape Plug-In</title>
+</head>
+<body>
+<div>
+    <embed width="400" height="400" type="test/x-netscape-core-animation-plugin"></embed>
+</div>
+</body>
+</html>