[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 2f9502683f8dd1d33417b65c0ed57a53bf3607c2
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jun 14 00:46:41 2003 +0000

            Reviewed by Chris.
    
            - fixed 3291778 -- REGRESSION (51-52): QT controller never shows up for mp3 in frame
    
            * Plugins.subproj/WebBaseNetscapePluginView.m:
            (-[WebBaseNetscapePluginView saveAndSetPortStateForUpdate:]):
            Handle the "invisible" plug-in cases in a more complete way.
            Detect the various ways of being invisible (big negative X value, 0 size,
            not really in a window) and in all those cases, use a clip rect to guarantee
            we won't be seen, and make sure the size passed to the plug-in is *not* 0.
    
            * English.lproj/StringsNotToBeLocalized.txt: Updated for recent changes.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4546 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 751c1eb..d5a6fb3 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2003-06-13  Darin Adler  <darin at apple.com>
+
+        Reviewed by Chris.
+
+        - fixed 3291778 -- REGRESSION (51-52): QT controller never shows up for mp3 in frame
+
+        * Plugins.subproj/WebBaseNetscapePluginView.m:
+        (-[WebBaseNetscapePluginView saveAndSetPortStateForUpdate:]):
+        Handle the "invisible" plug-in cases in a more complete way.
+        Detect the various ways of being invisible (big negative X value, 0 size,
+        not really in a window) and in all those cases, use a clip rect to guarantee
+        we won't be seen, and make sure the size passed to the plug-in is *not* 0.
+
+        * English.lproj/StringsNotToBeLocalized.txt: Updated for recent changes.
+
 2003-06-13  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3291319, scrolling is much worse since 79.  The problem
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index 876e573..50ff478 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -24,6 +24,7 @@
 "/tmp/XXXXXX.tiff"
 "0x0"
 "1"
+"1.0.0"
 "1.00"
 "1000"
 "13"
@@ -47,6 +48,7 @@
 "AppleFontSmoothing"
 "BP_CreatePluginMIMETypesPreferences"
 "BufferTextDrawing"
+"CFBundleVersion"
 "Content-Length"
 "Courier"
 "DOCBASE"
@@ -247,6 +249,8 @@
 "audio/mp4"
 "com.RealNetworks.RealOne Player"
 "com.apple.HIWebView"
+"com.apple.JavaAppletPlugin"
+"com.apple.JavaPluginCocoa"
 "com.apple.WebKit"
 "com.apple.hiview"
 "displayTitle"
@@ -288,6 +292,7 @@ Plugins.subproj/WebBaseNetscapePluginView.m:"width"
 Plugins.subproj/WebBasePluginPackage.m:"name: %@\npath: %@\nmimeTypes:\n%@\npluginDescription:%@"
 Plugins.subproj/WebNetscapePluginPackage.m:"RealPlayer Plugin"
 Plugins.subproj/WebNetscapePluginPackage.m:"main"
+Plugins.subproj/WebPluginDatabase.m:"Java Applet Plugin Enabler"
 WebCoreSupport.subproj/WebBridge.m:"height"
 WebCoreSupport.subproj/WebBridge.m:"width"
 WebCoreSupport.subproj/WebCookieAdapter.m:"Cookie"
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index 762d052..3306fa9 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -188,21 +188,36 @@ typedef struct {
     
     window.x = (int32)boundsInWindow.origin.x; 
     window.y = (int32)boundsInWindow.origin.y;
-    window.width = NSWidth(boundsInWindow) > 0 ? NSWidth(boundsInWindow) : specifiedWidth;
-    window.height = NSHeight(boundsInWindow) > 0 ? NSHeight(boundsInWindow) : specifiedHeight;
+    window.width = NSWidth(boundsInWindow);
+    window.height = NSHeight(boundsInWindow);
 
     window.clipRect.top = (uint16)visibleRectInWindow.origin.y;
     window.clipRect.left = (uint16)visibleRectInWindow.origin.x;
+    window.clipRect.bottom = (uint16)(visibleRectInWindow.origin.y + visibleRectInWindow.size.height);
+    window.clipRect.right = (uint16)(visibleRectInWindow.origin.x + visibleRectInWindow.size.width);
+
+    // Clip out the plug-in when it's not really in a window or off screen or has no height or width.
+    // The "big negative number" technique is how WebCore expresses off-screen widgets.
+    if (window.width <= 0 || window.height <= 0 || window.x < -100000 || [self window] == nil) {
+        // The following code tries to give plug-ins the same size they will eventually have.
+        // The specifiedWidth and specifiedHeight variables are used to predict the size that
+        // WebCore will eventually resize us to.
+
+        // The QuickTime plug-in has problems if you give it a width or height of 0.
+        // Since other plug-ins also might have the same sort of trouble, we make sure
+        // to always give plug-ins a size other than 0,0.
+
+        if (window.width <= 0) {
+            window.width = specifiedWidth > 0 ? specifiedWidth : 100;
+        }
+        if (window.height <= 0) {
+            window.height = specifiedHeight > 0 ? specifiedHeight : 100;
+        }
 
-    // Clip out the plug-in when it's not really in a window.
-    if ([self window]) {
-        window.clipRect.bottom = (uint16)(visibleRectInWindow.origin.y + visibleRectInWindow.size.height);
-        window.clipRect.right = (uint16)(visibleRectInWindow.origin.x + visibleRectInWindow.size.width);
-    } else {
         window.clipRect.bottom = window.clipRect.top;
         window.clipRect.left = window.clipRect.right;
     }
-    
+
     window.type = NPWindowTypeWindow;
     
     // Save the port state.

-- 
WebKit Debian packaging