<!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>[165787] 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/165787">165787</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-17 18:38:01 -0700 (Mon, 17 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rewrite WebHTMLConverter::_elementIsBlockLevel in C++
https://bugs.webkit.org/show_bug.cgi?id=130287
Reviewed by Andreas Kling.
Rewrote _elementIsBlockLevel as HTMLConverterCaches::isBlockElement. Also removed the code to update
_elementIsBlockLevel in _traverseNode as computing the value of _elementIsBlockLevel is now fast.
* platform/mac/HTMLConverter.h:
* platform/mac/HTMLConverter.mm:
(HTMLConverterCaches::isBlockElement):
(-[WebHTMLConverter _elementIsBlockLevel:]):
(-[WebHTMLConverter _traverseNode:depth:embedded:]):
(-[WebHTMLConverter dealloc]):
(-[WebHTMLConverter init]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmacHTMLConverterh">trunk/Source/WebCore/platform/mac/HTMLConverter.h</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 (165786 => 165787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-18 01:35:46 UTC (rev 165786)
+++ trunk/Source/WebCore/ChangeLog 2014-03-18 01:38:01 UTC (rev 165787)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-03-17 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><ins>+ Rewrite WebHTMLConverter::_elementIsBlockLevel in C++
+ https://bugs.webkit.org/show_bug.cgi?id=130287
+
+ Reviewed by Andreas Kling.
+
+ Rewrote _elementIsBlockLevel as HTMLConverterCaches::isBlockElement. Also removed the code to update
+ _elementIsBlockLevel in _traverseNode as computing the value of _elementIsBlockLevel is now fast.
+
+ * platform/mac/HTMLConverter.h:
+ * platform/mac/HTMLConverter.mm:
+ (HTMLConverterCaches::isBlockElement):
+ (-[WebHTMLConverter _elementIsBlockLevel:]):
+ (-[WebHTMLConverter _traverseNode:depth:embedded:]):
+ (-[WebHTMLConverter dealloc]):
+ (-[WebHTMLConverter init]):
+
+2014-03-17 Ryosuke Niwa <rniwa@webkit.org>
+
</ins><span class="cx"> Rewrite WebHTMLConverter::_getComputedFloat in C++
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=130284
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacHTMLConverterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/HTMLConverter.h (165786 => 165787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/HTMLConverter.h 2014-03-18 01:35:46 UTC (rev 165786)
+++ trunk/Source/WebCore/platform/mac/HTMLConverter.h 2014-03-18 01:38:01 UTC (rev 165787)
</span><span class="lines">@@ -58,7 +58,6 @@
</span><span class="cx"> NSMutableArray *_textTableRowBackgroundColors;
</span><span class="cx"> NSMutableDictionary *_colorsForNodes;
</span><span class="cx"> NSMutableDictionary *_attributesForElements;
</span><del>- NSMutableDictionary *_elementIsBlockLevel;
</del><span class="cx"> NSMutableDictionary *_fontCache;
</span><span class="cx"> NSMutableArray *_writingDirectionArray;
</span><span class="cx"> NSUInteger _domRangeStartIndex;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacHTMLConvertermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/HTMLConverter.mm (165786 => 165787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/HTMLConverter.mm 2014-03-18 01:35:46 UTC (rev 165786)
+++ trunk/Source/WebCore/platform/mac/HTMLConverter.mm 2014-03-18 01:38:01 UTC (rev 165787)
</span><span class="lines">@@ -403,6 +403,7 @@
</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>+ bool isBlockElement(Element&);
</ins><span class="cx">
</span><span class="cx"> PassRefPtr<CSSValue> computedStylePropertyForElement(Element&, const String&);
</span><span class="cx"> PassRefPtr<CSSValue> inlineStylePropertyForElement(Element&, const String&);
</span><span class="lines">@@ -930,24 +931,20 @@
</span><span class="cx"> return shadow;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)_elementIsBlockLevel:(DOMElement *)element
</del><ins>+bool HTMLConverterCaches::isBlockElement(Element& element)
</ins><span class="cx"> {
</span><del>- BOOL isBlockLevel = NO;
- NSNumber *val = nil;
- val = [_elementIsBlockLevel objectForKey:element];
- if (val)
- isBlockLevel = [val boolValue];
- else {
- NSString *displayVal = [self _stringForNode:element property:@"display"];
- NSString *floatVal = [self _stringForNode:element property:@"float"];
- if (floatVal && ([@"left" isEqualToString:floatVal] || [@"right" isEqualToString:floatVal]))
- isBlockLevel = YES;
- else if (displayVal)
- isBlockLevel = ([@"block" isEqualToString:displayVal] || [@"list-item" isEqualToString:displayVal] || [displayVal hasPrefix:@"table"]);
</del><ins>+ String displayValue = propertyValueForNode(element, "display");
+ if (displayValue == "block" || displayValue == "list-item" || displayValue.startsWith("table"))
+ return true;
+ String floatValue = propertyValueForNode(element, "float");
+ if (floatValue == "left" || floatValue == "right")
+ return true;
+ return false;
+}
</ins><span class="cx">
</span><del>- [_elementIsBlockLevel setObject:[NSNumber numberWithBool:isBlockLevel] forKey:element];
- }
- return isBlockLevel;
</del><ins>+- (BOOL)_elementIsBlockLevel:(DOMElement *)element
+{
+ return element && _caches->isBlockElement(*core(element));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)_elementHasOwnBackgroundColor:(DOMElement *)element
</span><span class="lines">@@ -2282,14 +2279,7 @@
</span><span class="cx"> }
</span><span class="cx"> } else if (nodeType == DOM_ELEMENT_NODE) {
</span><span class="cx"> DOMElement *element = (DOMElement *)node;
</span><del>- NSString *tag = [element tagName], *displayVal = [self _stringForNode:element property:@"display"], *floatVal = [self _stringForNode:element property:@"float"];
- BOOL isBlockLevel = NO;
- if (floatVal && ([@"left" isEqualToString:floatVal] || [@"right" isEqualToString:floatVal])) {
- isBlockLevel = YES;
- } else if (displayVal) {
- isBlockLevel = ([@"block" isEqualToString:displayVal] || [@"list-item" isEqualToString:displayVal] || [displayVal hasPrefix:@"table"]);
- }
- [_elementIsBlockLevel setObject:[NSNumber numberWithBool:isBlockLevel] forKey:element];
</del><ins>+ NSString *tag = [element tagName], *displayVal = [self _stringForNode:element property:@"display"];
</ins><span class="cx"> if ([self _enterElement:element tag:tag display:displayVal embedded:embedded]) {
</span><span class="cx"> NSUInteger startIndex = [_attrStr length];
</span><span class="cx"> if ([self _processElement:element tag:tag display:displayVal depth:depth]) {
</span><span class="lines">@@ -2417,7 +2407,6 @@
</span><span class="cx"> [_textTableRowBackgroundColors release];
</span><span class="cx"> [_colorsForNodes release];
</span><span class="cx"> [_attributesForElements release];
</span><del>- [_elementIsBlockLevel release];
</del><span class="cx"> [_fontCache release];
</span><span class="cx"> [_writingDirectionArray release];
</span><span class="cx"> [super dealloc];
</span><span class="lines">@@ -2443,7 +2432,6 @@
</span><span class="cx"> _textTableRowBackgroundColors = [[NSMutableArray alloc] init];
</span><span class="cx"> _colorsForNodes = [[NSMutableDictionary alloc] init];
</span><span class="cx"> _attributesForElements = [[NSMutableDictionary alloc] init];
</span><del>- _elementIsBlockLevel = [[NSMutableDictionary alloc] init];
</del><span class="cx"> _fontCache = [[NSMutableDictionary alloc] init];
</span><span class="cx"> _writingDirectionArray = [[NSMutableArray alloc] init];
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>