[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[joepeck at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 92ecb45cfc5016bb328d8df0cc97ca82378a52de
Author: joepeck at webkit.org <joepeck at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 2 18:07:24 2010 +0000

    2010-12-02  Joseph Pecoraro  <joepeck at webkit.org>
    
            Reviewed by Eric Carlson.
    
            Style Fixes in WebPluginController
            https://bugs.webkit.org/show_bug.cgi?id=50397
    
            * Plugins/WebPluginController.mm:
            (-[WebPluginController startAllPlugins]):
            (-[WebPluginController stopAllPlugins]):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73149 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 2cc9af2..9de2e2d 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-02  Joseph Pecoraro  <joepeck at webkit.org>
+
+        Reviewed by Eric Carlson.
+
+        Style Fixes in WebPluginController
+        https://bugs.webkit.org/show_bug.cgi?id=50397
+
+        * Plugins/WebPluginController.mm:
+        (-[WebPluginController startAllPlugins]):
+        (-[WebPluginController stopAllPlugins]):
+
 2010-12-02  John Sullivan  <sullivan at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/WebKit/mac/Plugins/WebPluginController.mm b/WebKit/mac/Plugins/WebPluginController.mm
index 9c037c2..c802d4c 100644
--- a/WebKit/mac/Plugins/WebPluginController.mm
+++ b/WebKit/mac/Plugins/WebPluginController.mm
@@ -174,8 +174,8 @@ static NSMutableSet *pluginViews = nil;
     if ([_views count] > 0)
         LOG(Plugins, "starting WebKit plugins : %@", [_views description]);
     
-    int i, count = [_views count];
-    for (i = 0; i < count; i++) {
+    int count = [_views count];
+    for (int i = 0; i < count; i++) {
         id aView = [_views objectAtIndex:i];
         if ([aView respondsToSelector:@selector(webPlugInStart)]) {
             JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
@@ -197,13 +197,13 @@ static NSMutableSet *pluginViews = nil;
         LOG(Plugins, "stopping WebKit plugins: %@", [_views description]);
     }
     
-    int i, count = [_views count];
-    for (i = 0; i < count; i++)
+    int viewsCount = [_views count];
+    for (int i = 0; i < viewsCount; i++)
         [self stopOnePlugin:[_views objectAtIndex:i]];
 
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    count = [_viewsNotInDocument count];
-    for (i = 0; i < count; i++)
+    int viewsNotInDocumentCount = [_viewsNotInDocument count];
+    for (int i = 0; i < viewsNotInDocumentCount; i++)
         [self stopOnePlugin:[_viewsNotInDocument objectAtIndex:i]];
 #endif
 
@@ -333,8 +333,8 @@ static void cancelOutstandingCheck(const void *item, void *context)
 
     [self _cancelOutstandingChecks];
     
-    int i, count = [_views count];
-    for (i = 0; i < count; i++) {
+    int viewsCount = [_views count];
+    for (int i = 0; i < viewsCount; i++) {
         id aView = [_views objectAtIndex:i];
         [self destroyOnePlugin:aView];
         
@@ -348,8 +348,8 @@ static void cancelOutstandingCheck(const void *item, void *context)
     }
 
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    count = [_viewsNotInDocument count];
-    for (i = 0; i < count; i++)
+    int viewsNotInDocumentCount = [_viewsNotInDocument count];
+    for (int i = 0; i < viewsNotInDocumentCount; i++)
         [self destroyOnePlugin:[_viewsNotInDocument objectAtIndex:i]];
 #endif
 

-- 
WebKit Debian packaging