Changeset 20077 in webkit

Timestamp:

Mar 8, 2007 7:02:08 PM (17 years ago)

Author:

bdash

Message:

2007-03-08 Bruce Q Hammond <​bruceq@apple.om>

Reviewed by Darin.

Fix for ​http://bugs.webkit.org/show_bug.cgi?id=13009
Console spews "CGContextGetType: invalid context" non-stop on web site

• Plugins/WebBaseNetscapePluginView.mm: (-[WebBaseNetscapePluginView saveAndSetNewPortStateForUpdate:]): (-[WebBaseNetscapePluginView restorePortState:]):

Location:

trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Plugins/WebBaseNetscapePluginView.mm (modified) (2 diffs)

trunk/WebKit/ChangeLog

@@ +1 @@
+2007-03-08  Bruce Q Hammond  <bruceq@apple.om>
+
+        Reviewed by Darin.
+
+        Fix for http://bugs.webkit.org/show_bug.cgi?id=13009
+        Console spews "CGContextGetType: invalid context" non-stop on web site
+
+        * Plugins/WebBaseNetscapePluginView.mm:
+        (-[WebBaseNetscapePluginView saveAndSetNewPortStateForUpdate:]):
+        (-[WebBaseNetscapePluginView restorePortState:]):
+
 2007-03-08  Mark Rowe  <mrowe@apple.com>
 

trunk/WebKit/Plugins/WebBaseNetscapePluginView.mm

@@ -398 +398 @@
             CGContextRef currentContext = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
             // If the current context is an offscreen bitmap, then we create a GWorld for it
-            bool offScreenContext = WKCGContextIsBitmapContext(currentContext);
+            bool offScreenContext = currentContext && WKCGContextIsBitmapContext(currentContext);
             if (offScreenContext) {
                 CGBitmapInfo contextBitmapInfo = CGBitmapContextGetBitmapInfo(currentContext);
@@ -603 +603 @@
             // If the current context is an offscreen bitmap, then we need to
             // dispose its GWorld and restore the Window's GWorld
-            if (WKCGContextIsBitmapContext(currentContext)) {
+            if (currentContext && WKCGContextIsBitmapContext(currentContext)) {
                 GWorldPtr curGWorld;
                 GetGWorld(&curGWorld, NULL);