<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[165877] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/165877">165877</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-19 01:04:52 -0700 (Wed, 19 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rewrite WebHTMLConverter::_colorForNode in C++
https://bugs.webkit.org/show_bug.cgi?id=130443
Patch by Sam Weinig <sam@webkit.org> on 2014-03-19
Reviewed by Andreas Kling.
* platform/mac/HTMLConverter.mm:
(_platformColor):
Rename from _colorForRGBColor and simplify to just do the platform conversion.
(normalizedColor):
Extract normalization out of _colorForRGBColor and remove cases that are impossible to hit
due to us only ever using the device color space.
(HTMLConverterCaches::colorPropertyValueForNode):
(-[WebHTMLConverter _colorForNode:property:]):
Convert to C++.
(-[WebHTMLConverter dealloc]):
(-[WebHTMLConverter init]):
Remove caches, we already cache in ColorMac.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmacHTMLConvertermm">trunk/Source/WebCore/platform/mac/HTMLConverter.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165876 => 165877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-19 07:14:32 UTC (rev 165876)
+++ trunk/Source/WebCore/ChangeLog 2014-03-19 08:04:52 UTC (rev 165877)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-03-19 Sam Weinig <sam@webkit.org>
+
+ Rewrite WebHTMLConverter::_colorForNode in C++
+ https://bugs.webkit.org/show_bug.cgi?id=130443
+
+ Reviewed by Andreas Kling.
+
+ * platform/mac/HTMLConverter.mm:
+ (_platformColor):
+ Rename from _colorForRGBColor and simplify to just do the platform conversion.
+
+ (normalizedColor):
+ Extract normalization out of _colorForRGBColor and remove cases that are impossible to hit
+ due to us only ever using the device color space.
+
+ (HTMLConverterCaches::colorPropertyValueForNode):
+ (-[WebHTMLConverter _colorForNode:property:]):
+ Convert to C++.
+
+ (-[WebHTMLConverter dealloc]):
+ (-[WebHTMLConverter init]):
+ Remove caches, we already cache in ColorMac.
+
</ins><span class="cx"> 2014-03-18 Andrei Bucur <abucur@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Regions] Strange layout for content with region breaks
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacHTMLConvertermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/HTMLConverter.mm (165876 => 165877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/HTMLConverter.mm 2014-03-19 07:14:32 UTC (rev 165876)
+++ trunk/Source/WebCore/platform/mac/HTMLConverter.mm 2014-03-19 08:04:52 UTC (rev 165877)
</span><span class="lines">@@ -403,6 +403,8 @@
</span><span class="cx"> public:
</span><span class="cx"> String propertyValueForNode(Node&, const String& propertyName);
</span><span class="cx"> bool floatPropertyValueForNode(Node&, const String& propertyName, float&);
</span><ins>+ Color colorPropertyValueForNode(Node&, const String& propertyName);
+
</ins><span class="cx"> bool isBlockElement(Element&);
</span><span class="cx"> bool elementHasOwnBackgroundColor(Element&);
</span><span class="cx">
</span><span class="lines">@@ -842,39 +844,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-static inline UIColor *_colorForRGBColor(DOMRGBColor *domRGBColor, BOOL)
</del><ins>+static inline UIColor *_platformColor(Color color)
</ins><span class="cx"> {
</span><del>- return [getUIColorClass() _disambiguated_due_to_CIImage_colorWithCGColor:[domRGBColor color]];
</del><ins>+ return [getUIColorClass() _disambiguated_due_to_CIImage_colorWithCGColor:cachedCGColor(color, WebCore::ColorSpaceDeviceRGB)];
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> #else
</span><del>-static inline NSColor *_colorForRGBColor(DOMRGBColor *domRGBColor, BOOL ignoreBlack)
</del><ins>+static inline NSColor *_platformColor(Color color)
</ins><span class="cx"> {
</span><del>- NSColor *color = [domRGBColor _color];
- NSColorSpace *colorSpace = [color colorSpace];
- const CGFloat ColorEpsilon = 1 / (2 * (CGFloat)255.0);
-
- if (color) {
- if ([colorSpace isEqual:[NSColorSpace genericGrayColorSpace]] || [colorSpace isEqual:[NSColorSpace deviceGrayColorSpace]]) {
- CGFloat white, alpha;
- [color getWhite:&white alpha:&alpha];
- if (white < ColorEpsilon && (ignoreBlack || alpha < ColorEpsilon))
- color = nil;
- } else {
- NSColor *rgbColor = nil;
- if ([colorSpace isEqual:[NSColorSpace genericRGBColorSpace]] || [colorSpace isEqual:[NSColorSpace deviceRGBColorSpace]])
- rgbColor = color;
- if (!rgbColor)
- rgbColor = [color colorUsingColorSpaceName:NSDeviceRGBColorSpace];
- if (rgbColor) {
- CGFloat red, green, blue, alpha;
- [rgbColor getRed:&red green:&green blue:&blue alpha:&alpha];
- if (red < ColorEpsilon && green < ColorEpsilon && blue < ColorEpsilon && (ignoreBlack || alpha < ColorEpsilon))
- color = nil;
- }
- }
- }
- return color;
</del><ins>+ return nsColor(color);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -972,64 +949,76 @@
</span><span class="cx"> return element;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (PlatformColor *)_computedColorForNode:(DOMNode *)node property:(NSString *)key
</del><ins>+static Color normalizedColor(Color color, bool ignoreBlack)
</ins><span class="cx"> {
</span><del>- PlatformColor *result = nil;
- bool inherit = true;
- bool haveResult = false;
- BOOL isColor = [@"color" isEqualToString:key];
- BOOL isBackgroundColor = [@"background-color" isEqualToString:key];
- Node* coreNode = core(node);
- if (coreNode && coreNode->isElementNode()) {
- Element& element = toElement(*coreNode);
- String propertyName = key;
- inherit = false;
- if (!haveResult) {
- if (RefPtr<CSSValue> value = _caches->computedStylePropertyForElement(element, propertyName)) {
- if (value->isPrimitiveValue() && toCSSPrimitiveValue(*value).isRGBColor()) {
- RefPtr<WebCore::RGBColor> color = toCSSPrimitiveValue(*value).getRGBColorValue(ASSERT_NO_EXCEPTION);
- result = _colorForRGBColor(kit(color.get()), isColor);
- haveResult = true;
- }
- }
- }
- if (!haveResult) {
- if (RefPtr<CSSValue> value = _caches->inlineStylePropertyForElement(element, propertyName)) {
- if (value->isPrimitiveValue() && toCSSPrimitiveValue(*value).isRGBColor()) {
- RefPtr<WebCore::RGBColor> color = toCSSPrimitiveValue(*value).getRGBColorValue(ASSERT_NO_EXCEPTION);
- result = _colorForRGBColor(kit(color.get()), isColor);
- haveResult = true;
- } else if (value->isInheritedValue())
</del><ins>+ const double ColorEpsilon = 1 / (2 * (double)255.0);
+
+ double red, green, blue, alpha;
+ color.getRGBA(red, green, blue, alpha);
+ if (red < ColorEpsilon && green < ColorEpsilon && blue < ColorEpsilon && (ignoreBlack || alpha < ColorEpsilon))
+ return Color();
+
+ return color;
+}
+
+Color HTMLConverterCaches::colorPropertyValueForNode(Node& node, const String& propertyName)
+{
+ if (!node.isElementNode()) {
+ if (Node* parent = node.parentNode())
+ return colorPropertyValueForNode(*parent, propertyName);
+ return Color();
+ }
+
+ Element& element = toElement(node);
+ if (RefPtr<CSSValue> value = computedStylePropertyForElement(element, propertyName)) {
+ if (value->isPrimitiveValue() && toCSSPrimitiveValue(*value).isRGBColor())
+ return normalizedColor(Color(toCSSPrimitiveValue(*value).getRGBA32Value()), propertyName == "color");
+ }
+
+ bool inherit = false;
+ if (RefPtr<CSSValue> value = inlineStylePropertyForElement(element, propertyName)) {
+ if (value->isPrimitiveValue() && toCSSPrimitiveValue(*value).isRGBColor())
+ return normalizedColor(Color(toCSSPrimitiveValue(*value).getRGBA32Value()), propertyName == "color");
+ if (value->isInheritedValue())
+ inherit = true;
+ }
+
+ switch (cssPropertyID(propertyName)) {
+ case CSSPropertyColor:
+ inherit = true;
+ break;
+ case CSSPropertyBackgroundColor:
+ if (!elementHasOwnBackgroundColor(element)) {
+ if (Element* parentElement = node.parentElement()) {
+ if (!elementHasOwnBackgroundColor(*parentElement))
</ins><span class="cx"> inherit = true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if (!result) {
- if ((isColor && !haveResult) || (isBackgroundColor && ![self _elementHasOwnBackgroundColor:static_cast<DOMElement*>(node)]))
- inherit = true;
- }
</del><ins>+ break;
+ default:
+ break;
</ins><span class="cx"> }
</span><del>- if (!result && inherit) {
- DOMNode *parentNode = [node parentNode];
- if (parentNode && !(isBackgroundColor && [parentNode nodeType] == DOM_ELEMENT_NODE && [self _elementHasOwnBackgroundColor:(DOMElement *)parentNode]))
- return [self _colorForNode:parentNode property:key];
</del><ins>+
+ if (inherit) {
+ if (Node* parent = node.parentNode())
+ return colorPropertyValueForNode(*parent, propertyName);
</ins><span class="cx"> }
</span><del>- return result;
</del><ins>+
+ return Color();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (PlatformColor *)_colorForNode:(DOMNode *)node property:(NSString *)key {
- RetainPtr<NSMutableDictionary> attributeDictionary = [_colorsForNodes objectForKey:node];
- if (!attributeDictionary) {
- attributeDictionary = adoptNS([[NSMutableDictionary alloc] init]);
- [_colorsForNodes setObject:attributeDictionary.get() forKey:node];
- }
- PlatformColor *result = [attributeDictionary objectForKey:key];
- if (!result) {
- result = [self _computedColorForNode:node property:key];
- [attributeDictionary setObject:(result ? result : [PlatformColorClass clearColor]) forKey:key];
- }
- if ([[PlatformColorClass clearColor] isEqual:result] || ([result alphaComponent] == 0.0) )
- result = nil;
- return result;
</del><ins>+- (PlatformColor *)_colorForNode:(DOMNode *)node property:(NSString *)key
+{
+ Node* coreNode = core(node);
+ if (!coreNode)
+ return nil;
+ Color result = _caches->colorPropertyValueForNode(*coreNode, String(key));
+ if (!result.isValid())
+ return nil;
+ PlatformColor *platformResult = _platformColor(result);
+ if ([[PlatformColorClass clearColor] isEqual:platformResult] || ([platformResult alphaComponent] == 0.0))
+ return nil;
+ return platformResult;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #define UIFloatIsZero(number) (fabs(number - 0) < FLT_EPSILON)
</span><span class="lines">@@ -2407,7 +2396,6 @@
</span><span class="cx"> [_textTableRows release];
</span><span class="cx"> [_textTableRowArrays release];
</span><span class="cx"> [_textTableRowBackgroundColors release];
</span><del>- [_colorsForNodes release];
</del><span class="cx"> [_attributesForElements release];
</span><span class="cx"> [_fontCache release];
</span><span class="cx"> [_writingDirectionArray release];
</span><span class="lines">@@ -2432,7 +2420,6 @@
</span><span class="cx"> _textTableRows = [[NSMutableArray alloc] init];
</span><span class="cx"> _textTableRowArrays = [[NSMutableArray alloc] init];
</span><span class="cx"> _textTableRowBackgroundColors = [[NSMutableArray alloc] init];
</span><del>- _colorsForNodes = [[NSMutableDictionary alloc] init];
</del><span class="cx"> _attributesForElements = [[NSMutableDictionary alloc] init];
</span><span class="cx"> _fontCache = [[NSMutableDictionary alloc] init];
</span><span class="cx"> _writingDirectionArray = [[NSMutableArray alloc] init];
</span></span></pre>
</div>
</div>
</body>
</html>