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

[mitz at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 81ac71a170dad4ca0dcb4cdab0729ea4df8ac83e
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 25 23:52:28 2010 +0000

    Non-Carbon build fix.
    
    * WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
    (WebKit::NetscapePlugin::windowFrameChanged):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70506 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 47142e5..3ccd775 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-25  Dan Bernstein  <mitz at apple.com>
+
+        Non-Carbon build fix.
+
+        * WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
+        (WebKit::NetscapePlugin::windowFrameChanged):
+
 2010-10-25  Timothy Hatcher  <timothy at apple.com>
 
         Stub out WebInspector objects and WKInspectorRef API.
diff --git a/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm b/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm
index 8532b7c..a3cfed2 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm
+++ b/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm
@@ -609,6 +609,7 @@ void NetscapePlugin::windowFrameChanged(const IntRect& windowFrame)
             // Nothing to do.
             break;
 
+#ifndef NP_NO_CARBON
         case NPEventModelCarbon: {
             Rect bounds;
             bounds.top = windowFrame.y() + windowFrame.height();
@@ -619,6 +620,7 @@ void NetscapePlugin::windowFrameChanged(const IntRect& windowFrame)
             ::SetWindowBounds(windowRef(), kWindowStructureRgn, &bounds);
             break;
         }
+#endif
 
         default:
             ASSERT_NOT_REACHED();

-- 
WebKit Debian packaging