[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:07:56 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit ce1a1cf17c927aa5a80cec15da6a0dfd74559add
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Apr 19 03:18:45 2002 +0000
2002-04-18 Chris Blumenberg <cblu at apple.com>
Made stop and start work better. Fixed a bug darin made.
* Plugins.subproj/IFPluginView.h:
* Plugins.subproj/IFPluginView.mm: (-[IFPluginView
initWithFrame:plugin:url:mime:arguments:mode:]), (-[IFPluginView setWindow]),
(-[IFPluginView start]), (-[IFPluginView stop]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1050 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ad365c0..2a9eab0 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-04-18 Chris Blumenberg <cblu at apple.com>
+
+ Made stop and start to work better. Fixed a bug darin made.
+
+ * Plugins.subproj/IFPluginView.h:
+ * Plugins.subproj/IFPluginView.mm: (-[IFPluginView
+ initWithFrame:plugin:url:mime:arguments:mode:]), (-[IFPluginView setWindow]),
+ (-[IFPluginView start]), (-[IFPluginView stop]):
+
2002-04-18 Richard Williamson <rjw at apple.com>
Fixed typo.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index ad365c0..2a9eab0 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-04-18 Chris Blumenberg <cblu at apple.com>
+
+ Made stop and start to work better. Fixed a bug darin made.
+
+ * Plugins.subproj/IFPluginView.h:
+ * Plugins.subproj/IFPluginView.mm: (-[IFPluginView
+ initWithFrame:plugin:url:mime:arguments:mode:]), (-[IFPluginView setWindow]),
+ (-[IFPluginView start]), (-[IFPluginView stop]):
+
2002-04-18 Richard Williamson <rjw at apple.com>
Fixed typo.
diff --git a/WebKit/Plugins.subproj/IFPluginView.h b/WebKit/Plugins.subproj/IFPluginView.h
index 81112c9..6288f03 100644
--- a/WebKit/Plugins.subproj/IFPluginView.h
+++ b/WebKit/Plugins.subproj/IFPluginView.h
@@ -25,7 +25,7 @@
NP_Port nPort;
NPP_t instanceStruct;
- BOOL isFlipped, transferred, isHidden, stopped;
+ BOOL isFlipped, transferred, isHidden, isStarted;
NSString *URL, *mime;
NSURL *baseURL;
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index b9ea1a0..2e63749 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -80,7 +80,7 @@ extern "C" {
// Initialize globals
transferred = NO;
- stopped = NO;
+ isStarted = NO;
filesToErase = [[NSMutableArray alloc] init];
activeURLHandles = [[NSMutableArray alloc] init];
@@ -117,11 +117,15 @@ extern "C" {
windowFrame = [[self window] frame];
frameInWindow = [self convertRect:[self bounds] toView:nil];
visibleRectInWindow = [self convertRect:[self visibleRect] toView:nil];
- frameInWindow.origin.y = windowFrame.size.height - frameInWindow.origin.y - frameInWindow.size.height; // flip y coord
+
+ // flip Y coordinates
+ frameInWindow.origin.y = windowFrame.size.height - frameInWindow.origin.y - frameInWindow.size.height;
visibleRectInWindow.origin.y = windowFrame.size.height - visibleRectInWindow.origin.y - visibleRectInWindow.size.height;
nPort.port = GetWindowPort([[self window] _windowRef]);
- nPort.portx = -(int32)frameInWindow.origin.x; // these values are ignored by QT
+
+ // FIXME: Are these values important?
+ nPort.portx = -(int32)frameInWindow.origin.x;
nPort.porty = -(int32)frameInWindow.origin.y;
window.window = &nPort;
@@ -131,7 +135,7 @@ extern "C" {
window.width = (uint32)frameInWindow.size.width;
window.height = (uint32)frameInWindow.size.height;
- window.clipRect.top = (uint16)visibleRectInWindow.origin.y; // clip rect
+ window.clipRect.top = (uint16)visibleRectInWindow.origin.y;
window.clipRect.left = (uint16)visibleRectInWindow.origin.x;
window.clipRect.bottom = (uint16)(visibleRectInWindow.origin.y + visibleRectInWindow.size.height);
window.clipRect.right = (uint16)(visibleRectInWindow.origin.x + visibleRectInWindow.size.width);
@@ -190,7 +194,9 @@ extern "C" {
NPSavedData saved;
NPError npErr;
- if ([arguments objectForKey:@"wkfullmode"]) {
+ isStarted = YES;
+
+ if (![arguments objectForKey:@"wkfullmode"]) {
// convert arguments dictionary to 2 string arrays
int argsCount = [arguments count];
@@ -225,7 +231,7 @@ extern "C" {
{
NPError npErr;
- if (!stopped){
+ if (isStarted){
[activeURLHandles makeObjectsPerformSelector:@selector(cancelLoadInBackground)];
[eventSender stop];
[eventSender release];
@@ -233,7 +239,7 @@ extern "C" {
[self removeTrackingRect:trackingTag];
npErr = NPP_Destroy(instance, NULL);
WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_Destroy: %d\n", npErr);
- stopped = YES;
+ isStarted = NO;
}
}
diff --git a/WebKit/Plugins.subproj/WebPluginView.h b/WebKit/Plugins.subproj/WebPluginView.h
index 81112c9..6288f03 100644
--- a/WebKit/Plugins.subproj/WebPluginView.h
+++ b/WebKit/Plugins.subproj/WebPluginView.h
@@ -25,7 +25,7 @@
NP_Port nPort;
NPP_t instanceStruct;
- BOOL isFlipped, transferred, isHidden, stopped;
+ BOOL isFlipped, transferred, isHidden, isStarted;
NSString *URL, *mime;
NSURL *baseURL;
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index b9ea1a0..2e63749 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -80,7 +80,7 @@ extern "C" {
// Initialize globals
transferred = NO;
- stopped = NO;
+ isStarted = NO;
filesToErase = [[NSMutableArray alloc] init];
activeURLHandles = [[NSMutableArray alloc] init];
@@ -117,11 +117,15 @@ extern "C" {
windowFrame = [[self window] frame];
frameInWindow = [self convertRect:[self bounds] toView:nil];
visibleRectInWindow = [self convertRect:[self visibleRect] toView:nil];
- frameInWindow.origin.y = windowFrame.size.height - frameInWindow.origin.y - frameInWindow.size.height; // flip y coord
+
+ // flip Y coordinates
+ frameInWindow.origin.y = windowFrame.size.height - frameInWindow.origin.y - frameInWindow.size.height;
visibleRectInWindow.origin.y = windowFrame.size.height - visibleRectInWindow.origin.y - visibleRectInWindow.size.height;
nPort.port = GetWindowPort([[self window] _windowRef]);
- nPort.portx = -(int32)frameInWindow.origin.x; // these values are ignored by QT
+
+ // FIXME: Are these values important?
+ nPort.portx = -(int32)frameInWindow.origin.x;
nPort.porty = -(int32)frameInWindow.origin.y;
window.window = &nPort;
@@ -131,7 +135,7 @@ extern "C" {
window.width = (uint32)frameInWindow.size.width;
window.height = (uint32)frameInWindow.size.height;
- window.clipRect.top = (uint16)visibleRectInWindow.origin.y; // clip rect
+ window.clipRect.top = (uint16)visibleRectInWindow.origin.y;
window.clipRect.left = (uint16)visibleRectInWindow.origin.x;
window.clipRect.bottom = (uint16)(visibleRectInWindow.origin.y + visibleRectInWindow.size.height);
window.clipRect.right = (uint16)(visibleRectInWindow.origin.x + visibleRectInWindow.size.width);
@@ -190,7 +194,9 @@ extern "C" {
NPSavedData saved;
NPError npErr;
- if ([arguments objectForKey:@"wkfullmode"]) {
+ isStarted = YES;
+
+ if (![arguments objectForKey:@"wkfullmode"]) {
// convert arguments dictionary to 2 string arrays
int argsCount = [arguments count];
@@ -225,7 +231,7 @@ extern "C" {
{
NPError npErr;
- if (!stopped){
+ if (isStarted){
[activeURLHandles makeObjectsPerformSelector:@selector(cancelLoadInBackground)];
[eventSender stop];
[eventSender release];
@@ -233,7 +239,7 @@ extern "C" {
[self removeTrackingRect:trackingTag];
npErr = NPP_Destroy(instance, NULL);
WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_Destroy: %d\n", npErr);
- stopped = YES;
+ isStarted = NO;
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list