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

[ddkilzer at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 88b909203a0e2e0aa6d88250b60e0404d28a38fa
Author: ddkilzer at apple.com <ddkilzer at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 19 22:52:40 2010 +0000

    BUILD FIX: Fix Mac build after Windows WebKit2 changes for Netscape Plug-ins
    
    WebCore:
    
    * WebCore.exp.in:
    (WebCore::ScrollView::contentsToWindow): Added export.
    
    WebKit2:
    
    * WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
    (WebKit::NetscapePlugin::platformPaint): Changed frameRect() to
    m_frameRect.
    
    WebKitTools:
    
    * MiniBrowser/mac/BrowserWindowController.m:
    (decidePolicyForNavigationAction): Updated method signature.
    (decidePolicyForNewWindowAction): Updated method signature.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65713 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 32065e2..bdd7a8a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,12 @@
 2010-08-19  David Kilzer  <ddkilzer at apple.com>
 
+        BUILD FIX: Fix Mac build after Windows WebKit2 changes for Netscape Plug-ins
+
+        * WebCore.exp.in:
+        (WebCore::ScrollView::contentsToWindow): Added export.
+
+2010-08-19  David Kilzer  <ddkilzer at apple.com>
+
         BUILD FIX #3: <http://webkit.org/b/44285> Fix compilation with NETSCAPE_PLUGIN_API disabled
 
         Still trying to make Qt Linux Release minimal buildbot happy.
diff --git a/WebCore/WebCore.exp.in b/WebCore/WebCore.exp.in
index 00f273f..07c9ed1 100644
--- a/WebCore/WebCore.exp.in
+++ b/WebCore/WebCore.exp.in
@@ -1284,6 +1284,7 @@ __ZN3JSC8Bindings8InstanceD2Ev
 __ZN7WebCore13IdentifierRep7isValidEPS0_
 __ZN7WebCore16ScriptController16createRootObjectEPv
 __ZNK3JSC8Bindings13RuntimeObject12defaultValueEPNS_9ExecStateENS_22PreferredPrimitiveTypeE
+__ZNK7WebCore10ScrollView16contentsToWindowERKNS_8IntPointE
 __ZTVN3JSC13RuntimeMethodE
 #endif
 
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index ce564ae..4e5accd 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-19  David Kilzer  <ddkilzer at apple.com>
+
+        BUILD FIX: Fix Mac build after Windows WebKit2 changes for Netscape Plug-ins
+
+        * WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
+        (WebKit::NetscapePlugin::platformPaint): Changed frameRect() to
+        m_frameRect.
+
 2010-08-19  Adam Roben  <aroben at apple.com>
 
         Send mouse events to windowless plugins on Windows
diff --git a/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm b/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm
index 3348adc..438341d 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm
+++ b/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm
@@ -138,7 +138,7 @@ static inline NPCocoaEvent initializeEvent(NPCocoaEventType type)
 void NetscapePlugin::platformPaint(GraphicsContext* context, const IntRect& dirtyRect)
 {
     // Translate the context so that the origin is at the top left corner of the plug-in view.
-    context->translate(frameRect().x(), frameRect().y());
+    context->translate(m_frameRect.x(), m_frameRect.y());
 
     switch (m_eventModel) {
         case NPEventModelCocoa: {
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 2f784b0..cf983de 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-19  David Kilzer  <ddkilzer at apple.com>
+
+        BUILD FIX: Fix Mac build after Windows WebKit2 changes for Netscape Plug-ins
+
+        * MiniBrowser/mac/BrowserWindowController.m:
+        (decidePolicyForNavigationAction): Updated method signature.
+        (decidePolicyForNewWindowAction): Updated method signature.
+
 2010-08-19  Adam Roben  <aroben at apple.com>
 
         Test that NP_Initialize and NP_GetEntryPoints are called in the
diff --git a/WebKitTools/MiniBrowser/mac/BrowserWindowController.m b/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
index 9842448..e3eefc5 100644
--- a/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
+++ b/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
@@ -236,13 +236,13 @@ static void didChangeBackForwardList(WKPageRef page, const void *clientInfo)
 
 #pragma mark Policy Client Callbacks
 
-static void decidePolicyForNavigationAction(WKPageRef page, WKFrameNavigationType navigationType, WKURLRef url, WKFrameRef frame, WKFramePolicyListenerRef listener, const void *clientInfo)
+static void decidePolicyForNavigationAction(WKPageRef page, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKURLRef url, WKFrameRef frame, WKFramePolicyListenerRef listener, const void *clientInfo)
 {
     LOG(@"decidePolicyForNavigationAction");
     WKFramePolicyListenerUse(listener);
 }
 
-static void decidePolicyForNewWindowAction(WKPageRef page, WKFrameNavigationType navigationType, WKURLRef url, WKFrameRef frame, WKFramePolicyListenerRef listener, const void *clientInfo)
+static void decidePolicyForNewWindowAction(WKPageRef page, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKURLRef url, WKFrameRef frame, WKFramePolicyListenerRef listener, const void *clientInfo)
 {
     LOG(@"decidePolicyForNewWindowAction");
     WKFramePolicyListenerUse(listener);

-- 
WebKit Debian packaging