<!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>[160492] trunk/Source</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/160492">160492</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2013-12-12 10:31:47 -0800 (Thu, 12 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Replace uses of WTF::BitArray with std::bitset
https://bugs.webkit.org/show_bug.cgi?id=125642
Reviewed by Anders Carlsson.
../WebCore:
* css/CSSParser.cpp:
(WebCore::filterProperties):
(WebCore::CSSParser::createStyleProperties):
* css/StyleProperties.cpp:
(WebCore::StyleProperties::asText):
../WTF:
* GNUmakefile.list.am:
* WTF.vcxproj/WTF.vcxproj:
* WTF.vcxproj/WTF.vcxproj.filters:
* WTF.xcodeproj/project.pbxproj:
* wtf/BitArray.h: Removed.
* wtf/CMakeLists.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFGNUmakefilelistam">trunk/Source/WTF/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojWTFvcxproj">trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojWTFvcxprojfilters">trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters</a></li>
<li><a href="#trunkSourceWTFWTFxcodeprojprojectpbxproj">trunk/Source/WTF/WTF.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWTFwtfCMakeListstxt">trunk/Source/WTF/wtf/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStylePropertiescpp">trunk/Source/WebCore/css/StyleProperties.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWTFwtfBitArrayh">trunk/Source/WTF/wtf/BitArray.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (160491 => 160492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2013-12-12 18:21:30 UTC (rev 160491)
+++ trunk/Source/WTF/ChangeLog 2013-12-12 18:31:47 UTC (rev 160492)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2013-12-12 Sam Weinig <sam@webkit.org>
+
+ Replace uses of WTF::BitArray with std::bitset
+ https://bugs.webkit.org/show_bug.cgi?id=125642
+
+ Reviewed by Anders Carlsson.
+
+ * GNUmakefile.list.am:
+ * WTF.vcxproj/WTF.vcxproj:
+ * WTF.vcxproj/WTF.vcxproj.filters:
+ * WTF.xcodeproj/project.pbxproj:
+ * wtf/BitArray.h: Removed.
+ * wtf/CMakeLists.txt:
+
</ins><span class="cx"> 2013-12-11 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Define m_hasBadParent in InlineBox if defined(ADDRESS_SANITIZER)
</span></span></pre></div>
<a id="trunkSourceWTFGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/GNUmakefile.list.am (160491 => 160492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/GNUmakefile.list.am 2013-12-12 18:21:30 UTC (rev 160491)
+++ trunk/Source/WTF/GNUmakefile.list.am 2013-12-12 18:31:47 UTC (rev 160492)
</span><span class="lines">@@ -10,7 +10,6 @@
</span><span class="cx"> Source/WTF/wtf/AutodrainedPool.h \
</span><span class="cx"> Source/WTF/wtf/Bag.h \
</span><span class="cx"> Source/WTF/wtf/BagToHashMap.h \
</span><del>- Source/WTF/wtf/BitArray.h \
</del><span class="cx"> Source/WTF/wtf/BitVector.cpp \
</span><span class="cx"> Source/WTF/wtf/BitVector.h \
</span><span class="cx"> Source/WTF/wtf/Bitmap.h \
</span></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojWTFvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj (160491 => 160492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj 2013-12-12 18:21:30 UTC (rev 160491)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj 2013-12-12 18:31:47 UTC (rev 160492)
</span><span class="lines">@@ -160,7 +160,6 @@
</span><span class="cx"> <ClInclude Include="..\wtf\AVLTree.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\Bag.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\BagToHashMap.h" />
</span><del>- <ClInclude Include="..\wtf\BitArray.h" />
</del><span class="cx"> <ClInclude Include="..\wtf\Bitmap.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\BitVector.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\BlockStack.h" />
</span></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojWTFvcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters (160491 => 160492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters 2013-12-12 18:21:30 UTC (rev 160491)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters 2013-12-12 18:31:47 UTC (rev 160492)
</span><span class="lines">@@ -362,9 +362,6 @@
</span><span class="cx"> <ClInclude Include="..\wtf\AVLTree.h">
</span><span class="cx"> <Filter>wtf</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\wtf\BitArray.h">
- <Filter>wtf</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\wtf\Bitmap.h">
</span><span class="cx"> <Filter>wtf</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWTFWTFxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (160491 => 160492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2013-12-12 18:21:30 UTC (rev 160491)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2013-12-12 18:31:47 UTC (rev 160492)
</span><span class="lines">@@ -65,7 +65,6 @@
</span><span class="cx"> 2CDED0F318115C85004DBA70 /* RunLoop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2CDED0F118115C85004DBA70 /* RunLoop.cpp */; };
</span><span class="cx"> 2CDED0F418115C85004DBA70 /* RunLoop.h in Headers */ = {isa = PBXBuildFile; fileRef = 2CDED0F218115C85004DBA70 /* RunLoop.h */; };
</span><span class="cx"> 44F66008171AFAE600E4AD19 /* EnumClass.h in Headers */ = {isa = PBXBuildFile; fileRef = 44F66007171AFAA900E4AD19 /* EnumClass.h */; };
</span><del>- 4F0321BC156AA8D1006EBAF6 /* BitArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F0321BB156AA8D1006EBAF6 /* BitArray.h */; };
</del><span class="cx"> 7E29C33E15FFD79B00516D61 /* ObjcRuntimeExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E29C33D15FFD79B00516D61 /* ObjcRuntimeExtras.h */; };
</span><span class="cx"> 8134013815B092FD001FF0B8 /* Base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8134013615B092FD001FF0B8 /* Base64.cpp */; };
</span><span class="cx"> 8134013915B092FD001FF0B8 /* Base64.h in Headers */ = {isa = PBXBuildFile; fileRef = 8134013715B092FD001FF0B8 /* Base64.h */; };
</span><span class="lines">@@ -333,7 +332,6 @@
</span><span class="cx"> 2CDED0F218115C85004DBA70 /* RunLoop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RunLoop.h; sourceTree = "<group>"; };
</span><span class="cx"> 44DEE74A152274BB00C6EC37 /* iOS.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> 44F66007171AFAA900E4AD19 /* EnumClass.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EnumClass.h; sourceTree = "<group>"; };
</span><del>- 4F0321BB156AA8D1006EBAF6 /* BitArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BitArray.h; sourceTree = "<group>"; };
</del><span class="cx"> 5D247B6214689B8600E78B76 /* libWTF.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libWTF.a; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="cx"> 5D247B6E14689C4700E78B76 /* Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> 5D247B7014689C4700E78B76 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
</span><span class="lines">@@ -655,7 +653,6 @@
</span><span class="cx"> A8A4725E151A825A004123FF /* AVLTree.h */,
</span><span class="cx"> 0FB14E18180FA218009B6B4D /* Bag.h */,
</span><span class="cx"> 0FB14E1A1810E1DA009B6B4D /* BagToHashMap.h */,
</span><del>- 4F0321BB156AA8D1006EBAF6 /* BitArray.h */,
</del><span class="cx"> A8A4725F151A825A004123FF /* Bitmap.h */,
</span><span class="cx"> A8A47260151A825A004123FF /* BitVector.cpp */,
</span><span class="cx"> A8A47261151A825A004123FF /* BitVector.h */,
</span><span class="lines">@@ -964,7 +961,6 @@
</span><span class="cx"> A8A473A9151A825B004123FF /* bignum-dtoa.h in Headers */,
</span><span class="cx"> A8A473AB151A825B004123FF /* bignum.h in Headers */,
</span><span class="cx"> A8A47452151A825B004123FF /* BinarySemaphore.h in Headers */,
</span><del>- 4F0321BC156AA8D1006EBAF6 /* BitArray.h in Headers */,
</del><span class="cx"> A8A4738A151A825B004123FF /* Bitmap.h in Headers */,
</span><span class="cx"> A8A4738C151A825B004123FF /* BitVector.h in Headers */,
</span><span class="cx"> A8A4738E151A825B004123FF /* BlockStack.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWTFwtfBitArrayh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WTF/wtf/BitArray.h (160491 => 160492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/BitArray.h 2013-12-12 18:21:30 UTC (rev 160491)
+++ trunk/Source/WTF/wtf/BitArray.h 2013-12-12 18:31:47 UTC (rev 160492)
</span><span class="lines">@@ -1,62 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef BitArray_h
-#define BitArray_h
-
-#include <string.h>
-#include <wtf/Assertions.h>
-
-namespace WTF {
-
-template<unsigned arraySize>
-class BitArray {
-public:
- BitArray()
- {
- memset(m_data, 0, sizeof(m_data));
- }
-
- void set(unsigned index)
- {
- ASSERT_WITH_SECURITY_IMPLICATION(index < arraySize);
- m_data[index / 8] |= 1 << (index & 7);
- }
-
- bool get(unsigned index) const
- {
- ASSERT_WITH_SECURITY_IMPLICATION(index < arraySize);
- return !!(m_data[index / 8] & (1 << (index & 7)));
- }
-
-private:
- unsigned char m_data[arraySize / 8 + 1];
-};
-
-} // namespace WTF
-
-using WTF::BitArray;
-
-#endif // BitArray_h
</del></span></pre></div>
<a id="trunkSourceWTFwtfCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/CMakeLists.txt (160491 => 160492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/CMakeLists.txt 2013-12-12 18:21:30 UTC (rev 160491)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2013-12-12 18:31:47 UTC (rev 160492)
</span><span class="lines">@@ -5,7 +5,6 @@
</span><span class="cx"> Atomics.h
</span><span class="cx"> Bag.h
</span><span class="cx"> BagToHashMap.h
</span><del>- BitArray.h
</del><span class="cx"> BitVector.h
</span><span class="cx"> Bitmap.h
</span><span class="cx"> BoundsCheckedPointer.h
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160491 => 160492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-12 18:21:30 UTC (rev 160491)
+++ trunk/Source/WebCore/ChangeLog 2013-12-12 18:31:47 UTC (rev 160492)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2013-12-12 Sam Weinig <sam@webkit.org>
+
+ Replace uses of WTF::BitArray with std::bitset
+ https://bugs.webkit.org/show_bug.cgi?id=125642
+
+ Reviewed by Anders Carlsson.
+
+ * css/CSSParser.cpp:
+ (WebCore::filterProperties):
+ (WebCore::CSSParser::createStyleProperties):
+ * css/StyleProperties.cpp:
+ (WebCore::StyleProperties::asText):
+
</ins><span class="cx"> 2013-12-12 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Make algorithm.name return registered name, not normalized one
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (160491 => 160492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2013-12-12 18:21:30 UTC (rev 160491)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2013-12-12 18:31:47 UTC (rev 160492)
</span><span class="lines">@@ -84,8 +84,8 @@
</span><span class="cx"> #include "WebKitCSSKeyframesRule.h"
</span><span class="cx"> #include "WebKitCSSRegionRule.h"
</span><span class="cx"> #include "WebKitCSSTransformValue.h"
</span><ins>+#include <bitset>
</ins><span class="cx"> #include <limits.h>
</span><del>-#include <wtf/BitArray.h>
</del><span class="cx"> #include <wtf/HexNumber.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #include <wtf/dtoa.h>
</span><span class="lines">@@ -1479,7 +1479,7 @@
</span><span class="cx"> return m_mediaQuery.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline void filterProperties(bool important, const CSSParser::ParsedPropertyVector& input, Vector<CSSProperty, 256>& output, size_t& unusedEntries, BitArray<numCSSProperties>& seenProperties)
</del><ins>+static inline void filterProperties(bool important, const CSSParser::ParsedPropertyVector& input, Vector<CSSProperty, 256>& output, size_t& unusedEntries, std::bitset<numCSSProperties>& seenProperties)
</ins><span class="cx"> {
</span><span class="cx"> // Add properties in reverse order so that highest priority definitions are reached first. Duplicate definitions can then be ignored when found.
</span><span class="cx"> for (int i = input.size() - 1; i >= 0; --i) {
</span><span class="lines">@@ -1487,7 +1487,7 @@
</span><span class="cx"> if (property.isImportant() != important)
</span><span class="cx"> continue;
</span><span class="cx"> const unsigned propertyIDIndex = property.id() - firstCSSProperty;
</span><del>- if (seenProperties.get(propertyIDIndex))
</del><ins>+ if (seenProperties.test(propertyIDIndex))
</ins><span class="cx"> continue;
</span><span class="cx"> seenProperties.set(propertyIDIndex);
</span><span class="cx"> output[--unusedEntries] = property;
</span><span class="lines">@@ -1496,7 +1496,7 @@
</span><span class="cx">
</span><span class="cx"> PassRef<ImmutableStyleProperties> CSSParser::createStyleProperties()
</span><span class="cx"> {
</span><del>- BitArray<numCSSProperties> seenProperties;
</del><ins>+ std::bitset<numCSSProperties> seenProperties;
</ins><span class="cx"> size_t unusedEntries = m_parsedProperties.size();
</span><span class="cx"> Vector<CSSProperty, 256> results(unusedEntries);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssStylePropertiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleProperties.cpp (160491 => 160492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleProperties.cpp 2013-12-12 18:21:30 UTC (rev 160491)
+++ trunk/Source/WebCore/css/StyleProperties.cpp 2013-12-12 18:31:47 UTC (rev 160492)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #include "PropertySetCSSStyleDeclaration.h"
</span><span class="cx"> #include "StylePropertyShorthand.h"
</span><span class="cx"> #include "StyleSheetContents.h"
</span><del>-#include <wtf/BitArray.h>
</del><ins>+#include <bitset>
</ins><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><span class="lines">@@ -779,8 +779,8 @@
</span><span class="cx"> int repeatXPropertyIndex = -1;
</span><span class="cx"> int repeatYPropertyIndex = -1;
</span><span class="cx">
</span><del>- BitArray<numCSSProperties> shorthandPropertyUsed;
- BitArray<numCSSProperties> shorthandPropertyAppeared;
</del><ins>+ std::bitset<numCSSProperties> shorthandPropertyUsed;
+ std::bitset<numCSSProperties> shorthandPropertyAppeared;
</ins><span class="cx">
</span><span class="cx"> unsigned size = propertyCount();
</span><span class="cx"> unsigned numDecls = 0;
</span><span class="lines">@@ -824,13 +824,13 @@
</span><span class="cx"> borderFallbackShorthandProperty = CSSPropertyBorderColor;
</span><span class="cx">
</span><span class="cx"> // FIXME: Deal with cases where only some of border-(top|right|bottom|left) are specified.
</span><del>- if (!shorthandPropertyAppeared.get(CSSPropertyBorder - firstCSSProperty)) {
</del><ins>+ if (!shorthandPropertyAppeared.test(CSSPropertyBorder - firstCSSProperty)) {
</ins><span class="cx"> value = borderPropertyValue(ReturnNullOnUncommonValues);
</span><span class="cx"> if (value.isNull())
</span><span class="cx"> shorthandPropertyAppeared.set(CSSPropertyBorder - firstCSSProperty);
</span><span class="cx"> else
</span><span class="cx"> shorthandPropertyID = CSSPropertyBorder;
</span><del>- } else if (shorthandPropertyUsed.get(CSSPropertyBorder - firstCSSProperty))
</del><ins>+ } else if (shorthandPropertyUsed.test(CSSPropertyBorder - firstCSSProperty))
</ins><span class="cx"> shorthandPropertyID = CSSPropertyBorder;
</span><span class="cx"> if (!shorthandPropertyID)
</span><span class="cx"> shorthandPropertyID = borderFallbackShorthandProperty;
</span><span class="lines">@@ -925,9 +925,9 @@
</span><span class="cx">
</span><span class="cx"> unsigned shortPropertyIndex = shorthandPropertyID - firstCSSProperty;
</span><span class="cx"> if (shorthandPropertyID) {
</span><del>- if (shorthandPropertyUsed.get(shortPropertyIndex))
</del><ins>+ if (shorthandPropertyUsed.test(shortPropertyIndex))
</ins><span class="cx"> continue;
</span><del>- if (!shorthandPropertyAppeared.get(shortPropertyIndex) && value.isNull())
</del><ins>+ if (!shorthandPropertyAppeared.test(shortPropertyIndex) && value.isNull())
</ins><span class="cx"> value = getPropertyValue(shorthandPropertyID);
</span><span class="cx"> shorthandPropertyAppeared.set(shortPropertyIndex);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>