[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 14:43:40 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 6208a9fecb1ba8d13f5eca8d1628fd05880050de
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 18 18:54:06 2010 +0000
2010-10-18 Stuart Morgan <stuartmorgan at chromium.org>
Reviewed by Eric Seidel.
Switch to using the new Carbon NPAPI event declarations, and remove
the old ones.
https://bugs.webkit.org/show_bug.cgi?id=40784
* bridge/npapi.h:
* plugins/mac/PluginViewMac.mm:
(WebCore::PluginView::setFocus):
(WebCore::PluginView::handleMouseEvent):
2010-10-18 Stuart Morgan <stuartmorgan at chromium.org>
Reviewed by Eric Seidel.
Switch to using the new Carbon NPAPI event declarations, and remove
the old ones.
https://bugs.webkit.org/show_bug.cgi?id=40784
* Plugins/WebNetscapePluginEventHandlerCarbon.mm:
(WebNetscapePluginEventHandlerCarbon::mouseEntered):
(WebNetscapePluginEventHandlerCarbon::mouseExited):
(WebNetscapePluginEventHandlerCarbon::mouseMoved):
(WebNetscapePluginEventHandlerCarbon::focusChanged):
2010-10-18 Stuart Morgan <stuartmorgan at chromium.org>
Reviewed by Eric Seidel.
Switch to using the new Carbon NPAPI event declarations, and remove
the old ones.
https://bugs.webkit.org/show_bug.cgi?id=40784
* DumpRenderTree/TestNetscapePlugIn/main.cpp:
(handleEventCarbon):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69979 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6d264bc..97c043f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-18 Stuart Morgan <stuartmorgan at chromium.org>
+
+ Reviewed by Eric Seidel.
+
+ Switch to using the new Carbon NPAPI event declarations, and remove
+ the old ones.
+
+ https://bugs.webkit.org/show_bug.cgi?id=40784
+
+ * bridge/npapi.h:
+ * plugins/mac/PluginViewMac.mm:
+ (WebCore::PluginView::setFocus):
+ (WebCore::PluginView::handleMouseEvent):
+
2010-10-18 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Yury Semikhatsky.
diff --git a/WebCore/bridge/npapi.h b/WebCore/bridge/npapi.h
index 69c61e6..b2fde12 100644
--- a/WebCore/bridge/npapi.h
+++ b/WebCore/bridge/npapi.h
@@ -676,10 +676,6 @@ enum NPEventType {
NPEventType_ScrollingBeginsEvent = 1000,
NPEventType_ScrollingEndsEvent
};
-/* Obsolete versions of the above */
-#define getFocusEvent (osEvt + 16)
-#define loseFocusEvent (osEvt + 17)
-#define adjustCursorEvent (osEvt + 18)
#endif /* NP_NO_CARBON */
#endif /* XP_MACOSX */
diff --git a/WebCore/plugins/mac/PluginViewMac.mm b/WebCore/plugins/mac/PluginViewMac.mm
index e0ad135..aef9420 100644
--- a/WebCore/plugins/mac/PluginViewMac.mm
+++ b/WebCore/plugins/mac/PluginViewMac.mm
@@ -359,7 +359,7 @@ void PluginView::setFocus(bool focused)
#ifndef NP_NO_CARBON
EventRecord record;
- record.what = getFocusEvent;
+ record.what = NPEventType_GetFocusEvent;
record.message = 0;
record.when = TickCount();
record.where = globalMousePosForPlugin();
@@ -576,9 +576,9 @@ void PluginView::handleMouseEvent(MouseEvent* event)
m_lastMousePos = mousePosForPlugin(event);
return;
} else if (event->type() == eventNames().mouseoverEvent) {
- record.what = adjustCursorEvent;
+ record.what = NPEventType_AdjustCursorEvent;
} else if (event->type() == eventNames().mouseoutEvent) {
- record.what = adjustCursorEvent;
+ record.what = NPEventType_AdjustCursorEvent;
} else if (event->type() == eventNames().mousedownEvent) {
record.what = mouseDown;
// The plugin needs focus to receive keyboard events
@@ -600,7 +600,7 @@ void PluginView::handleMouseEvent(MouseEvent* event)
record.modifiers |= controlKey;
if (!dispatchNPEvent(record)) {
- if (record.what == adjustCursorEvent)
+ if (record.what == NPEventType_AdjustCursorEvent)
return; // Signals that the plugin wants a normal cursor
LOG(Events, "PluginView::handleMouseEvent(): Mouse event type %d at %d,%d not accepted",
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 553e56b..5a5fb1a 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-18 Stuart Morgan <stuartmorgan at chromium.org>
+
+ Reviewed by Eric Seidel.
+
+ Switch to using the new Carbon NPAPI event declarations, and remove
+ the old ones.
+
+ https://bugs.webkit.org/show_bug.cgi?id=40784
+
+ * Plugins/WebNetscapePluginEventHandlerCarbon.mm:
+ (WebNetscapePluginEventHandlerCarbon::mouseEntered):
+ (WebNetscapePluginEventHandlerCarbon::mouseExited):
+ (WebNetscapePluginEventHandlerCarbon::mouseMoved):
+ (WebNetscapePluginEventHandlerCarbon::focusChanged):
+
2010-10-18 Pavel Podivilov <podivilov at chromium.org>
Reviewed by Timothy Hatcher.
diff --git a/WebKit/mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm b/WebKit/mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm
index a5e8f73..3d2b68e 100644
--- a/WebKit/mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm
+++ b/WebKit/mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm
@@ -174,7 +174,7 @@ void WebNetscapePluginEventHandlerCarbon::mouseEntered(NSEvent* theEvent)
EventRecord event;
getCarbonEvent(&event, theEvent);
- event.what = adjustCursorEvent;
+ event.what = NPEventType_AdjustCursorEvent;
BOOL acceptedEvent;
acceptedEvent = sendEvent(&event);
@@ -187,7 +187,7 @@ void WebNetscapePluginEventHandlerCarbon::mouseExited(NSEvent* theEvent)
EventRecord event;
getCarbonEvent(&event, theEvent);
- event.what = adjustCursorEvent;
+ event.what = NPEventType_AdjustCursorEvent;
BOOL acceptedEvent;
acceptedEvent = sendEvent(&event);
@@ -204,7 +204,7 @@ void WebNetscapePluginEventHandlerCarbon::mouseMoved(NSEvent* theEvent)
EventRecord event;
getCarbonEvent(&event, theEvent);
- event.what = adjustCursorEvent;
+ event.what = NPEventType_AdjustCursorEvent;
BOOL acceptedEvent;
acceptedEvent = sendEvent(&event);
@@ -271,14 +271,14 @@ void WebNetscapePluginEventHandlerCarbon::focusChanged(bool hasFocus)
getCarbonEvent(&event);
bool acceptedEvent;
if (hasFocus) {
- event.what = getFocusEvent;
+ event.what = NPEventType_GetFocusEvent;
acceptedEvent = sendEvent(&event);
- LOG(PluginEvents, "NPP_HandleEvent(getFocusEvent): %d", acceptedEvent);
+ LOG(PluginEvents, "NPP_HandleEvent(NPEventType_GetFocusEvent): %d", acceptedEvent);
installKeyEventHandler();
} else {
- event.what = loseFocusEvent;
+ event.what = NPEventType_LoseFocusEvent;
acceptedEvent = sendEvent(&event);
- LOG(PluginEvents, "NPP_HandleEvent(loseFocusEvent): %d", acceptedEvent);
+ LOG(PluginEvents, "NPP_HandleEvent(NPEventType_LoseFocusEvent): %d", acceptedEvent);
removeKeyEventHandler();
}
}
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b3b3b7d..7b18d55 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-18 Stuart Morgan <stuartmorgan at chromium.org>
+
+ Reviewed by Eric Seidel.
+
+ Switch to using the new Carbon NPAPI event declarations, and remove
+ the old ones.
+
+ https://bugs.webkit.org/show_bug.cgi?id=40784
+
+ * DumpRenderTree/TestNetscapePlugIn/main.cpp:
+ (handleEventCarbon):
+
2010-10-18 David Levin <levin at chromium.org>
Reviewed by Adam Barth.
diff --git a/WebKitTools/DumpRenderTree/TestNetscapePlugIn/main.cpp b/WebKitTools/DumpRenderTree/TestNetscapePlugIn/main.cpp
index ef0e008..afb80cf 100644
--- a/WebKitTools/DumpRenderTree/TestNetscapePlugIn/main.cpp
+++ b/WebKitTools/DumpRenderTree/TestNetscapePlugIn/main.cpp
@@ -462,13 +462,13 @@ static int16_t handleEventCarbon(NPP instance, PluginObject* obj, EventRecord* e
pluginLog(instance, "kHighLevelEvent");
break;
// NPAPI events
- case getFocusEvent:
+ case NPEventType_LoseFocusEvent:
pluginLog(instance, "getFocusEvent");
break;
- case loseFocusEvent:
+ case NPEventType_LoseFocusEvent:
pluginLog(instance, "loseFocusEvent");
break;
- case adjustCursorEvent:
+ case NPEventType_AdjustCursorEvent:
pluginLog(instance, "adjustCursorEvent");
break;
default:
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list