Title: [209746] trunk/Source/WebKit/mac
Revision
209746
Author
[email protected]
Date
2016-12-12 16:37:40 -0800 (Mon, 12 Dec 2016)

Log Message

Remove unused workaround for Silverlight
https://bugs.webkit.org/show_bug.cgi?id=165773

Patch by Alex Christensen <[email protected]> on 2016-12-12
Reviewed by Dean Jackson.

* Plugins/WebNetscapePluginView.mm:
(-[WebNetscapePluginView _workaroundSilverlightFullscreenBug:]): Deleted.
This code was introduced in January 2010.  Microsoft fixed their bug shortly thereafter.
Allowing 6 years for users to update Silverlight is more than enough.
Safari doesn't even use WebKit1 for this any more.
I need this to be removed because this is the only non-WebGL code that needs to link against
the OpenGL framework, and I'm changing how that is done to link only through ANGLE instead.

Modified Paths

Diff

Modified: trunk/Source/WebKit/mac/ChangeLog (209745 => 209746)


--- trunk/Source/WebKit/mac/ChangeLog	2016-12-13 00:35:28 UTC (rev 209745)
+++ trunk/Source/WebKit/mac/ChangeLog	2016-12-13 00:37:40 UTC (rev 209746)
@@ -1,3 +1,18 @@
+2016-12-12  Alex Christensen  <[email protected]>
+
+        Remove unused workaround for Silverlight
+        https://bugs.webkit.org/show_bug.cgi?id=165773
+
+        Reviewed by Dean Jackson.
+
+        * Plugins/WebNetscapePluginView.mm:
+        (-[WebNetscapePluginView _workaroundSilverlightFullscreenBug:]): Deleted.
+        This code was introduced in January 2010.  Microsoft fixed their bug shortly thereafter.
+        Allowing 6 years for users to update Silverlight is more than enough.
+        Safari doesn't even use WebKit1 for this any more.
+        I need this to be removed because this is the only non-WebGL code that needs to link against
+        the OpenGL framework, and I'm changing how that is done to link only through ANGLE instead.
+
 2016-12-12  Chris Dumez  <[email protected]>
 
         Document.visibilityState should use an IDL string enumeration

Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm (209745 => 209746)


--- trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm	2016-12-13 00:35:28 UTC (rev 209745)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm	2016-12-13 00:37:40 UTC (rev 209746)
@@ -86,7 +86,6 @@
 #define LoginWindowDidSwitchFromUserNotification    @"WebLoginWindowDidSwitchFromUserNotification"
 #define LoginWindowDidSwitchToUserNotification      @"WebLoginWindowDidSwitchToUserNotification"
 #define WKNVSupportsCompositingCoreAnimationPluginsBool 74656  /* TRUE if the browser supports hardware compositing of Core Animation plug-ins  */
-static const int WKNVSilverlightFullscreenPerformanceIssueFixed = 7288546; /* TRUE if Siverlight addressed its underlying  bug in <rdar://problem/7288546> */
 
 using namespace WebCore;
 using namespace WebKit;
@@ -2236,37 +2235,6 @@
     return NO;
 }
 
-// Work around Silverlight full screen performance issue by maintaining an accelerated GL pixel format.
-// We can safely remove it at some point in the future when both:
-// 1) Microsoft releases a genuine fix for 7288546.
-// 2) Enough Silverlight users update to the new Silverlight.
-// For now, we'll distinguish older broken versions of Silverlight by asking the plug-in if it resolved its full screen badness.
-- (void)_workaroundSilverlightFullscreenBug:(BOOL)initializedPlugin
-{
-    ASSERT(_isSilverlight);
-    NPBool isFullscreenPerformanceIssueFixed = 0;
-    NPPluginFuncs *pluginFuncs = [_pluginPackage.get() pluginFuncs];
-    if (pluginFuncs->getvalue && pluginFuncs->getvalue(plugin, static_cast<NPPVariable>(WKNVSilverlightFullscreenPerformanceIssueFixed), &isFullscreenPerformanceIssueFixed) == NPERR_NO_ERROR && isFullscreenPerformanceIssueFixed)
-        return;
-    
-    static CGLPixelFormatObj pixelFormatObject = 0;
-    static unsigned refCount = 0;
-    
-    if (initializedPlugin) {
-        refCount++;
-        if (refCount == 1) {
-            const CGLPixelFormatAttribute attributes[] = { kCGLPFAAccelerated, static_cast<CGLPixelFormatAttribute>(0) };
-            GLint npix;
-            CGLChoosePixelFormat(attributes, &pixelFormatObject, &npix);
-        }  
-    } else {
-        ASSERT(pixelFormatObject);
-        refCount--;
-        if (!refCount) 
-            CGLReleasePixelFormat(pixelFormatObject);
-    }
-}
-
 - (NPError)_createPlugin
 {
     plugin = (NPP)calloc(1, sizeof(NPP_t));
@@ -2283,8 +2251,6 @@
     [[self class] setCurrentPluginView:self];
     NPError npErr = [_pluginPackage.get() pluginFuncs]->newp((char *)[_MIMEType.get() cString], plugin, _mode, argsCount, cAttributes, cValues, NULL);
     [[self class] setCurrentPluginView:nil];
-    if (_isSilverlight)
-        [self _workaroundSilverlightFullscreenBug:YES];
     LOG(Plugins, "NPP_New: %d", npErr);
     return npErr;
 }
@@ -2291,9 +2257,6 @@
 
 - (void)_destroyPlugin
 {
-    if (_isSilverlight)
-        [self _workaroundSilverlightFullscreenBug:NO];
-    
     NPError npErr;
     npErr = ![_pluginPackage.get() pluginFuncs]->destroy(plugin, NULL);
     LOG(Plugins, "NPP_Destroy: %d", npErr);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to