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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit dd84a79d30e40377df90ce8ec3444350c2d3b9e9
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 31 23:06:01 2003 +0000

    WebKit:
    	Fixed 3359152.  SPI to get the background color for a frame.
    
            Reviewed by hyatt.
    
            * WebView.subproj/WebFramePrivate.h:
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _bodyBackgroundColor]):
    
    WebCore:
    	Fixed 3359152.  SPI to get the background color for a frame.
    
            Reviewed by hyatt.
    
            * kwq/KWQKHTMLPart.h:
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::bodyBackgroundColor):
            * kwq/WebCoreBridge.h:
            * kwq/WebCoreBridge.mm:
            (-[WebCoreBridge bodyBackgroundColor]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4751 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 4bbca24..254a116 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2003-07-31  Richard Williamson   <rjw at apple.com>
+
+	Fixed 3359152.  SPI to get the background color for a frame.
+
+        Reviewed by hyatt.
+
+        * kwq/KWQKHTMLPart.h:
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::bodyBackgroundColor):
+        * kwq/WebCoreBridge.h:
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge bodyBackgroundColor]):
+
 2003-07-31  Dave Hyatt  <hyatt at apple.com>
 
 	Fix for "The Matrix" stylesheet on meyerweb.com and for 26(!) of the
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4bbca24..254a116 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2003-07-31  Richard Williamson   <rjw at apple.com>
+
+	Fixed 3359152.  SPI to get the background color for a frame.
+
+        Reviewed by hyatt.
+
+        * kwq/KWQKHTMLPart.h:
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::bodyBackgroundColor):
+        * kwq/WebCoreBridge.h:
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge bodyBackgroundColor]):
+
 2003-07-31  Dave Hyatt  <hyatt at apple.com>
 
 	Fix for "The Matrix" stylesheet on meyerweb.com and for 26(!) of the
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index 5e950e4..926b1ec 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -58,6 +58,7 @@ namespace KJS {
 @class NSArray;
 @class NSMutableDictionary;
 @class WebCoreDOMElement;
+ at class NSColor;
 #else
 class NSAttributedString;
 class NSEvent;
@@ -69,6 +70,7 @@ class NSString;
 class NSArray;
 class NSMutableDictionary;
 class WebCoreDOMElement;
+class NSColor;
 #endif
 
 enum KWQSelectionDirection {
@@ -212,6 +214,8 @@ public:
     // Convenience, to avoid repeating the code to dig down to get this.
     QChar backslashAsCurrencySymbol() const;
 
+    NSColor *KWQKHTMLPart::bodyBackgroundColor(void) const;
+
 private:
     virtual void khtmlMousePressEvent(khtml::MousePressEvent *);
     virtual void khtmlMouseDoubleClickEvent(khtml::MouseDoubleClickEvent *);
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index eb57a48..4c2acb9 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -2237,3 +2237,19 @@ QChar KWQKHTMLPart::backslashAsCurrencySymbol() const
     }
     return codec->backslashAsCurrencySymbol();
 }
+
+NSColor *KWQKHTMLPart::bodyBackgroundColor(void) const
+{
+    HTMLDocumentImpl *doc = docImpl();
+    
+    if (doc){
+        HTMLElementImpl *body = doc->body();
+        QColor bgColor =  body->renderer()->style()->backgroundColor();
+        
+        if (bgColor.isValid())
+            return bgColor.getNSColor();
+    }
+    return [NSColor whiteColor];
+}
+
+
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 25f649d..c35de91 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -221,6 +221,8 @@ enum FrameBorderStyle {
 
 - (int)numPendingOrLoadingRequests;
 
+- (NSColor *)bodyBackgroundColor;
+
 @end
 
 // The WebCoreBridge protocol contains methods for use by the WebCore side of the bridge.
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 13f5a5a..14a5f68 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -976,6 +976,11 @@ static HTMLFormElementImpl *formElementFromDOMElement(id <WebDOMElement>element)
         return KWQNumberOfPendingOrLoadingRequests (doc->docLoader());
     return 0;
 }
-    
+
+- (NSColor *)bodyBackgroundColor
+{
+    return _part->bodyBackgroundColor();
+}
+
 
 @end
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 6ec6d73..365b0e0 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,17 @@
 2003-07-31  Richard Williamson   <rjw at apple.com>
 
+	Fixed 3359152.  SPI to get the background color for a frame.
+
+        Reviewed by hyatt.
+
+        * WebCoreSupport.subproj/WebTextRenderer.m:
+        (-[WebTextRenderer checkSelectionPoint:style:position:reversed:]):
+        * WebView.subproj/WebFramePrivate.h:
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _bodyBackgroundColor]):
+
+2003-07-31  Richard Williamson   <rjw at apple.com>
+
 	Fixed 3358870.  Fall back on 'user defaults' values when a value
 	in a custom instance of WebPreferences hasn't been overriden.
 
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index 748f747..b4f61a3 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -193,4 +193,6 @@ extern NSString *WebCorePageCacheStateKey;
 
 - (int)_numPendingOrLoadingRequests:(BOOL)recurse;
 
+- (NSColor *)_bodyBackgroundColor;
+
 @end
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 55c60ca..7bdfd1b 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -2273,6 +2273,11 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
     return num;
 }
 
+- (NSColor *)_bodyBackgroundColor
+{
+    return [_private->bridge bodyBackgroundColor];
+}
+
 @end
 
 @implementation WebFormState : NSObject

-- 
WebKit Debian packaging