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

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit ec270c95fc8c0269e756a96ad7fd66fe322e649b
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 18 19:46:50 2010 +0000

    Fix build.
    
    * WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
    (WebKit::NetscapePlugin::platformHandleMouseEnterEvent):
    (WebKit::NetscapePlugin::platformHandleMouseLeaveEvent):
    (WebKit::NetscapePlugin::platformSetFocus):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69985 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index a8470d1..97746c4 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,14 @@
 2010-10-18  Anders Carlsson  <andersca at apple.com>
 
+        Fix build.
+
+        * WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
+        (WebKit::NetscapePlugin::platformHandleMouseEnterEvent):
+        (WebKit::NetscapePlugin::platformHandleMouseLeaveEvent):
+        (WebKit::NetscapePlugin::platformSetFocus):
+
+2010-10-18  Anders Carlsson  <andersca at apple.com>
+
         Reviewed by Darin Adler.
 
         Add matchCountDidChange callback
diff --git a/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm b/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm
index b44e59f..8eab800 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm
+++ b/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm
@@ -442,7 +442,7 @@ bool NetscapePlugin::platformHandleMouseEnterEvent(const WebMouseEvent& mouseEve
 
 #ifndef NP_NO_CARBON
         case NPEventModelCarbon: {
-            EventRecord eventRecord = initializeEventRecord(adjustCursorEvent);
+            EventRecord eventRecord = initializeEventRecord(NPEventType_AdjustCursorEvent);
             eventRecord.modifiers = modifiersForEvent(mouseEvent);
             
             return NPP_HandleEvent(&eventRecord);
@@ -468,7 +468,7 @@ bool NetscapePlugin::platformHandleMouseLeaveEvent(const WebMouseEvent& mouseEve
 
 #ifndef NP_NO_CARBON
         case NPEventModelCarbon: {
-            EventRecord eventRecord = initializeEventRecord(adjustCursorEvent);
+            EventRecord eventRecord = initializeEventRecord(NPEventType_AdjustCursorEvent);
             eventRecord.modifiers = modifiersForEvent(mouseEvent);
             
             return NPP_HandleEvent(&eventRecord);
@@ -552,7 +552,7 @@ void NetscapePlugin::platformSetFocus(bool hasFocus)
 
 #ifndef NP_NO_CARBON
         case NPEventModelCarbon: {
-            EventRecord event = initializeEventRecord(hasFocus ? getFocusEvent : loseFocusEvent);
+            EventRecord event = initializeEventRecord(hasFocus ? NPEventType_GetFocusEvent : NPEventType_LoseFocusEvent);
 
             NPP_HandleEvent(&event);
             break;

-- 
WebKit Debian packaging