Changeset 13030 in webkit

Timestamp:

Feb 27, 2006 5:17:05 PM (18 years ago)

Author:

tomernic

Message:

Reviewed by Adele.

<rdar://problem/4222043> Safari should reduce null events sent to invisible plugins

• Plugins/WebBaseNetscapePluginView.h:
• Plugins/WebBaseNetscapePluginView.m: (-[WebBaseNetscapePluginView restartNullEvents]): Check to see if the plugin view is completely obscured (scrolled out of view, for example). If it is obscured and it wasn't before, or the other way around, then restart the null event timer so it can fire at the appropriate rate. (-[WebBaseNetscapePluginView viewHasMoved:]): If a plugin is obscured, send it null events as if it were in an inactive window.

Location:

trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Plugins/WebBaseNetscapePluginView.h (modified) (1 diff)
• Plugins/WebBaseNetscapePluginView.m (modified) (3 diffs)

trunk/WebKit/ChangeLog

@@ +1 @@
+2006-02-27  Tim Omernick  <timo@apple.com>
+
+        Reviewed by Adele.
+
+        <rdar://problem/4222043> Safari should reduce null events sent to invisible plugins
+
+        * Plugins/WebBaseNetscapePluginView.h:
+        * Plugins/WebBaseNetscapePluginView.m:
+        (-[WebBaseNetscapePluginView restartNullEvents]):
+        Check to see if the plugin view is completely obscured (scrolled out of view, for example).  If it is
+        obscured and it wasn't before, or the other way around, then restart the null event timer so it can
+        fire at the appropriate rate.
+        (-[WebBaseNetscapePluginView viewHasMoved:]):
+        If a plugin is obscured, send it null events as if it were in an inactive window.
+
 2006-02-26  Mitz Pettel  <opendarwin.org@mitzpettel.com>
 

trunk/WebKit/Plugins/WebBaseNetscapePluginView.h

@@ -61 +61 @@
     BOOL currentEventIsUserGesture;
     BOOL isTransparent;
+    BOOL isCompletelyObscured;
     
     int32 specifiedHeight;

trunk/WebKit/Plugins/WebBaseNetscapePluginView.m

@@ -531 +531 @@
     ASSERT([self window]);
     
-    if (nullEventTimer) {
+    if (nullEventTimer)
         [self stopNullEvents];
-    }
-    
-    if ([[self window] isMiniaturized]) {
+    
+    if ([[self window] isMiniaturized])
         return;
-    }
 
     NSTimeInterval interval;
@@ -543 +541 @@
     // Send null events less frequently when the actual window is not key.  Also, allow the DB
     // to override this behavior and send full speed events to non key windows.
-    if ([[self window] isKeyWindow] || [[self webView] _dashboardBehavior:WebDashboardBehaviorAlwaysSendActiveNullEventsToPlugIns]) {
+    // If the plugin is completely obscured (scrolled out of view, for example), then we will
+    // send null events at a reduced rate.
+    if (!isCompletelyObscured && ([[self window] isKeyWindow] || [[self webView] _dashboardBehavior:WebDashboardBehaviorAlwaysSendActiveNullEventsToPlugIns]))
         interval = NullEventIntervalActive;
-    } else {
+    else
         interval = NullEventIntervalNotActive;
-    }
     
     nullEventTimer = [[NSTimer scheduledTimerWithTimeInterval:interval
@@ -1338 +1337 @@
     [self updateAndSetWindow];
     [self resetTrackingRect];
+    
+    // Check to see if the plugin view is completely obscured (scrolled out of view, for example).
+    // For performance reasons, we send null events at a lower rate to plugins which are obscured.
+    BOOL oldIsObscured = isCompletelyObscured;
+    isCompletelyObscured = NSEqualSizes([self visibleRect].size, NSZeroSize);
+    if (isCompletelyObscured != oldIsObscured)
+        [self restartNullEvents];
 }