2009-02-18 Anders Carlsson <andersca@apple.com>

        Reviewed by Sam Weinig.

        Fix for <rdar://problem/6542390>

        There's no need to call setDefersLoading here - we already defer anything a plug-in can do that
        would cause a load to begin.

        * Plugins/WebNetscapePluginView.mm:
        (-[WebNetscapePluginView sendEvent:isDrawRect:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@41070 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index e9a77a9453016d9f2bbf68b6dfcef8e5deb61ade..8c159f5c27b60444a696345ad96c6d15b37cb127 100644 (file)
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,15 @@
+2009-02-18  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Fix for <rdar://problem/6542390>
+        
+        There's no need to call setDefersLoading here - we already defer anything a plug-in can do that
+        would cause a load to begin.
+        
+        * Plugins/WebNetscapePluginView.mm:
+        (-[WebNetscapePluginView sendEvent:isDrawRect:]):
+
 2009-02-18  Adam Roben  <aroben@apple.com>
 
         Add SPI to get WebKit's custom pointing-hand cursor

diff --git a/WebKit/mac/Plugins/WebNetscapePluginView.mm b/WebKit/mac/Plugins/WebNetscapePluginView.mm
index fd54ef3e9cdb3a33917ea1c27c02cde1be37fc87..e269f90808ef4d1c9c08feb6cbededc38a03eeae 100644 (file)
--- a/WebKit/mac/Plugins/WebNetscapePluginView.mm
+++ b/WebKit/mac/Plugins/WebNetscapePluginView.mm
@@ -623,10 +623,6 @@ static inline void getNPRect(const NSRect& nr, NPRect& npr)
     if (!page)
         return NO;
 
-    bool wasDeferring = page->defersLoading();
-    if (!wasDeferring)
-        page->setDefersLoading(true);
-
     // Can only send drawRect (updateEvt) to CoreGraphics plugins when actually drawing
     ASSERT((drawingModel != NPDrawingModelCoreGraphics) || !eventIsDrawRect || [NSView focusView] == self);
     
@@ -670,9 +666,6 @@ static inline void getNPRect(const NSRect& nr, NPRect& npr)
             free(portState);
     }
 
-    if (!wasDeferring)
-        page->setDefersLoading(false);
-            
     return acceptedEvent;
 }