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

[mrowe at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 821716ef0657eb725324c8ef47be364f07c9a6df
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 28 08:08:09 2010 +0000

    32-bit build fix.
    
    Qualify references to Rect to avoid ambiguity between WebCore::Rect and Carbon's Rect.
    
    * WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
    (WebKit::NetscapePlugin::platformPostInitialize):
    (WebKit::NetscapePlugin::windowFrameChanged):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70756 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index a8dde35..1a11c87 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-28  Mark Rowe  <mrowe at apple.com>
+
+        32-bit build fix.
+
+        Qualify references to Rect to avoid ambiguity between WebCore::Rect and Carbon's Rect.
+
+        * WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
+        (WebKit::NetscapePlugin::platformPostInitialize):
+        (WebKit::NetscapePlugin::windowFrameChanged):
+
 2010-10-28  Ivan Krstić  <ike at apple.com>
 
         Reviewed by Mark Rowe.
diff --git a/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm b/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm
index 0d18fee..1d908d8 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm
+++ b/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm
@@ -130,17 +130,17 @@ bool NetscapePlugin::platformPostInitialize()
 #ifndef NP_NO_CARBON
     if (m_eventModel == NPEventModelCarbon) {
         // Initialize the fake Carbon window.
-        Rect bounds = { 0, 0, 0, 0 };
+        ::Rect bounds = { 0, 0, 0, 0 };
         CreateNewWindow(kDocumentWindowClass, 0, &bounds, reinterpret_cast<WindowRef*>(&m_npCGContext.window));
         ASSERT(m_npCGContext.window);
-        
+
         // FIXME: Disable the backing store.
-        
+
         m_npWindow.window = &m_npCGContext;
 
         // Start the null event timer.
         // FIXME: Throttle null events when the plug-in isn't visible on screen.
-        m_nullEventTimer.startRepeating(nullEventIntervalActive);        
+        m_nullEventTimer.startRepeating(nullEventIntervalActive);
     }
 #endif
 
@@ -611,12 +611,12 @@ void NetscapePlugin::windowFrameChanged(const IntRect& windowFrame)
 
 #ifndef NP_NO_CARBON
         case NPEventModelCarbon: {
-            Rect bounds;
+            ::Rect bounds;
             bounds.top = windowFrame.y() + windowFrame.height();
             bounds.left = windowFrame.x();
             bounds.right = windowFrame.right();
             bounds.bottom = windowFrame.y();
-            
+
             ::SetWindowBounds(windowRef(), kWindowStructureRgn, &bounds);
             break;
         }

-- 
WebKit Debian packaging