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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 3b02e46364dba0669f6079366bd9cd1c188868d0
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 25 18:01:44 2002 +0000

    	Fixed: 3050665 - REGRESSION: mp3 audio loads and plays, but no progress or play control is visible
    
            * Plugins.subproj/WebPluginView.h:
            * Plugins.subproj/WebPluginView.m:
            (-[WebNetscapePluginView setNeedsLayout:]):
            (-[WebNetscapePluginView layout]):
            (-[WebNetscapePluginView drawRect:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2165 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 0b51486..9bd4edd 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-09-25  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: 3050665 - REGRESSION: mp3 audio loads and plays, but no progress or play control is visible
+
+        * Plugins.subproj/WebPluginView.h:
+        * Plugins.subproj/WebPluginView.m:
+        (-[WebNetscapePluginView setNeedsLayout:]):
+        (-[WebNetscapePluginView layout]):
+        (-[WebNetscapePluginView drawRect:]):
+
 2002-09-25  Darin Adler  <darin at apple.com>
 
 	Make the "set aside subviews" logic stronger so it can handle a display
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 0b51486..9bd4edd 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-09-25  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: 3050665 - REGRESSION: mp3 audio loads and plays, but no progress or play control is visible
+
+        * Plugins.subproj/WebPluginView.h:
+        * Plugins.subproj/WebPluginView.m:
+        (-[WebNetscapePluginView setNeedsLayout:]):
+        (-[WebNetscapePluginView layout]):
+        (-[WebNetscapePluginView drawRect:]):
+
 2002-09-25  Darin Adler  <darin at apple.com>
 
 	Make the "set aside subviews" logic stronger so it can handle a display
diff --git a/WebKit/Plugins.subproj/WebPluginView.h b/WebKit/Plugins.subproj/WebPluginView.h
index 7fb6b05..6d71d19 100644
--- a/WebKit/Plugins.subproj/WebPluginView.h
+++ b/WebKit/Plugins.subproj/WebPluginView.h
@@ -30,7 +30,7 @@
     NP_Port nPort;
     NPP_t instanceStruct;
         
-    BOOL canRestart, isHidden, isStarted, fullMode;
+    BOOL canRestart, isHidden, isStarted, fullMode, needsLayout;
             
     NSString *mime;
     NSURL *srcURL, *baseURL;
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index c029204..19f3933 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -691,6 +691,7 @@
  
 - (void)setNeedsLayout:(BOOL)flag
 {
+    needsLayout = flag;
 }
 
 - (void)layout
@@ -700,16 +701,25 @@
     [self setFrame:NSMakeRect(0, 0, superFrame.size.width, superFrame.size.height)];
     [self setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
     [self setUpWindowAndPort];
+
+    needsLayout = NO;
 }
 
 #pragma mark NSVIEW
 
 - (void)drawRect:(NSRect)rect
 {
-    if(!isStarted)
+    if(needsLayout){
+        [self layout];
+    }
+
+    if(!isStarted){
         [self start];
-    if(isStarted)
+    }
+
+    if(isStarted){
         [self sendUpdateEvent];
+    }
 }
 
 - (BOOL)isFlipped

-- 
WebKit Debian packaging