Changeset 18997 in webkit

Timestamp:

Jan 19, 2007 7:21:32 PM (17 years ago)

Author:

kdecker

Message:

Reviewed by Adam.

Merged r10259 and r15845 from TOT to Safari-2-0-branch.

2006-08-11 Tim Omernick <​timo@apple.com>

Reviewed by Darin.

<​http://bugzilla.opendarwin.org/show_bug.cgi?id=10111> - Menu flickers over Flash content
<rdar://problem/3052546> Plugins don't work with z-index (overlapping elements, etc.)

• Plugins/WebBaseNetscapePluginView.m: (-[WebBaseNetscapePluginView saveAndSetNewPortStateForUpdate:]): Don't just clip to the dirty region for "transparent" plug-ins -- do it for all plug-ins. This is a generally useful thing to do, as it prevents the plug-in from drawing over parts of the window that have already been drawn and are not expected to be redrawn in the same update.

2005-09-13 Tim Omernick <​tomernick@apple.com>

Reviewed by Justin Garcia, Darin Adler.

• <rdar://problem/3163393> Safari does not support Windowless mode in Flash

• Plugins.subproj/WebBaseNetscapePluginView.h:

Added 'isTransparent' instance variable.

• Plugins.subproj/WebBaseNetscapePluginView.m: (-[WebBaseNetscapePluginView saveAndSetPortStateForUpdate:]):

When updating a plugin in "windowless" (transparent) mode, clip drawing to the dirty
region of the opaque ancestor. This means that a partially-transparent plugin, which
by definition does not clear its port on redraw, will not overdraw the valid parts
of its port.

(-[WebBaseNetscapePluginView sendEvent:]):

Disabled the "green debug background" for transparent plugins -- since they are not
expected to cover their entire port every redraw, this debug code makes no sense.

(-[WebBaseNetscapePluginView setVariable:value:]):

Implemented -setVariable:value:, which is called from NPN_SetValue() (previously
unimplemented).
Right now we only handle NPPVpluginTransparentBool; if we choose to handle the other
plugin variables, then we may do so here.

• Plugins.subproj/WebBaseNetscapePluginViewPrivate.h:

Added SPI for -[WebBaseNetscapePluginView setVariable:value].

• Plugins.subproj/npapi.m: (NPN_SetValue):

Implemented this function so that plugins may set state (such as window mode).

Location:

branches/Safari-2-0-branch/WebKit

Files:

• ChangeLog (modified) (3 diffs)
• Plugins.subproj/WebBaseNetscapePluginView.h (modified) (2 diffs)
• Plugins.subproj/WebBaseNetscapePluginView.m (modified) (3 diffs)
• Plugins.subproj/WebBaseNetscapePluginViewPrivate.h (modified) (2 diffs)
• Plugins.subproj/npapi.m (modified) (3 diffs)
• WebKit.xcodeproj/project.pbxproj (modified) (2 diffs)

branches/Safari-2-0-branch/WebKit/ChangeLog

@@ +1 @@
+2007-01-09  Kevin Decker  <kdecker@apple.com>
+
+       Reviewed by Adam.
+       
+       Merged r10259 and r15845 from TOT to Safari-2-0-branch.
+
+    2006-08-11  Tim Omernick  <timo@apple.com>
+
+            Reviewed by Darin.
+
+            <http://bugzilla.opendarwin.org/show_bug.cgi?id=10111> - Menu flickers over Flash content
+            <rdar://problem/3052546> Plugins don't work with z-index (overlapping elements, etc.)
+
+            * Plugins/WebBaseNetscapePluginView.m:
+            (-[WebBaseNetscapePluginView saveAndSetNewPortStateForUpdate:]):
+            Don't just clip to the dirty region for "transparent" plug-ins -- do it for all plug-ins.  This is a
+            generally useful thing to do, as it prevents the plug-in from drawing over parts of the window that
+            have already been drawn and are not expected to be redrawn in the same update.
+
+    2005-09-13  Tim Omernick  <tomernick@apple.com>
+
+            Reviewed by Justin Garcia, Darin Adler.
+
+        - <rdar://problem/3163393> Safari does not support Windowless mode in Flash
+
+            * Plugins.subproj/WebBaseNetscapePluginView.h:
+        Added 'isTransparent' instance variable.
+
+            * Plugins.subproj/WebBaseNetscapePluginView.m:      
+            (-[WebBaseNetscapePluginView saveAndSetPortStateForUpdate:]):
+        When updating a plugin in "windowless" (transparent) mode, clip drawing to the dirty
+        region of the opaque ancestor.  This means that a partially-transparent plugin, which
+        by definition does not clear its port on redraw, will not overdraw the valid parts
+        of its port.
+            (-[WebBaseNetscapePluginView sendEvent:]):
+        Disabled the "green debug background" for transparent plugins -- since they are not
+        expected to cover their entire port every redraw, this debug code makes no sense.
+            (-[WebBaseNetscapePluginView setVariable:value:]):
+        Implemented -setVariable:value:, which is called from NPN_SetValue() (previously
+        unimplemented).
+        Right now we only handle NPPVpluginTransparentBool; if we choose to handle the other
+        plugin variables, then we may do so here.
+            * Plugins.subproj/WebBaseNetscapePluginViewPrivate.h:
+        Added SPI for -[WebBaseNetscapePluginView setVariable:value].
+            * Plugins.subproj/npapi.m:
+            (NPN_SetValue):
+        Implemented this function so that plugins may set state (such as window mode).
+        
 2007-01-18  Mark Rowe  <mrowe@apple.com>
 
@@ -9904 +9952 @@
         
         Work on text-align API. Marked these bugs fixed:
-        <rdar://problem/3655380>: (Editing:Ê-alignCenter:ÊmethodÊunimplementedÊ(WebKitÊeditingÊAPI))
-        <rdar://problem/3655381>: (Editing:Ê-alignJustified:ÊmethodÊunimplementedÊ(WebKitÊeditingÊAPI))
-        <rdar://problem/3655383>: (Editing:Ê-alignLeft:ÊmethodÊunimplementedÊ(WebKitÊeditingÊAPI))
-        <rdar://problem/3655384>: (Editing:Ê-alignRight:ÊmethodÊunimplementedÊ(WebKitÊeditingÊAPI))        
+        <rdar://problem/3655380>: (Editing: -alignCenter: method unimplemented (WebKit editing API))
+        <rdar://problem/3655381>: (Editing: -alignJustified: method unimplemented (WebKit editing API))
+        <rdar://problem/3655383>: (Editing: -alignLeft: method unimplemented (WebKit editing API))
+        <rdar://problem/3655384>: (Editing: -alignRight: method unimplemented (WebKit editing API))        
         
         in favor of opening this bug:
@@ -9934 +9982 @@
         Reviewed by Ken.
         
-        - fixed <rdar://problem/3655378>: (Editing:Ê-changeDocumentBackgroundColor:Ê
-        methodÊunimplementedÊ(WebKitÊeditingÊAPI))
+        - fixed <rdar://problem/3655378>: (Editing: -changeDocumentBackgroundColor: 
+        method unimplemented (WebKit editing API))
         - made startSpeaking: actually work; previous implementation raised a DOMException
 

branches/Safari-2-0-branch/WebKit/Plugins.subproj/WebBaseNetscapePluginView.h

@@ -1 +1 @@
 /*
         WebBaseNetscapePluginView.h
-        Copyright 2002, Apple, Inc. All rights reserved.
+    Copyright 2002, Apple, Inc. All rights reserved.
 */
 
@@ -37 +37 @@
     BOOL hasFocus;
     BOOL currentEventIsUserGesture;
-
+    BOOL isTransparent;
+    
     int32 specifiedHeight;
     int32 specifiedWidth;

branches/Safari-2-0-branch/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m

@@ -297 +297 @@
         window.clipRect.right + nPort.portx, window.clipRect.bottom + nPort.porty);
     
+    // Clip to dirty region so plug-in does not draw over already-drawn regions of the window that are
+    // not going to be redrawn this update.  This forces plug-ins to play nice with z-index ordering.
+    if (forUpdate) {
+        RgnHandle viewClipRegion = NewRgn();
+        
+        // Get list of dirty rects from the opaque ancestor -- WebKit does some tricks with invalidation and
+        // display to enable z-ordering for NSViews; a side-effect of this is that only the WebHTMLView
+        // knows about the true set of dirty rects.
+        NSView *opaqueAncestor = [self opaqueAncestor];
+        const NSRect *dirtyRects;
+        int dirtyRectCount, dirtyRectIndex;
+        [opaqueAncestor getRectsBeingDrawn:&dirtyRects count:&dirtyRectCount];
+
+        for (dirtyRectIndex = 0; dirtyRectIndex < dirtyRectCount; dirtyRectIndex++) {
+            NSRect dirtyRect = [self convertRect:dirtyRects[dirtyRectIndex] fromView:opaqueAncestor];
+            if (!NSEqualSizes(dirtyRect.size, NSZeroSize)) {
+                // Create a region for this dirty rect
+                RgnHandle dirtyRectRegion = NewRgn();
+                SetRectRgn(dirtyRectRegion, NSMinX(dirtyRect), NSMinY(dirtyRect), NSMaxX(dirtyRect), NSMaxY(dirtyRect));
+                
+                // Union this dirty rect with the rest of the dirty rects
+                UnionRgn(viewClipRegion, dirtyRectRegion, viewClipRegion);
+                DisposeRgn(dirtyRectRegion);
+            }
+        }
+    
+        // Intersect the dirty region with the clip region, so that we only draw over dirty parts
+        SectRgn(clipRegion, viewClipRegion, clipRegion);
+        DisposeRgn(viewClipRegion);
+    }
+    
     portState.forUpdate = forUpdate;
     
@@ -395 +426 @@
     // Draw green to help debug.
     // If we see any green we know something's wrong.
-    if (event->what == updateEvt) {
+    if (!isTransparent && event->what == updateEvt) {
         ForeColor(greenColor);
         const Rect bigRect = { -10000, -10000, 10000, 10000 };
@@ -1780 +1811 @@
 }
 
+- (NPError)setVariable:(NPPVariable)variable value:(void *)value
+{
+    switch (variable) {
+        case NPPVpluginTransparentBool:
+        {
+            BOOL newTransparent = (value != 0);
+            
+            // Redisplay if transparency is changing
+            if (isTransparent != newTransparent)
+                [self setNeedsDisplay:YES];
+            
+            isTransparent = newTransparent;
+            
+            return NPERR_NO_ERROR;
+        }
+        
+        default:
+            return NPERR_GENERIC_ERROR;
+    }
+}
+
 @end
 

branches/Safari-2-0-branch/WebKit/Plugins.subproj/WebBaseNetscapePluginViewPrivate.h

@@ -1 +1 @@
 /*
         WebBaseNetscapePluginView.h
-        Copyright 2002, Apple, Inc. All rights reserved.
+    Copyright 2002, Apple, Inc. All rights reserved.
 */
 
@@ -24 +24 @@
 - (void)forceRedraw;
 - (NPError)getVariable:(NPNVariable)variable value:(void *)value;
+- (NPError)setVariable:(NPPVariable)variable value:(void *)value;
 @end

branches/Safari-2-0-branch/WebKit/Plugins.subproj/npapi.m

@@ -1 +1 @@
 /*
         npapi.m
-        Copyright (c) 2002, Apple, Inc. All rights reserved.
+    Copyright (c) 2002, Apple, Inc. All rights reserved.
 */
 
@@ -81 +81 @@
 }
 
-SInt32  NPN_Write(NPP instance, NPStream* stream, SInt32 len, void* buffer)
+SInt32    NPN_Write(NPP instance, NPStream* stream, SInt32 len, void* buffer)
 {
     return [pluginViewForInstance(instance) write:stream len:len buffer:buffer];
@@ -121 +121 @@
 }
 
-// Unsupported functions
 NPError NPN_SetValue(NPP instance, NPPVariable variable, void *value)
 {
-    LOG(Plugins, "NPN_SetValue");
-    return NPERR_GENERIC_ERROR;
-}       
+    return [pluginViewForInstance(instance) setVariable:variable value:value];
+}
+
+// Unsupported functions
 
 void* NPN_GetJavaEnv(void)

branches/Safari-2-0-branch/WebKit/WebKit.xcodeproj/project.pbxproj

@@ -302 +302 @@
                 DD9CC6C609FECEC600F1FCA3 /* WebPluginPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DD9CC6C509FECEC600F1FCA3 /* WebPluginPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
 /* End PBXBuildFile section */
+
+/* Begin PBXBuildStyle section */
+                0A4EC8CC0B61B19D005921FA /* Development */ = {
+                        isa = PBXBuildStyle;
+                        buildSettings = {
+                                COPY_PHASE_STRIP = NO;
+                        };
+                        name = Development;
+                };
+                0A4EC8CD0B61B19D005921FA /* Deployment */ = {
+                        isa = PBXBuildStyle;
+                        buildSettings = {
+                                COPY_PHASE_STRIP = YES;
+                        };
+                        name = Deployment;
+                };
+/* End PBXBuildStyle section */
 
 /* Begin PBXFileReference section */
@@ -1353 +1370 @@
                         isa = PBXProject;
                         buildConfigurationList = 149C283208902B0F008A9EFC /* Build configuration list for PBXProject "WebKit" */;
+                        buildSettings = {
+                        };
+                        buildStyles = (
+                                0A4EC8CC0B61B19D005921FA /* Development */,
+                                0A4EC8CD0B61B19D005921FA /* Deployment */,
+                        );
                         hasScannedForEncodings = 1;
                         knownRegions = (