[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:19:19 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 1c056ea4515bba20fba3fa27435f6939ad939f37
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jun 15 09:55:05 2002 +0000

    	Removed product and vendor properties, thereby fixing:
    
            Radar 2943751 - JavaScript navigator.product property is
    "Konqueror/khtml"
            Radar 2943753 - JavaScript navigator.vendor property is "KDE"
    
            * khtml/ecma/kjs_navigator.cpp:
    	(Navigator::getValueProperty): Return undefined for the above
    mentioned properties.
    
            Implemented functionality needed for missing Screen properties,
    thereby fixing the following
            bugs:
    
            Radar 2943730 - JavaScript screen.availHeight property is not
    implemented
            Radar 2943732 - JavaScript screen.availLeft property is not
    implemented
            Radar 2943734 - JavaScript screen.availTop property not implemented
            Radar 2943735 - JavaScript screen.availWidth property is not
    implemented
    
    	* kwq/KWQKWinModule.mm:
    	(KWinModule::workArea): Return the correct screen size to fix the
    above bugs.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1368 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index faecb52..251410f 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,26 @@
+2002-06-15  Maciej Stachowiak  <mjs at apple.com>
+
+	Removed product and vendor properties, thereby fixing:
+        
+        Radar 2943751 - JavaScript navigator.product property is "Konqueror/khtml"
+        Radar 2943753 - JavaScript navigator.vendor property is "KDE"
+        
+        * khtml/ecma/kjs_navigator.cpp:
+	(Navigator::getValueProperty): Return undefined for the above mentioned properties.
+
+2002-06-15  Maciej Stachowiak  <mjs at apple.com>
+
+        Implemented functionality needed for missing Screen properties, thereby fixing the following
+        bugs:
+        
+        Radar 2943730 - JavaScript screen.availHeight property is not implemented
+        Radar 2943732 - JavaScript screen.availLeft property is not implemented
+        Radar 2943734 - JavaScript screen.availTop property not implemented
+        Radar 2943735 - JavaScript screen.availWidth property is not implemented
+        
+	* kwq/KWQKWinModule.mm:
+	(KWinModule::workArea): Return the correct screen size to fix the above bugs.
+
 2002-06-14  Richard Williamson  <rjw at apple.com>
 
     Changed IFResourceProgressHandler to pass back resource handle instead of
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index faecb52..251410f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,26 @@
+2002-06-15  Maciej Stachowiak  <mjs at apple.com>
+
+	Removed product and vendor properties, thereby fixing:
+        
+        Radar 2943751 - JavaScript navigator.product property is "Konqueror/khtml"
+        Radar 2943753 - JavaScript navigator.vendor property is "KDE"
+        
+        * khtml/ecma/kjs_navigator.cpp:
+	(Navigator::getValueProperty): Return undefined for the above mentioned properties.
+
+2002-06-15  Maciej Stachowiak  <mjs at apple.com>
+
+        Implemented functionality needed for missing Screen properties, thereby fixing the following
+        bugs:
+        
+        Radar 2943730 - JavaScript screen.availHeight property is not implemented
+        Radar 2943732 - JavaScript screen.availLeft property is not implemented
+        Radar 2943734 - JavaScript screen.availTop property not implemented
+        Radar 2943735 - JavaScript screen.availWidth property is not implemented
+        
+	* kwq/KWQKWinModule.mm:
+	(KWinModule::workArea): Return the correct screen size to fix the above bugs.
+
 2002-06-14  Richard Williamson  <rjw at apple.com>
 
     Changed IFResourceProgressHandler to pass back resource handle instead of
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index faecb52..251410f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,26 @@
+2002-06-15  Maciej Stachowiak  <mjs at apple.com>
+
+	Removed product and vendor properties, thereby fixing:
+        
+        Radar 2943751 - JavaScript navigator.product property is "Konqueror/khtml"
+        Radar 2943753 - JavaScript navigator.vendor property is "KDE"
+        
+        * khtml/ecma/kjs_navigator.cpp:
+	(Navigator::getValueProperty): Return undefined for the above mentioned properties.
+
+2002-06-15  Maciej Stachowiak  <mjs at apple.com>
+
+        Implemented functionality needed for missing Screen properties, thereby fixing the following
+        bugs:
+        
+        Radar 2943730 - JavaScript screen.availHeight property is not implemented
+        Radar 2943732 - JavaScript screen.availLeft property is not implemented
+        Radar 2943734 - JavaScript screen.availTop property not implemented
+        Radar 2943735 - JavaScript screen.availWidth property is not implemented
+        
+	* kwq/KWQKWinModule.mm:
+	(KWinModule::workArea): Return the correct screen size to fix the above bugs.
+
 2002-06-14  Richard Williamson  <rjw at apple.com>
 
     Changed IFResourceProgressHandler to pass back resource handle instead of
diff --git a/WebCore/khtml/ecma/kjs_navigator.cpp b/WebCore/khtml/ecma/kjs_navigator.cpp
index 63a5d71..c1085a6 100644
--- a/WebCore/khtml/ecma/kjs_navigator.cpp
+++ b/WebCore/khtml/ecma/kjs_navigator.cpp
@@ -200,9 +200,17 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const
     // We assume the string is something like Mozilla/version (properties)
     return String(userAgent.mid(userAgent.find('/') + 1));
   case Product:
+#ifdef APPLE_CHANGES
+    return Undefined();
+#else
     return String("Konqueror/khtml");
+#endif
   case Vendor:
-    return String("KDE");
+#ifdef APPLE_CHANGES
+      return Undefined();
+#else
+      return String("KDE");
+#endif
   case Language:
     return String(KGlobal::locale()->language() == "C" ?
                   QString::fromLatin1("en") : KGlobal::locale()->language());
diff --git a/WebCore/kwq/KWQKWinModule.mm b/WebCore/kwq/KWQKWinModule.mm
index 4b2be0b..688d0b9 100644
--- a/WebCore/kwq/KWQKWinModule.mm
+++ b/WebCore/kwq/KWQKWinModule.mm
@@ -28,6 +28,10 @@
 
 QRect KWinModule::workArea() const
 {
-    _logNotYetImplemented();
-    return QRect();
+    NSRect visibleRect = [[NSScreen mainScreen] visibleFrame];
+    NSRect rect = [[NSScreen mainScreen] frame];
+    return QRect((int)visibleRect.origin.x,
+                 (int)(rect.size.height - visibleRect.size.height - visibleRect.origin.y),
+                 (int)visibleRect.size.width,
+                 (int)visibleRect.size.height);
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list