[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:23:49 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit aab0d7f30719524477a79da4f9488e353acce198
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jul 11 05:32:38 2002 +0000
WebCore:
WebCore part of fix for:
Radar 2953250 - JavaScript window.focus() and window.blur()
methods don't work
* khtml/ecma/kjs_window.cpp:
(WindowFunc::tryCall): Call the appropriate things on focus and blur.
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPartImpl::unfocusWindow): Implemented by calling bridge.
* kwq/KWQKHTMLPartImpl.h, kwq/KWQWidget.mm:
(QWidget::setActiveWindow): Implemented by ordering the window
front and making it key.
* kwq/WebCoreBridge.h: Prototype new bridge method.
WebKit:
WebKit part of fix for:
Radar 2953250 - JavaScript window.focus() and window.blur()
methods don't work
* WebCoreSupport.subproj/IFWebCoreBridge.mm:
(-[IFWebCoreBridge unfocusWindow]): Use private AppKit interface
to cycle windows if the window is the key window.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1532 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index cc45fbc..64cf975 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,19 @@
+2002-07-10 Maciej Stachowiak <mjs at apple.com>
+
+ WebCore part of fix for:
+
+ Radar 2953250 - JavaScript window.focus() and window.blur()
+ methods don't work
+
+ * khtml/ecma/kjs_window.cpp:
+ (WindowFunc::tryCall): Call the appropriate things on focus and blur.
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPartImpl::unfocusWindow): Implemented by calling bridge.
+ * kwq/KWQKHTMLPartImpl.h, kwq/KWQWidget.mm:
+ (QWidget::setActiveWindow): Implemented by ordering the window
+ front and making it key.
+ * kwq/WebCoreBridge.h: Prototype new bridge method.
+
2002-07-10 Darin Adler <darin at apple.com>
- fixed 2979153 -- charset sjis page is gibberish
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index cc45fbc..64cf975 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,19 @@
+2002-07-10 Maciej Stachowiak <mjs at apple.com>
+
+ WebCore part of fix for:
+
+ Radar 2953250 - JavaScript window.focus() and window.blur()
+ methods don't work
+
+ * khtml/ecma/kjs_window.cpp:
+ (WindowFunc::tryCall): Call the appropriate things on focus and blur.
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPartImpl::unfocusWindow): Implemented by calling bridge.
+ * kwq/KWQKHTMLPartImpl.h, kwq/KWQWidget.mm:
+ (QWidget::setActiveWindow): Implemented by ordering the window
+ front and making it key.
+ * kwq/WebCoreBridge.h: Prototype new bridge method.
+
2002-07-10 Darin Adler <darin at apple.com>
- fixed 2979153 -- charset sjis page is gibberish
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index cc45fbc..64cf975 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,19 @@
+2002-07-10 Maciej Stachowiak <mjs at apple.com>
+
+ WebCore part of fix for:
+
+ Radar 2953250 - JavaScript window.focus() and window.blur()
+ methods don't work
+
+ * khtml/ecma/kjs_window.cpp:
+ (WindowFunc::tryCall): Call the appropriate things on focus and blur.
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPartImpl::unfocusWindow): Implemented by calling bridge.
+ * kwq/KWQKHTMLPartImpl.h, kwq/KWQWidget.mm:
+ (QWidget::setActiveWindow): Implemented by ordering the window
+ front and making it key.
+ * kwq/WebCoreBridge.h: Prototype new bridge method.
+
2002-07-10 Darin Adler <darin at apple.com>
- fixed 2979153 -- charset sjis page is gibberish
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index 67327db..7b052fa 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -1289,7 +1289,11 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
widget->setActiveWindow();
return Undefined();
case Window::Blur:
+#ifdef APPLE_CHANGES
+ part->impl->unfocusWindow();
+#else
// TODO
+#endif
return Undefined();
case Window::Close:
/* From http://developer.netscape.com/docs/manuals/js/client/jsref/window.htm :
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index 156dddd..bcea51f 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -78,6 +78,8 @@ public:
void setOpenedByJS(bool _openedByJS);
void close();
+
+ void unfocusWindow();
private:
KHTMLPart *part;
KHTMLPartPrivate *d;
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 09ee90d..3376bb6 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -662,3 +662,7 @@ void KWQKHTMLPartImpl::close()
[[bridge window] close];
}
+void KWQKHTMLPartImpl::unfocusWindow()
+{
+ [bridge unfocusWindow];
+}
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.h b/WebCore/kwq/KWQKHTMLPartImpl.h
index 156dddd..bcea51f 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.h
+++ b/WebCore/kwq/KWQKHTMLPartImpl.h
@@ -78,6 +78,8 @@ public:
void setOpenedByJS(bool _openedByJS);
void close();
+
+ void unfocusWindow();
private:
KHTMLPart *part;
KHTMLPartPrivate *d;
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 09ee90d..3376bb6 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -662,3 +662,7 @@ void KWQKHTMLPartImpl::close()
[[bridge window] close];
}
+void KWQKHTMLPartImpl::unfocusWindow()
+{
+ [bridge unfocusWindow];
+}
diff --git a/WebCore/kwq/KWQWidget.mm b/WebCore/kwq/KWQWidget.mm
index 6be8eb5..4c03dff 100644
--- a/WebCore/kwq/KWQWidget.mm
+++ b/WebCore/kwq/KWQWidget.mm
@@ -75,7 +75,7 @@ void QWidget::resize(int w, int h)
void QWidget::setActiveWindow()
{
- _logNeverImplemented();
+ [[data->view window] makeKeyAndOrderFront:nil];
}
void QWidget::setEnabled(bool)
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 6551fd6..5de9bc4 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -126,6 +126,8 @@ typedef khtml::RenderPart KHTMLRenderPart;
- (BOOL) openedByScript;
- (void) setOpenedByScript:(BOOL)openedByScript;
+- (void) unfocusWindow;
+
@end
// This interface definition allows those who hold a WebCoreBridge * to call all the methods
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e00688d..a8d0446 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2002-07-10 Maciej Stachowiak <mjs at apple.com>
+
+ WebKit part of fix for:
+
+ Radar 2953250 - JavaScript window.focus() and window.blur()
+ methods don't work
+
+ * WebCoreSupport.subproj/IFWebCoreBridge.mm:
+ (-[IFWebCoreBridge unfocusWindow]): Use private AppKit interface
+ to cycle windows if the window is the key window.
+
2002-07-10 Darin Adler <darin at apple.com>
- fixed 2983025 -- crash in sendEvent on pages with flash playing
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index e00688d..a8d0446 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-07-10 Maciej Stachowiak <mjs at apple.com>
+
+ WebKit part of fix for:
+
+ Radar 2953250 - JavaScript window.focus() and window.blur()
+ methods don't work
+
+ * WebCoreSupport.subproj/IFWebCoreBridge.mm:
+ (-[IFWebCoreBridge unfocusWindow]): Use private AppKit interface
+ to cycle windows if the window is the key window.
+
2002-07-10 Darin Adler <darin at apple.com>
- fixed 2983025 -- crash in sendEvent on pages with flash playing
diff --git a/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm b/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm
index e2782bc..797f55e 100644
--- a/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm
+++ b/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm
@@ -28,6 +28,10 @@
@end
+ at interface NSApplication (DeclarationStolenFromAppKit)
+- (void)_cycleWindowsReversed:(BOOL)reversed;
+ at end
+
@implementation IFWebCoreBridge
- (id <WebCoreFrame>)frame
@@ -210,4 +214,11 @@
[[dataSource controller] _setOpenedByScript:openedByScript];
}
+- (void)unfocusWindow
+{
+ if ([[self window] isKeyWindow] || [[[self window] attachedSheet] isKeyWindow]) {
+ [NSApp _cycleWindowsReversed:FALSE];
+ }
+}
+
@end
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index e2782bc..797f55e 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -28,6 +28,10 @@
@end
+ at interface NSApplication (DeclarationStolenFromAppKit)
+- (void)_cycleWindowsReversed:(BOOL)reversed;
+ at end
+
@implementation IFWebCoreBridge
- (id <WebCoreFrame>)frame
@@ -210,4 +214,11 @@
[[dataSource controller] _setOpenedByScript:openedByScript];
}
+- (void)unfocusWindow
+{
+ if ([[self window] isKeyWindow] || [[[self window] attachedSheet] isKeyWindow]) {
+ [NSApp _cycleWindowsReversed:FALSE];
+ }
+}
+
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list