[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[mrowe at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 113a58789929324433b7209c3788ad5dc44f1140
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 3 00:47:32 2009 +0000

    Roll out r49044 as it breaks many tests.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49057 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 7f757a9..d00ee08 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,29 +1,3 @@
-2009-10-02  Anders Carlsson  <andersca at apple.com>
-
-        Reviewed by Kevin Decker and Dan Bernstein.
-
-        WebKit side of <rdar://problem/7179166>
-
-        * Plugins/Hosted/NetscapePluginInstanceProxy.h:
-        Add an m_pluginIsWaitingForDraw member variable.
-        
-        * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
-        (WebKit::NetscapePluginInstanceProxy::NetscapePluginInstanceProxy):
-        Initialize m_pluginIsWaitingForDraw.
-        
-        (WebKit::NetscapePluginInstanceProxy::invalidateRect):
-        Set m_pluginIsWaitingForDraw to true.
-        
-        (WebKit::NetscapePluginInstanceProxy::didDraw):
-        If m_pluginIsWaitingForDraw is true, call _WKPHPluginInstanceDidDraw.
-        
-        * Plugins/Hosted/WebHostedNetscapePluginView.mm:
-        (-[WebHostedNetscapePluginView drawRect:]):
-        Call didDraw.
-        
-        * Plugins/Hosted/WebKitPluginHost.defs:
-        Add PHPluginInstanceDidDraw.
-
 2009-10-02  Dave Hyatt  <hyatt at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h b/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h
index 280f161..1841afd 100644
--- a/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h
+++ b/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h
@@ -162,8 +162,6 @@ public:
 
     void resolveURL(const char* url, const char* target, data_t& resolvedURLData, mach_msg_type_number_t& resolvedURLLength);
     
-    void didDraw();
-    
     // Reply structs
     struct Reply {
         enum Type {
@@ -309,7 +307,6 @@ private:
     bool m_shouldStopSoon;
     uint32_t m_currentRequestID;
     bool m_inDestroy;
-    bool m_pluginIsWaitingForDraw;
     
     RefPtr<HostedNetscapePluginStream> m_manualStream;
 };
diff --git a/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm b/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm
index de159f4..ea3ac90 100644
--- a/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm
+++ b/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm
@@ -113,7 +113,6 @@ NetscapePluginInstanceProxy::NetscapePluginInstanceProxy(NetscapePluginHostProxy
     , m_shouldStopSoon(false)
     , m_currentRequestID(0)
     , m_inDestroy(false)
-    , m_pluginIsWaitingForDraw(false)
 {
     ASSERT(m_pluginView);
     
@@ -1286,19 +1285,9 @@ void NetscapePluginInstanceProxy::invalidateRect(double x, double y, double widt
 {
     ASSERT(m_pluginView);
     
-    m_pluginIsWaitingForDraw = true;
     [m_pluginView invalidatePluginContentRect:NSMakeRect(x, y, width, height)];
 }
 
-void NetscapePluginInstanceProxy::didDraw()
-{
-    if (!m_pluginIsWaitingForDraw)
-        return;
-    
-    m_pluginIsWaitingForDraw = false;
-    _WKPHPluginInstanceDidDraw(m_pluginHostProxy->port(), m_pluginID);
-}
-    
 bool NetscapePluginInstanceProxy::getCookies(data_t urlData, mach_msg_type_number_t urlLength, data_t& cookiesData, mach_msg_type_number_t& cookiesLength)
 {
     ASSERT(m_pluginView);
diff --git a/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm b/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm
index 34a2211..0cce014 100644
--- a/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm
+++ b/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm
@@ -330,10 +330,9 @@ extern "C" {
 {
     if (_proxy) {
         if (_softwareRenderer) {
-            if ([NSGraphicsContext currentContextDrawingToScreen]) {
+            if ([NSGraphicsContext currentContextDrawingToScreen])
                 WKSoftwareCARendererRender(_softwareRenderer, (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort], NSRectToCGRect(rect));
-                _proxy->didDraw();
-            } else
+            else
                 _proxy->print(reinterpret_cast<CGContextRef>([[NSGraphicsContext currentContext] graphicsPort]), [self bounds].size.width, [self bounds].size.height);
         }
             
diff --git a/WebKit/mac/Plugins/Hosted/WebKitPluginHost.defs b/WebKit/mac/Plugins/Hosted/WebKitPluginHost.defs
index 710aee6..41d7498 100644
--- a/WebKit/mac/Plugins/Hosted/WebKitPluginHost.defs
+++ b/WebKit/mac/Plugins/Hosted/WebKitPluginHost.defs
@@ -220,10 +220,7 @@ simpleroutine PHNPObjectEnumerate(pluginHostPort :mach_port_t;
                                   pluginID :uint32_t;
                                   requestID :uint32_t;
                                   objectID :uint32_t);
-             
-simpleroutine PHPluginInstanceDidDraw(pluginHostPort :mach_port_t;
-                                      pluginID :uint32_t);
-                              
+                                  
 // Replies
 
 simpleroutine PHBooleanReply(clientPort :mach_port_t;

-- 
WebKit Debian packaging