Fixed: <rdar://problem/3871718> REGRESSION (125-168): text marked bold with font...

        Reviewed by hyatt.

        * kwq/DOM.mm:
        (-[DOMElement _font]): new SPI for AppKit
        * kwq/DOMPrivate.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8134 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 33909483999f8012f9a7a0f5dcb721ffd56bc8e3..ee6307d47c708357914b846c7df239b7d46b0293 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-12-06  Chris Blumenberg  <cblu@apple.com>
+
+       Fixed: <rdar://problem/3871718> REGRESSION (125-168): text marked bold with font that does not have bold variant copies as non-bold
+
+        Reviewed by hyatt.
+
+        * kwq/DOM.mm:
+        (-[DOMElement _font]): new SPI for AppKit
+        * kwq/DOMPrivate.h:
+
 2004-12-06  Darin Adler  <darin@apple.com>
 
         Reviewed by Maciej.

diff --git a/WebCore/kwq/DOM.mm b/WebCore/kwq/DOM.mm
index ebf883e62e956e6bdeb6f9d3b7c180af3dccb88f..fc17aa7a420264dd01eec1d64ab7b6f3566c9bee 100644 (file)
--- a/WebCore/kwq/DOM.mm
+++ b/WebCore/kwq/DOM.mm
@@ -51,6 +51,8 @@
 
 #import "khtml_part.h"
 
+#import "render_object.h"
+
 #import "DOMEventsInternal.h"
 #import "DOMHTML.h"
 #import "DOMInternal.h"
@@ -91,6 +93,8 @@ using DOM::RangeImpl;
 using DOM::TextImpl;
 using DOM::TreeWalkerImpl;
 
+using khtml::RenderObject;
+
 @interface DOMAttr (WebCoreInternal)
 + (DOMAttr *)_attrWithImpl:(AttrImpl *)impl;
 - (AttrImpl *)_attrImpl;
@@ -1542,6 +1546,20 @@ inline Document DocumentImpl::createInstance(DocumentImpl *impl)
 
 @end
 
+@implementation DOMElement (WebPrivate)
+
+- (NSFont *)_font
+{
+    RenderObject *renderer = [self _elementImpl]->renderer();
+    if (renderer) {
+        return renderer->style()->font().getNSFont();
+    }
+    return nil;
+}
+
+@end
+
+
 //------------------------------------------------------------------------------------------
 // DOMText
 

diff --git a/WebCore/kwq/DOMPrivate.h b/WebCore/kwq/DOMPrivate.h
index e1ab97dae94c2f9fe1bf54ba6aeffc26d23670bf..3db2463ac71863ccbd10495a805e5b4024c0e9a7 100644 (file)
--- a/WebCore/kwq/DOMPrivate.h
+++ b/WebCore/kwq/DOMPrivate.h
@@ -34,3 +34,7 @@
 // fast and easy way of getting an NSColor for a DOMRGBColor
 - (NSColor *)_color;
 @end
+
+@interface DOMElement (WebPrivate)
+- (NSFont *)_font;
+@end