[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

voas voas at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:51:11 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit b0117fab4ff9afef7d1839de4067845ef1781488
Author: voas <voas at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 12 22:13:18 2003 +0000

    2003-08-12  Ed Voas  <voas at apple.com>
    
            Reviewed by Richard.
    
            Make sure to override the standard behavior for ordering windows to do nothing for Carbon stuff.
    
            * Carbon.subproj/CarbonWindowAdapter.m:
            (-[CarbonWindowAdapter _reallyDoOrderWindow:relativeTo:findKey:forCounter:force:isModal:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4810 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Carbon.subproj/CarbonWindowAdapter.m b/WebKit/Carbon.subproj/CarbonWindowAdapter.m
index f7e8123..4ad8e78 100644
--- a/WebKit/Carbon.subproj/CarbonWindowAdapter.m
+++ b/WebKit/Carbon.subproj/CarbonWindowAdapter.m
@@ -983,6 +983,10 @@ static OSStatus NSCarbonWindowHandleEvent(EventHandlerCallRef inEventHandlerCall
     
 }
 
+// [3364117] We need to make sure this does not fall through to the AppKit implementation! bad things happen.
+- (void)_reallyDoOrderWindow:(NSWindowOrderingMode)place relativeTo:(int)otherWin findKey:(BOOL)doKeyCalc forCounter:(BOOL)isACounter force:(BOOL)doForce isModal:(BOOL)isModal {
+}
+
 /*
 void _NSSetModalWindowClassLevel(int level) {
     WindowGroupRef groupRef;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 7d317b4..626458d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-08-12  Ed Voas  <voas at apple.com>
+
+        Reviewed by Richard.
+
+		Make sure to override the standard behavior for ordering windows to do nothing for Carbon stuff.
+
+        * Carbon.subproj/CarbonWindowAdapter.m:
+        (-[CarbonWindowAdapter _reallyDoOrderWindow:relativeTo:findKey:forCounter:force:isModal:]):
+
 2003-08-11  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: <rdar://problem/3163589>: Macromedia Flash 6 cannot take Asian text entry in Safari

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list