[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 2a13722439cce915529dfacdd732b88b61c9f2c6
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue May 21 17:25:23 2002 +0000

            Move the tracking rect after the view has moved.
    
            * Plugins.subproj/IFPluginView.mm:
            (-[IFPluginView viewHasMoved:]):
    
            Fixed logging.
    
            * Plugins.subproj/npapi.m:
            (NPN_UserAgent):
            (NPN_MemAlloc):
            (NPN_MemFree):
            (NPN_MemFlush):
            (NPN_ReloadPlugins):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1187 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8d3f19d..cffab64 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,19 @@
+2002-05-21  Chris Blumenberg  <cblu at apple.com>
+
+	Move the tracking rect after the view has moved.
+
+	* Plugins.subproj/IFPluginView.mm:
+	(-[IFPluginView viewHasMoved:]):
+
+	Fixed logging.
+
+	* Plugins.subproj/npapi.m:
+	(NPN_UserAgent):
+	(NPN_MemAlloc):
+	(NPN_MemFree):
+	(NPN_MemFlush):
+	(NPN_ReloadPlugins):
+
 2002-05-21  Kenneth Kocienda  <kocienda at apple.com>
 
         Merged these four include files into the precompiled header.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 8d3f19d..cffab64 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,19 @@
+2002-05-21  Chris Blumenberg  <cblu at apple.com>
+
+	Move the tracking rect after the view has moved.
+
+	* Plugins.subproj/IFPluginView.mm:
+	(-[IFPluginView viewHasMoved:]):
+
+	Fixed logging.
+
+	* Plugins.subproj/npapi.m:
+	(NPN_UserAgent):
+	(NPN_MemAlloc):
+	(NPN_MemFree):
+	(NPN_MemFlush):
+	(NPN_ReloadPlugins):
+
 2002-05-21  Kenneth Kocienda  <kocienda at apple.com>
 
         Merged these four include files into the precompiled header.
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index 587d561..51171d3 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -513,6 +513,10 @@ static char *newCString(NSString *string)
 {
     [self sendUpdateEvent];
     [self setWindow];
+    
+    // reset the tracking rect
+    [self removeTrackingRect:trackingTag];
+    trackingTag = [self addTrackingRect:[self bounds] owner:self userData:nil assumeInside:NO];
 }
 
 -(void) windowBecameKey:(NSNotification *)notification
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index 587d561..51171d3 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -513,6 +513,10 @@ static char *newCString(NSString *string)
 {
     [self sendUpdateEvent];
     [self setWindow];
+    
+    // reset the tracking rect
+    [self removeTrackingRect:trackingTag];
+    trackingTag = [self addTrackingRect:[self bounds] owner:self userData:nil assumeInside:NO];
 }
 
 -(void) windowBecameKey:(NSNotification *)notification
diff --git a/WebKit/Plugins.subproj/npapi.m b/WebKit/Plugins.subproj/npapi.m
index 44b01e4..7d86ed5 100644
--- a/WebKit/Plugins.subproj/npapi.m
+++ b/WebKit/Plugins.subproj/npapi.m
@@ -47,33 +47,33 @@
 
 const char* NPN_UserAgent(NPP instance)
 {
-    WEBKITDEBUG("NPN_UserAgent\n");
+    WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_UserAgent\n");
     return "IE";
 }
 
 void* NPN_MemAlloc(UInt32 size)
 {
-    //WEBKITDEBUG("NPN_MemAlloc\n");
+    //WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_MemAlloc\n");
     return malloc(size);
 
 }
 
 void NPN_MemFree(void* ptr)
 {
-    //WEBKITDEBUG("NPN_MemFree\n");
+    //WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_MemFree\n");
     free(ptr);
 
 }
 
 UInt32 NPN_MemFlush(UInt32 size)
 {
-    WEBKITDEBUG("NPN_MemFlush\n");
+    WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_MemFlush\n");
     return 0;
 }
 
 void NPN_ReloadPlugins(NPBool reloadPages)
 {
-    WEBKITDEBUG("NPN_ReloadPlugins\n");
+    WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_ReloadPlugins\n");
 
 }
 

-- 
WebKit Debian packaging