<!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>[162821] 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/162821">162821</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-26 18:22:34 -0800 (Sun, 26 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make DOMStringMap a typedef of DatasetDOMStringMap
https://bugs.webkit.org/show_bug.cgi?id=127658
Reviewed by Sam Weinig.
The only concrete implementation of DOMStringMap is DatasetDOMStringMap.
The abstract interface for a single definition is adding complexity for no gain.
This patch removes DOMStringMap and simply keeps the name through a typedef.
I used a typedef instead of just renaming DatasetDOMStringMap because I think
having both name has value. DatasetDOMStringMap is a better description of what
the implementation does. DOMStringMap is the public name and the classname is
the same as the JavaScript type by convention.
* CMakeLists.txt:
* GNUmakefile.list.am:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* dom/DOMAllInOne.cpp:
* dom/DOMStringMap.cpp: Removed.
* dom/DOMStringMap.h:
* dom/DatasetDOMStringMap.h:
* dom/Element.cpp:
(WebCore::Element::dataset):
* dom/Element.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreGNUmakefilelistam">trunk/Source/WebCore/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoredomDOMAllInOnecpp">trunk/Source/WebCore/dom/DOMAllInOne.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDOMStringMaph">trunk/Source/WebCore/dom/DOMStringMap.h</a></li>
<li><a href="#trunkSourceWebCoredomDatasetDOMStringMaph">trunk/Source/WebCore/dom/DatasetDOMStringMap.h</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementh">trunk/Source/WebCore/dom/Element.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoredomDOMStringMapcpp">trunk/Source/WebCore/dom/DOMStringMap.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (162820 => 162821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-01-27 01:34:45 UTC (rev 162820)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-01-27 02:22:34 UTC (rev 162821)
</span><span class="lines">@@ -1144,7 +1144,6 @@
</span><span class="cx"> dom/DOMImplementation.cpp
</span><span class="cx"> dom/DOMNamedFlowCollection.cpp
</span><span class="cx"> dom/DOMStringList.cpp
</span><del>- dom/DOMStringMap.cpp
</del><span class="cx"> dom/DataTransferItem.cpp
</span><span class="cx"> dom/DatasetDOMStringMap.cpp
</span><span class="cx"> dom/DecodedDataDocumentParser.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162820 => 162821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-27 01:34:45 UTC (rev 162820)
+++ trunk/Source/WebCore/ChangeLog 2014-01-27 02:22:34 UTC (rev 162821)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-01-26 Benjamin Poulain <benjamin@webkit.org>
+
+ Make DOMStringMap a typedef of DatasetDOMStringMap
+ https://bugs.webkit.org/show_bug.cgi?id=127658
+
+ Reviewed by Sam Weinig.
+
+ The only concrete implementation of DOMStringMap is DatasetDOMStringMap.
+ The abstract interface for a single definition is adding complexity for no gain.
+
+ This patch removes DOMStringMap and simply keeps the name through a typedef.
+ I used a typedef instead of just renaming DatasetDOMStringMap because I think
+ having both name has value. DatasetDOMStringMap is a better description of what
+ the implementation does. DOMStringMap is the public name and the classname is
+ the same as the JavaScript type by convention.
+
+ * CMakeLists.txt:
+ * GNUmakefile.list.am:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * dom/DOMAllInOne.cpp:
+ * dom/DOMStringMap.cpp: Removed.
+ * dom/DOMStringMap.h:
+ * dom/DatasetDOMStringMap.h:
+ * dom/Element.cpp:
+ (WebCore::Element::dataset):
+ * dom/Element.h:
+
</ins><span class="cx"> 2014-01-26 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Part 2: Assertion failure in WebCore::PseudoElement::didRecalcStyle()
</span></span></pre></div>
<a id="trunkSourceWebCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.list.am (162820 => 162821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/GNUmakefile.list.am 2014-01-27 01:34:45 UTC (rev 162820)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2014-01-27 02:22:34 UTC (rev 162821)
</span><span class="lines">@@ -2824,7 +2824,6 @@
</span><span class="cx"> Source/WebCore/dom/DOMNamedFlowCollection.h \
</span><span class="cx"> Source/WebCore/dom/DOMStringList.cpp \
</span><span class="cx"> Source/WebCore/dom/DOMStringList.h \
</span><del>- Source/WebCore/dom/DOMStringMap.cpp \
</del><span class="cx"> Source/WebCore/dom/DOMStringMap.h \
</span><span class="cx"> Source/WebCore/dom/DOMTimeStamp.h \
</span><span class="cx"> Source/WebCore/dom/Element.cpp \
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (162820 => 162821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-01-27 01:34:45 UTC (rev 162820)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-01-27 02:22:34 UTC (rev 162821)
</span><span class="lines">@@ -12602,20 +12602,6 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\dom\DOMStringMap.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\dom\Element.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (162820 => 162821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-01-27 01:34:45 UTC (rev 162820)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-01-27 02:22:34 UTC (rev 162821)
</span><span class="lines">@@ -3126,9 +3126,6 @@
</span><span class="cx"> <ClCompile Include="..\dom\DOMStringList.cpp">
</span><span class="cx"> <Filter>dom</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\dom\DOMStringMap.cpp">
- <Filter>dom</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\dom\Element.cpp">
</span><span class="cx"> <Filter>dom</Filter>
</span><span class="cx"> </ClCompile>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (162820 => 162821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-27 01:34:45 UTC (rev 162820)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-27 02:22:34 UTC (rev 162821)
</span><span class="lines">@@ -5027,7 +5027,6 @@
</span><span class="cx"> BC60DA5B0D2A31F700B9918F /* XPathException.h in Headers */ = {isa = PBXBuildFile; fileRef = BC60DA590D2A31F700B9918F /* XPathException.h */; };
</span><span class="cx"> BC60DB490D2A3D1E00B9918F /* JSXPathException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC60DB470D2A3D1E00B9918F /* JSXPathException.cpp */; };
</span><span class="cx"> BC60DB4A0D2A3D1E00B9918F /* JSXPathException.h in Headers */ = {isa = PBXBuildFile; fileRef = BC60DB480D2A3D1E00B9918F /* JSXPathException.h */; };
</span><del>- BC64640911D7F304006455B0 /* DOMStringMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC64640711D7F304006455B0 /* DOMStringMap.cpp */; };
</del><span class="cx"> BC64640A11D7F304006455B0 /* DOMStringMap.h in Headers */ = {isa = PBXBuildFile; fileRef = BC64640811D7F304006455B0 /* DOMStringMap.h */; };
</span><span class="cx"> BC64641C11D7F416006455B0 /* DatasetDOMStringMap.h in Headers */ = {isa = PBXBuildFile; fileRef = BC64641A11D7F416006455B0 /* DatasetDOMStringMap.h */; };
</span><span class="cx"> BC64641D11D7F416006455B0 /* DatasetDOMStringMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC64641B11D7F416006455B0 /* DatasetDOMStringMap.cpp */; };
</span><span class="lines">@@ -12205,7 +12204,6 @@
</span><span class="cx"> BC60DA5A0D2A31F700B9918F /* XPathException.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = XPathException.idl; sourceTree = "<group>"; };
</span><span class="cx"> BC60DB470D2A3D1E00B9918F /* JSXPathException.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSXPathException.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BC60DB480D2A3D1E00B9918F /* JSXPathException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSXPathException.h; sourceTree = "<group>"; };
</span><del>- BC64640711D7F304006455B0 /* DOMStringMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMStringMap.cpp; sourceTree = "<group>"; };
</del><span class="cx"> BC64640811D7F304006455B0 /* DOMStringMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMStringMap.h; sourceTree = "<group>"; };
</span><span class="cx"> BC64641A11D7F416006455B0 /* DatasetDOMStringMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatasetDOMStringMap.h; sourceTree = "<group>"; };
</span><span class="cx"> BC64641B11D7F416006455B0 /* DatasetDOMStringMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatasetDOMStringMap.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -21928,7 +21926,6 @@
</span><span class="cx"> C55610F011A704EB00B82D27 /* DOMStringList.cpp */,
</span><span class="cx"> C544274911A57E7A0063A749 /* DOMStringList.h */,
</span><span class="cx"> C544274A11A57E7A0063A749 /* DOMStringList.idl */,
</span><del>- BC64640711D7F304006455B0 /* DOMStringMap.cpp */,
</del><span class="cx"> BC64640811D7F304006455B0 /* DOMStringMap.h */,
</span><span class="cx"> BC64647911D800CD006455B0 /* DOMStringMap.idl */,
</span><span class="cx"> 05FD69DF12845D4300B2BEB3 /* DOMTimeStamp.h */,
</span><span class="lines">@@ -26814,7 +26811,6 @@
</span><span class="cx"> BC5A86840C33676000EEA649 /* DOMSelection.cpp in Sources */,
</span><span class="cx"> 4ACBC0C312713CCA0094F9B2 /* DOMSettableTokenList.cpp in Sources */,
</span><span class="cx"> C55610F111A704EB00B82D27 /* DOMStringList.cpp in Sources */,
</span><del>- BC64640911D7F304006455B0 /* DOMStringMap.cpp in Sources */,
</del><span class="cx"> 0FF5025C102BA9010066F39A /* DOMStyleMedia.mm in Sources */,
</span><span class="cx"> 850657010AAB4763002D15C0 /* DOMStyleSheet.mm in Sources */,
</span><span class="cx"> 850657030AAB4763002D15C0 /* DOMStyleSheetList.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoredomDOMAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DOMAllInOne.cpp (162820 => 162821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DOMAllInOne.cpp 2014-01-27 01:34:45 UTC (rev 162820)
+++ trunk/Source/WebCore/dom/DOMAllInOne.cpp 2014-01-27 02:22:34 UTC (rev 162821)
</span><span class="lines">@@ -49,7 +49,6 @@
</span><span class="cx"> #include "DOMImplementation.cpp"
</span><span class="cx"> #include "DOMNamedFlowCollection.cpp"
</span><span class="cx"> #include "DOMStringList.cpp"
</span><del>-#include "DOMStringMap.cpp"
</del><span class="cx"> #include "DatasetDOMStringMap.cpp"
</span><span class="cx"> #include "DecodedDataDocumentParser.cpp"
</span><span class="cx"> #include "DeviceMotionController.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCoredomDOMStringMapcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/dom/DOMStringMap.cpp (162820 => 162821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DOMStringMap.cpp 2014-01-27 01:34:45 UTC (rev 162820)
+++ trunk/Source/WebCore/dom/DOMStringMap.cpp 2014-01-27 02:22:34 UTC (rev 162821)
</span><span class="lines">@@ -1,39 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- */
-
-#include "config.h"
-#include "DOMStringMap.h"
-
-namespace WebCore {
-
-DOMStringMap::DOMStringMap()
-{
-}
-
-DOMStringMap::~DOMStringMap()
-{
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoredomDOMStringMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DOMStringMap.h (162820 => 162821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DOMStringMap.h 2014-01-27 01:34:45 UTC (rev 162820)
+++ trunk/Source/WebCore/dom/DOMStringMap.h 2014-01-27 02:22:34 UTC (rev 162821)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -26,36 +26,12 @@
</span><span class="cx"> #ifndef DOMStringMap_h
</span><span class="cx"> #define DOMStringMap_h
</span><span class="cx">
</span><del>-#include "ScriptWrappable.h"
-#include <wtf/Noncopyable.h>
-#include <wtf/Vector.h>
-#include <wtf/text/WTFString.h>
</del><ins>+#include "DatasetDOMStringMap.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class Element;
-typedef int ExceptionCode;
</del><ins>+typedef DatasetDOMStringMap DOMStringMap;
</ins><span class="cx">
</span><del>-class DOMStringMap : public ScriptWrappable {
- WTF_MAKE_NONCOPYABLE(DOMStringMap); WTF_MAKE_FAST_ALLOCATED;
-public:
- virtual ~DOMStringMap();
-
- virtual void ref() = 0;
- virtual void deref() = 0;
-
- virtual void getNames(Vector<String>&) = 0;
- virtual String item(const String& name) = 0;
- virtual bool contains(const String& name) = 0;
- virtual void setItem(const String& name, const String& value, ExceptionCode&) = 0;
- virtual void deleteItem(const String& name, ExceptionCode&) = 0;
-
- virtual Element* element() = 0;
-
-protected:
- DOMStringMap();
-};
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // DOMStringMap_h
</span></span></pre></div>
<a id="trunkSourceWebCoredomDatasetDOMStringMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DatasetDOMStringMap.h (162820 => 162821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DatasetDOMStringMap.h 2014-01-27 01:34:45 UTC (rev 162820)
+++ trunk/Source/WebCore/dom/DatasetDOMStringMap.h 2014-01-27 02:22:34 UTC (rev 162821)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -26,29 +26,34 @@
</span><span class="cx"> #ifndef DatasetDOMStringMap_h
</span><span class="cx"> #define DatasetDOMStringMap_h
</span><span class="cx">
</span><del>-#include "DOMStringMap.h"
</del><ins>+#include "ScriptWrappable.h"
+#include <wtf/Noncopyable.h>
+#include <wtf/Vector.h>
+#include <wtf/text/WTFString.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class Element;
</span><ins>+typedef int ExceptionCode;
</ins><span class="cx">
</span><del>-class DatasetDOMStringMap final : public DOMStringMap {
</del><ins>+class DatasetDOMStringMap final : public ScriptWrappable {
+ WTF_MAKE_NONCOPYABLE(DatasetDOMStringMap); WTF_MAKE_FAST_ALLOCATED;
</ins><span class="cx"> public:
</span><span class="cx"> explicit DatasetDOMStringMap(Element& element)
</span><span class="cx"> : m_element(element)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void ref() override;
- virtual void deref() override;
</del><ins>+ void ref();
+ void deref();
</ins><span class="cx">
</span><del>- virtual void getNames(Vector<String>&) override;
- virtual String item(const String& name) override;
- virtual bool contains(const String& name) override;
- virtual void setItem(const String& name, const String& value, ExceptionCode&) override;
- virtual void deleteItem(const String& name, ExceptionCode&) override;
</del><ins>+ void getNames(Vector<String>&);
+ String item(const String& name);
+ bool contains(const String& name);
+ void setItem(const String& name, const String& value, ExceptionCode&);
+ void deleteItem(const String& name, ExceptionCode&);
</ins><span class="cx">
</span><del>- virtual Element* element() override { return &m_element; }
</del><ins>+ Element* element() { return &m_element; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Element& m_element;
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (162820 => 162821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2014-01-27 01:34:45 UTC (rev 162820)
+++ trunk/Source/WebCore/dom/Element.cpp 2014-01-27 02:22:34 UTC (rev 162821)
</span><span class="lines">@@ -2436,7 +2436,7 @@
</span><span class="cx"> return data.classList();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DOMStringMap* Element::dataset()
</del><ins>+DatasetDOMStringMap* Element::dataset()
</ins><span class="cx"> {
</span><span class="cx"> ElementRareData& data = ensureElementRareData();
</span><span class="cx"> if (!data.dataset())
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (162820 => 162821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h 2014-01-27 01:34:45 UTC (rev 162820)
+++ trunk/Source/WebCore/dom/Element.h 2014-01-27 02:22:34 UTC (rev 162821)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> class ClientRect;
</span><span class="cx"> class ClientRectList;
</span><del>-class DOMStringMap;
</del><ins>+class DatasetDOMStringMap;
</ins><span class="cx"> class DOMTokenList;
</span><span class="cx"> class ElementRareData;
</span><span class="cx"> class HTMLDocument;
</span><span class="lines">@@ -459,7 +459,7 @@
</span><span class="cx">
</span><span class="cx"> DOMTokenList* classList();
</span><span class="cx">
</span><del>- DOMStringMap* dataset();
</del><ins>+ DatasetDOMStringMap* dataset();
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> virtual bool isMediaElement() const { return false; }
</span></span></pre>
</div>
</div>
</body>
</html>