[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:23:36 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit a3fabdae0eef4ccafe510fe204f267f50cee62be
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jul 10 17:31:25 2002 +0000
* Misc.subproj/WebKitDebug.m: Remove workaround for long-ago fixed
C compiler bug.
* Plugins.subproj/IFPluginView.mm:
(-[IFPluginView keyUp:]), (-[IFPluginView keyDown:]): Simplify keyboard
scrolling code by passing along all events that the plug-in doesn't handle
rather than special-casing certain events. Also use super rather than
nextResponder to pass along the scroll events (super will do nextResponder).
* WebView.subproj/IFHTMLView.mm:
(-[IFHTMLView keyDown:]), (-[IFHTMLView keyUp:]): Use super rather than
nextResponder to pass along scroll events (super will do nextResponder).
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1521 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 4d3ed18..b0ef3be 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2002-07-10 Darin Adler <darin at apple.com>
+
+ * Misc.subproj/WebKitDebug.m: Remove workaround for long-ago fixed
+ C compiler bug.
+
+ * Plugins.subproj/IFPluginView.mm:
+ (-[IFPluginView keyUp:]), (-[IFPluginView keyDown:]): Simplify keyboard
+ scrolling code by passing along all events that the plug-in doesn't handle
+ rather than special-casing certain events. Also use super rather than
+ nextResponder to pass along the scroll events (super will do nextResponder).
+
+ * WebView.subproj/IFHTMLView.mm:
+ (-[IFHTMLView keyDown:]), (-[IFHTMLView keyUp:]): Use super rather than
+ nextResponder to pass along scroll events (super will do nextResponder).
+
2002-07-08 Chris Blumenberg <cblu at apple.com>
Fixes for:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 4d3ed18..b0ef3be 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,18 @@
+2002-07-10 Darin Adler <darin at apple.com>
+
+ * Misc.subproj/WebKitDebug.m: Remove workaround for long-ago fixed
+ C compiler bug.
+
+ * Plugins.subproj/IFPluginView.mm:
+ (-[IFPluginView keyUp:]), (-[IFPluginView keyDown:]): Simplify keyboard
+ scrolling code by passing along all events that the plug-in doesn't handle
+ rather than special-casing certain events. Also use super rather than
+ nextResponder to pass along the scroll events (super will do nextResponder).
+
+ * WebView.subproj/IFHTMLView.mm:
+ (-[IFHTMLView keyDown:]), (-[IFHTMLView keyUp:]): Use super rather than
+ nextResponder to pass along scroll events (super will do nextResponder).
+
2002-07-08 Chris Blumenberg <cblu at apple.com>
Fixes for:
diff --git a/WebKit/Misc.subproj/WebKitDebug.m b/WebKit/Misc.subproj/WebKitDebug.m
index f4f4b95..09502e2 100644
--- a/WebKit/Misc.subproj/WebKitDebug.m
+++ b/WebKit/Misc.subproj/WebKitDebug.m
@@ -4,9 +4,6 @@
#import "WebKitDebug.h"
-// FIXME: Workaround for Radar xxx.
-#undef putc
-
#ifndef NDEBUG
static unsigned WEBKIT_LOG_LEVEL = 0;
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index bca9a50..90ea77a 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -16,7 +16,6 @@
#import <WebKit/IFPluginNullEventSender.h>
#import <WebKit/IFNullPluginView.h>
#import <WebKit/IFPlugin.h>
-#import <WebKit/IFNSEventExtras.h>
#import <WebKit/IFNSViewExtras.h>
#import <WebKit/WebKitDebug.h>
@@ -238,10 +237,10 @@
WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(keyUp): %d key:%c\n", acceptedEvent, (char) (event.message & charCodeMask));
- // If the plug-in didn't accept this event and this event can be used for scrolling,
- // pass it along so that keyboard scrolling continues to work
- if([theEvent _IF_isScrollEvent] && !acceptedEvent)
- [[self nextResponder] keyUp:theEvent];
+ // If the plug-in didn't accept this event,
+ // pass it along so that keyboard scrolling, for example, will work.
+ if (!acceptedEvent)
+ [super keyUp:theEvent];
}
- (void)keyDown:(NSEvent *)theEvent
@@ -257,10 +256,10 @@
WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(keyDown): %d key:%c\n", acceptedEvent, (char) (event.message & charCodeMask));
- // If the plug-in didn't accept this event and this event can be used for scrolling,
- // pass it along so that keyboard scrolling continues to work
- if([theEvent _IF_isScrollEvent] && !acceptedEvent)
- [[self nextResponder] keyDown:theEvent];
+ // If the plug-in didn't accept this event,
+ // pass it along so that keyboard scrolling, for example, will work.
+ if (!acceptedEvent)
+ [super keyDown:theEvent];
}
#pragma mark IFPLUGINVIEW
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index bca9a50..90ea77a 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -16,7 +16,6 @@
#import <WebKit/IFPluginNullEventSender.h>
#import <WebKit/IFNullPluginView.h>
#import <WebKit/IFPlugin.h>
-#import <WebKit/IFNSEventExtras.h>
#import <WebKit/IFNSViewExtras.h>
#import <WebKit/WebKitDebug.h>
@@ -238,10 +237,10 @@
WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(keyUp): %d key:%c\n", acceptedEvent, (char) (event.message & charCodeMask));
- // If the plug-in didn't accept this event and this event can be used for scrolling,
- // pass it along so that keyboard scrolling continues to work
- if([theEvent _IF_isScrollEvent] && !acceptedEvent)
- [[self nextResponder] keyUp:theEvent];
+ // If the plug-in didn't accept this event,
+ // pass it along so that keyboard scrolling, for example, will work.
+ if (!acceptedEvent)
+ [super keyUp:theEvent];
}
- (void)keyDown:(NSEvent *)theEvent
@@ -257,10 +256,10 @@
WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(keyDown): %d key:%c\n", acceptedEvent, (char) (event.message & charCodeMask));
- // If the plug-in didn't accept this event and this event can be used for scrolling,
- // pass it along so that keyboard scrolling continues to work
- if([theEvent _IF_isScrollEvent] && !acceptedEvent)
- [[self nextResponder] keyDown:theEvent];
+ // If the plug-in didn't accept this event,
+ // pass it along so that keyboard scrolling, for example, will work.
+ if (!acceptedEvent)
+ [super keyDown:theEvent];
}
#pragma mark IFPLUGINVIEW
diff --git a/WebKit/WebView.subproj/IFHTMLView.mm b/WebKit/WebView.subproj/IFHTMLView.mm
index 7061417..c928e03 100644
--- a/WebKit/WebView.subproj/IFHTMLView.mm
+++ b/WebKit/WebView.subproj/IFHTMLView.mm
@@ -522,9 +522,9 @@
WEBKITDEBUGLEVEL(WEBKIT_LOG_EVENTS, "keyDown: %s\n", DEBUG_OBJECT(event));
int state = 0;
- // If this is a scroll event, pass it to the IFWebView to cause a scroll
- if([event _IF_isScrollEvent]){
- [[self nextResponder] keyDown:event];
+ // If this is a scroll event, let IFWebView handle it instead of the KHTMLView.
+ if ([event _IF_isScrollEvent]) {
+ [super keyDown:event];
return;
}
@@ -542,9 +542,9 @@
WEBKITDEBUGLEVEL(WEBKIT_LOG_EVENTS, "keyUp: %s\n", DEBUG_OBJECT(event));
int state = 0;
- // If this is a scroll event, pass it to the IFWebView to cause a scroll
- if([event _IF_isScrollEvent]){
- [[self nextResponder] keyUp:event];
+ // If this is a scroll event, let IFWebView handle it instead of the KHTMLView.
+ if ([event _IF_isScrollEvent]) {
+ [super keyUp:event];
return;
}
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 7061417..c928e03 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -522,9 +522,9 @@
WEBKITDEBUGLEVEL(WEBKIT_LOG_EVENTS, "keyDown: %s\n", DEBUG_OBJECT(event));
int state = 0;
- // If this is a scroll event, pass it to the IFWebView to cause a scroll
- if([event _IF_isScrollEvent]){
- [[self nextResponder] keyDown:event];
+ // If this is a scroll event, let IFWebView handle it instead of the KHTMLView.
+ if ([event _IF_isScrollEvent]) {
+ [super keyDown:event];
return;
}
@@ -542,9 +542,9 @@
WEBKITDEBUGLEVEL(WEBKIT_LOG_EVENTS, "keyUp: %s\n", DEBUG_OBJECT(event));
int state = 0;
- // If this is a scroll event, pass it to the IFWebView to cause a scroll
- if([event _IF_isScrollEvent]){
- [[self nextResponder] keyUp:event];
+ // If this is a scroll event, let IFWebView handle it instead of the KHTMLView.
+ if ([event _IF_isScrollEvent]) {
+ [super keyUp:event];
return;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list