<!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>[161309] 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/161309">161309</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-01-04 09:26:52 -0800 (Sat, 04 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Explicitly use the std:: nested name specifier when using std::pair, std::make_pair
https://bugs.webkit.org/show_bug.cgi?id=126439
Reviewed by Andreas Kling.
Source/JavaScriptCore:
Instead of relying on std::pair and std::make_pair symbols being present in the current scope
through the pair and make_pair symbols, the std:: specifier should be used explicitly.
* bytecode/Opcode.cpp:
(JSC::compareOpcodePairIndices):
(JSC::OpcodeStats::~OpcodeStats):
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::BytecodeGenerator):
* parser/ASTBuilder.h:
(JSC::ASTBuilder::makeBinaryNode):
* parser/Parser.cpp:
(JSC::Parser<LexerType>::parseIfStatement):
* runtime/Structure.cpp:
(JSC::StructureTransitionTable::contains):
(JSC::StructureTransitionTable::get):
(JSC::StructureTransitionTable::add):
Source/WebCore:
Instead of relying on std::pair and std::make_pair symbols being present in the current scope
through the pair and make_pair symbols, the std:: specifier should be used explicitly.
* Modules/webdatabase/DatabaseTracker.cpp:
(WebCore::DatabaseTracker::scheduleNotifyDatabaseChanged):
* accessibility/AXObjectCache.h:
* accessibility/AccessibilityARIAGridCell.cpp:
(WebCore::AccessibilityARIAGridCell::rowIndexRange):
(WebCore::AccessibilityARIAGridCell::columnIndexRange):
* accessibility/AccessibilityARIAGridCell.h:
* accessibility/AccessibilityObject.h:
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::mathPrescripts):
(WebCore::AccessibilityRenderObject::mathPostscripts):
* accessibility/AccessibilityTable.cpp:
(WebCore::AccessibilityTable::cellForColumnAndRow):
* accessibility/AccessibilityTableCell.cpp:
(WebCore::AccessibilityTableCell::rowIndexRange):
(WebCore::AccessibilityTableCell::columnIndexRange):
* accessibility/AccessibilityTableCell.h:
* accessibility/atk/WebKitAccessibleInterfaceTable.cpp:
(webkitAccessibleTableGetColumnAtIndex):
(webkitAccessibleTableGetRowAtIndex):
(webkitAccessibleTableGetColumnExtentAt):
(webkitAccessibleTableGetRowExtentAt):
(webkitAccessibleTableGetColumnHeader):
(webkitAccessibleTableGetRowHeader):
* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(-[WebAccessibilityObjectWrapper accessibilityHeaderElements]):
(-[WebAccessibilityObjectWrapper accessibilityRowRange]):
(-[WebAccessibilityObjectWrapper accessibilityColumnRange]):
* accessibility/mac/WebAccessibilityObjectWrapperBase.mm:
(convertMathPairsToNSArray):
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
* bindings/js/SerializedScriptValue.cpp:
* dom/ContainerNode.cpp:
* dom/StyledElement.cpp:
(WebCore::attributeNameSort):
* html/MediaFragmentURIParser.cpp:
(WebCore::MediaFragmentURIParser::parseTimeFragment):
* html/parser/HTMLMetaCharsetParser.h:
* inspector/ContentSearchUtils.cpp:
(WebCore::ContentSearchUtils::getRegularExpressionMatchesByLines):
(WebCore::ContentSearchUtils::searchInTextByLines):
* inspector/DOMPatchSupport.cpp:
(WebCore::DOMPatchSupport::diff):
(WebCore::DOMPatchSupport::innerPatchChildren):
* inspector/DOMPatchSupport.h:
* inspector/InspectorAgent.cpp:
(WebCore::InspectorAgent::enable):
(WebCore::InspectorAgent::evaluateForTestInFrontend):
* inspector/InspectorAgent.h:
* loader/FormSubmission.cpp:
(WebCore::FormSubmission::create):
* loader/cache/CachedImage.cpp:
(WebCore::CachedImage::brokenImage):
* loader/cache/CachedImage.h:
* platform/URL.cpp:
(WebCore::findHostnamesInMailToURL):
(WebCore::encodeHostnames):
* platform/blackberry/CookieDatabaseBackingStore/CookieDatabaseBackingStore.h:
* platform/graphics/FontCache.cpp:
(WebCore::FontCache::getCachedFontData):
* platform/graphics/WidthIterator.cpp:
* platform/network/HTTPHeaderMap.cpp:
(WebCore::HTTPHeaderMap::adopt):
* platform/network/ResourceResponseBase.cpp:
(WebCore::ResourceResponseBase::parseCacheControlDirectives):
(WebCore::parseCacheHeader):
* platform/text/AtomicStringKeyedMRUCache.h:
* platform/text/LineBreakIteratorPoolICU.h:
* rendering/InlineFlowBox.h:
* rendering/RenderImage.cpp:
(WebCore::RenderImage::imageSizeForError):
(WebCore::RenderImage::paintReplaced):
* rendering/RenderTableSection.cpp:
(WebCore::RenderTableSection::cachedCollapsedBorder):
* rendering/RenderTableSection.h:
* rendering/svg/SVGTextRunRenderingContext.cpp:
(WebCore::SVGTextRunRenderingContext::glyphDataForCharacter):
* svg/SVGAnimatedAngle.cpp:
(WebCore::SVGAnimatedAngleAnimator::constructFromString):
(WebCore::SVGAnimatedAngleAnimator::addAnimatedTypes):
(WebCore::SVGAnimatedAngleAnimator::calculateAnimatedValue):
* svg/SVGAnimatedIntegerOptionalInteger.cpp:
(WebCore::SVGAnimatedIntegerOptionalIntegerAnimator::constructFromString):
(WebCore::SVGAnimatedIntegerOptionalIntegerAnimator::addAnimatedTypes):
(WebCore::SVGAnimatedIntegerOptionalIntegerAnimator::calculateAnimatedValue):
* svg/SVGAnimatedNumberOptionalNumber.cpp:
(WebCore::SVGAnimatedNumberOptionalNumberAnimator::constructFromString):
(WebCore::SVGAnimatedNumberOptionalNumberAnimator::addAnimatedTypes):
(WebCore::SVGAnimatedNumberOptionalNumberAnimator::calculateAnimatedValue):
* svg/SVGAnimatedType.cpp:
(WebCore::SVGAnimatedType::createIntegerOptionalInteger):
(WebCore::SVGAnimatedType::createNumberOptionalNumber):
* svg/SVGAnimatedType.h:
(WebCore::SVGAnimatedType::integerOptionalInteger):
(WebCore::SVGAnimatedType::numberOptionalNumber):
* svg/SVGAnimatedTypeAnimator.h:
(WebCore::SVGAnimatedTypeAnimator::constructFromBaseValues):
(WebCore::SVGAnimatedTypeAnimator::resetFromBaseValues):
* svg/SVGParserUtilities.h:
* svg/animation/SMILTimeContainer.h:
Source/WebKit/mac:
Instead of relying on std::pair and std::make_pair symbols being present in the current scope
through the pair and make_pair symbols, the std:: specifier should be used explicitly.
* Plugins/Hosted/NetscapePluginInstanceProxy.h:
* Plugins/Hosted/NetscapePluginInstanceProxy.mm:
(WebKit::NetscapePluginInstanceProxy::LocalObjectMap::idForObject):
(WebKit::NetscapePluginInstanceProxy::LocalObjectMap::retain):
(WebKit::NetscapePluginInstanceProxy::LocalObjectMap::release):
(WebKit::NetscapePluginInstanceProxy::LocalObjectMap::forget):
Source/WebKit2:
Instead of relying on std::pair and std::make_pair symbols being present in the current scope
through the pair and make_pair symbols, the std:: specifier should be used explicitly.
* Shared/mac/ArgumentCodersMac.mm:
(IPC::encode):
* UIProcess/Notifications/WebNotificationManagerProxy.cpp:
(WebKit::WebNotificationManagerProxy::show):
(WebKit::WebNotificationManagerProxy::cancel):
(WebKit::WebNotificationManagerProxy::didDestroyNotification):
* UIProcess/Notifications/WebNotificationManagerProxy.h:
* UIProcess/WebContext.cpp:
(WebKit::WebContext::createNewWebProcess):
* UIProcess/WebContext.h:
Source/WTF:
* wtf/VectorTraits.h: Stop bringing std::pair into the current scope.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeOpcodecpp">trunk/Source/JavaScriptCore/bytecode/Opcode.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserASTBuilderh">trunk/Source/JavaScriptCore/parser/ASTBuilder.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParsercpp">trunk/Source/JavaScriptCore/parser/Parser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStructurecpp">trunk/Source/JavaScriptCore/runtime/Structure.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfVectorTraitsh">trunk/Source/WTF/wtf/VectorTraits.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseTrackercpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAXObjectCacheh">trunk/Source/WebCore/accessibility/AXObjectCache.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityARIAGridCellcpp">trunk/Source/WebCore/accessibility/AccessibilityARIAGridCell.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityARIAGridCellh">trunk/Source/WebCore/accessibility/AccessibilityARIAGridCell.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjecth">trunk/Source/WebCore/accessibility/AccessibilityObject.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityTablecpp">trunk/Source/WebCore/accessibility/AccessibilityTable.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityTableCellcpp">trunk/Source/WebCore/accessibility/AccessibilityTableCell.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityTableCellh">trunk/Source/WebCore/accessibility/AccessibilityTableCell.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityatkWebKitAccessibleInterfaceTablecpp">trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTable.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm">trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperBasemm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsjsSerializedScriptValuecpp">trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp</a></li>
<li><a href="#trunkSourceWebCoredomContainerNodecpp">trunk/Source/WebCore/dom/ContainerNode.cpp</a></li>
<li><a href="#trunkSourceWebCoredomStyledElementcpp">trunk/Source/WebCore/dom/StyledElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaFragmentURIParsercpp">trunk/Source/WebCore/html/MediaFragmentURIParser.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLMetaCharsetParserh">trunk/Source/WebCore/html/parser/HTMLMetaCharsetParser.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorContentSearchUtilscpp">trunk/Source/WebCore/inspector/ContentSearchUtils.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorDOMPatchSupportcpp">trunk/Source/WebCore/inspector/DOMPatchSupport.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorDOMPatchSupporth">trunk/Source/WebCore/inspector/DOMPatchSupport.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorAgentcpp">trunk/Source/WebCore/inspector/InspectorAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorAgenth">trunk/Source/WebCore/inspector/InspectorAgent.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFormSubmissioncpp">trunk/Source/WebCore/loader/FormSubmission.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedImagecpp">trunk/Source/WebCore/loader/cache/CachedImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedImageh">trunk/Source/WebCore/loader/cache/CachedImage.h</a></li>
<li><a href="#trunkSourceWebCoreplatformURLcpp">trunk/Source/WebCore/platform/URL.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformblackberryCookieDatabaseBackingStoreCookieDatabaseBackingStoreh">trunk/Source/WebCore/platform/blackberry/CookieDatabaseBackingStore/CookieDatabaseBackingStore.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCachecpp">trunk/Source/WebCore/platform/graphics/FontCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsWidthIteratorcpp">trunk/Source/WebCore/platform/graphics/WidthIterator.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkHTTPHeaderMapcpp">trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceResponseBasecpp">trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformtextAtomicStringKeyedMRUCacheh">trunk/Source/WebCore/platform/text/AtomicStringKeyedMRUCache.h</a></li>
<li><a href="#trunkSourceWebCoreplatformtextLineBreakIteratorPoolICUh">trunk/Source/WebCore/platform/text/LineBreakIteratorPoolICU.h</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineFlowBoxh">trunk/Source/WebCore/rendering/InlineFlowBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderImagecpp">trunk/Source/WebCore/rendering/RenderImage.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableSectioncpp">trunk/Source/WebCore/rendering/RenderTableSection.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableSectionh">trunk/Source/WebCore/rendering/RenderTableSection.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGTextRunRenderingContextcpp">trunk/Source/WebCore/rendering/svg/SVGTextRunRenderingContext.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGAnimatedAnglecpp">trunk/Source/WebCore/svg/SVGAnimatedAngle.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGAnimatedIntegerOptionalIntegercpp">trunk/Source/WebCore/svg/SVGAnimatedIntegerOptionalInteger.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGAnimatedNumberOptionalNumbercpp">trunk/Source/WebCore/svg/SVGAnimatedNumberOptionalNumber.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGAnimatedTypecpp">trunk/Source/WebCore/svg/SVGAnimatedType.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGAnimatedTypeh">trunk/Source/WebCore/svg/SVGAnimatedType.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGAnimatedTypeAnimatorh">trunk/Source/WebCore/svg/SVGAnimatedTypeAnimator.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGParserUtilitiesh">trunk/Source/WebCore/svg/SVGParserUtilities.h</a></li>
<li><a href="#trunkSourceWebCoresvganimationSMILTimeContainerh">trunk/Source/WebCore/svg/animation/SMILTimeContainer.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacPluginsHostedNetscapePluginInstanceProxyh">trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h</a></li>
<li><a href="#trunkSourceWebKitmacPluginsHostedNetscapePluginInstanceProxymm">trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedmacArgumentCodersMacmm">trunk/Source/WebKit2/Shared/mac/ArgumentCodersMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNotificationsWebNotificationManagerProxycpp">trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNotificationsWebNotificationManagerProxyh">trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextcpp">trunk/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContexth">trunk/Source/WebKit2/UIProcess/WebContext.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-01-04 Zan Dobersek <zdobersek@igalia.com>
+
+ Explicitly use the std:: nested name specifier when using std::pair, std::make_pair
+ https://bugs.webkit.org/show_bug.cgi?id=126439
+
+ Reviewed by Andreas Kling.
+
+ Instead of relying on std::pair and std::make_pair symbols being present in the current scope
+ through the pair and make_pair symbols, the std:: specifier should be used explicitly.
+
+ * bytecode/Opcode.cpp:
+ (JSC::compareOpcodePairIndices):
+ (JSC::OpcodeStats::~OpcodeStats):
+ * bytecompiler/BytecodeGenerator.cpp:
+ (JSC::BytecodeGenerator::BytecodeGenerator):
+ * parser/ASTBuilder.h:
+ (JSC::ASTBuilder::makeBinaryNode):
+ * parser/Parser.cpp:
+ (JSC::Parser<LexerType>::parseIfStatement):
+ * runtime/Structure.cpp:
+ (JSC::StructureTransitionTable::contains):
+ (JSC::StructureTransitionTable::get):
+ (JSC::StructureTransitionTable::add):
+
</ins><span class="cx"> 2014-01-03 David Farler <dfarler@apple.com>
</span><span class="cx">
</span><span class="cx"> [super dealloc] missing in Source/JavaScriptCore/API/tests/testapi.mm, fails to build with -Werror,-Wobjc-missing-super-calls
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeOpcodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/Opcode.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/Opcode.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/JavaScriptCore/bytecode/Opcode.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -78,9 +78,9 @@
</span><span class="cx">
</span><span class="cx"> static int compareOpcodePairIndices(const void* left, const void* right)
</span><span class="cx"> {
</span><del>- pair<int, int> leftPair = *(pair<int, int>*) left;
</del><ins>+ std::pair<int, int> leftPair = *(pair<int, int>*) left;
</ins><span class="cx"> long long leftValue = OpcodeStats::opcodePairCounts[leftPair.first][leftPair.second];
</span><del>- pair<int, int> rightPair = *(pair<int, int>*) right;
</del><ins>+ std::pair<int, int> rightPair = *(pair<int, int>*) right;
</ins><span class="cx"> long long rightValue = OpcodeStats::opcodePairCounts[rightPair.first][rightPair.second];
</span><span class="cx">
</span><span class="cx"> if (leftValue < rightValue)
</span><span class="lines">@@ -107,12 +107,12 @@
</span><span class="cx"> sortedIndices[i] = i;
</span><span class="cx"> qsort(sortedIndices.data(), numOpcodeIDs, sizeof(int), compareOpcodeIndices);
</span><span class="cx">
</span><del>- pair<int, int> sortedPairIndices[numOpcodeIDs * numOpcodeIDs];
- pair<int, int>* currentPairIndex = sortedPairIndices;
</del><ins>+ std::pair<int, int> sortedPairIndices[numOpcodeIDs * numOpcodeIDs];
+ std::pair<int, int>* currentPairIndex = sortedPairIndices;
</ins><span class="cx"> for (int i = 0; i < numOpcodeIDs; ++i)
</span><span class="cx"> for (int j = 0; j < numOpcodeIDs; ++j)
</span><del>- *(currentPairIndex++) = make_pair(i, j);
- qsort(sortedPairIndices, numOpcodeIDs * numOpcodeIDs, sizeof(pair<int, int>), compareOpcodePairIndices);
</del><ins>+ *(currentPairIndex++) = std::make_pair(i, j);
+ qsort(sortedPairIndices, numOpcodeIDs * numOpcodeIDs, sizeof(std::pair<int, int>), compareOpcodePairIndices);
</ins><span class="cx">
</span><span class="cx"> dataLogF("\nExecuted opcode statistics\n");
</span><span class="cx">
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> dataLogF("2-opcode sequences by frequency: %lld\n\n", totalInstructions);
</span><span class="cx">
</span><span class="cx"> for (int i = 0; i < numOpcodeIDs * numOpcodeIDs; ++i) {
</span><del>- pair<int, int> indexPair = sortedPairIndices[i];
</del><ins>+ std::pair<int, int> indexPair = sortedPairIndices[i];
</ins><span class="cx"> long long count = opcodePairCounts[indexPair.first][indexPair.second];
</span><span class="cx">
</span><span class="cx"> if (!count)
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> dataLogF("\n%s:%s %lld - %.2f%%\n", opcodeNames[index], padOpcodeName((OpcodeID)index, 28), opcodeCount, opcodeProportion * 100.0);
</span><span class="cx">
</span><span class="cx"> for (int j = 0; j < numOpcodeIDs * numOpcodeIDs; ++j) {
</span><del>- pair<int, int> indexPair = sortedPairIndices[j];
</del><ins>+ std::pair<int, int> indexPair = sortedPairIndices[j];
</ins><span class="cx"> long long pairCount = opcodePairCounts[indexPair.first][indexPair.second];
</span><span class="cx"> double pairProportion = ((double) pairCount) / ((double) totalInstructionPairs);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -381,7 +381,7 @@
</span><span class="cx"> m_codeBlock->addParameter();
</span><span class="cx"> RegisterID& parameter = registerFor(index);
</span><span class="cx"> parameter.setIndex(index);
</span><del>- deconstructedParameters.append(make_pair(&parameter, pattern));
</del><ins>+ deconstructedParameters.append(std::make_pair(&parameter, pattern));
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> auto simpleParameter = static_cast<const BindingNode*>(pattern);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserASTBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/ASTBuilder.h (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/ASTBuilder.h 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/JavaScriptCore/parser/ASTBuilder.h 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -720,8 +720,8 @@
</span><span class="cx"> Scope m_scope;
</span><span class="cx"> Vector<BinaryOperand, 10, UnsafeVectorOverflow> m_binaryOperandStack;
</span><span class="cx"> Vector<AssignmentInfo, 10, UnsafeVectorOverflow> m_assignmentInfoStack;
</span><del>- Vector<pair<int, int>, 10, UnsafeVectorOverflow> m_binaryOperatorStack;
- Vector<pair<int, JSTextPosition>, 10, UnsafeVectorOverflow> m_unaryTokenStack;
</del><ins>+ Vector<std::pair<int, int>, 10, UnsafeVectorOverflow> m_binaryOperatorStack;
+ Vector<std::pair<int, JSTextPosition>, 10, UnsafeVectorOverflow> m_unaryTokenStack;
</ins><span class="cx"> int m_evalCount;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -898,7 +898,7 @@
</span><span class="cx"> return node;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExpressionNode* ASTBuilder::makeBinaryNode(const JSTokenLocation& location, int token, pair<ExpressionNode*, BinaryOpInfo> lhs, pair<ExpressionNode*, BinaryOpInfo> rhs)
</del><ins>+ExpressionNode* ASTBuilder::makeBinaryNode(const JSTokenLocation& location, int token, std::pair<ExpressionNode*, BinaryOpInfo> lhs, std::pair<ExpressionNode*, BinaryOpInfo> rhs)
</ins><span class="cx"> {
</span><span class="cx"> switch (token) {
</span><span class="cx"> case OR:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/JavaScriptCore/parser/Parser.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -1427,7 +1427,7 @@
</span><span class="cx"> return context.createIfStatement(ifLocation, condition, trueBlock, 0, start, end);
</span><span class="cx">
</span><span class="cx"> Vector<TreeExpression> exprStack;
</span><del>- Vector<pair<int, int>> posStack;
</del><ins>+ Vector<std::pair<int, int>> posStack;
</ins><span class="cx"> Vector<JSTokenLocation> tokenLocationStack;
</span><span class="cx"> Vector<TreeStatement> statementStack;
</span><span class="cx"> bool trailingElse = false;
</span><span class="lines">@@ -1456,7 +1456,7 @@
</span><span class="cx"> failIfFalse(innerTrueBlock, "Expected a statement as the body of an if block");
</span><span class="cx"> tokenLocationStack.append(tempLocation);
</span><span class="cx"> exprStack.append(innerCondition);
</span><del>- posStack.append(make_pair(innerStart, innerEnd));
</del><ins>+ posStack.append(std::make_pair(innerStart, innerEnd));
</ins><span class="cx"> statementStack.append(innerTrueBlock);
</span><span class="cx"> } while (match(ELSE));
</span><span class="cx">
</span><span class="lines">@@ -1465,7 +1465,7 @@
</span><span class="cx"> exprStack.removeLast();
</span><span class="cx"> TreeStatement trueBlock = statementStack.last();
</span><span class="cx"> statementStack.removeLast();
</span><del>- pair<int, int> pos = posStack.last();
</del><ins>+ std::pair<int, int> pos = posStack.last();
</ins><span class="cx"> posStack.removeLast();
</span><span class="cx"> JSTokenLocation elseLocation = tokenLocationStack.last();
</span><span class="cx"> tokenLocationStack.removeLast();
</span><span class="lines">@@ -1479,7 +1479,7 @@
</span><span class="cx"> statementStack.removeLast();
</span><span class="cx"> TreeStatement trueBlock = statementStack.last();
</span><span class="cx"> statementStack.removeLast();
</span><del>- pair<int, int> pos = posStack.last();
</del><ins>+ std::pair<int, int> pos = posStack.last();
</ins><span class="cx"> posStack.removeLast();
</span><span class="cx"> JSTokenLocation elseLocation = tokenLocationStack.last();
</span><span class="cx"> tokenLocationStack.removeLast();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStructurecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Structure.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Structure.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/JavaScriptCore/runtime/Structure.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> Structure* transition = singleTransition();
</span><span class="cx"> return transition && transition->m_nameInPrevious == rep && transition->m_attributesInPrevious == attributes;
</span><span class="cx"> }
</span><del>- return map()->get(make_pair(rep, attributes));
</del><ins>+ return map()->get(std::make_pair(rep, attributes));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline Structure* StructureTransitionTable::get(StringImpl* rep, unsigned attributes) const
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> Structure* transition = singleTransition();
</span><span class="cx"> return (transition && transition->m_nameInPrevious == rep && transition->m_attributesInPrevious == attributes) ? transition : 0;
</span><span class="cx"> }
</span><del>- return map()->get(make_pair(rep, attributes));
</del><ins>+ return map()->get(std::make_pair(rep, attributes));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void StructureTransitionTable::add(VM& vm, Structure* structure)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> // Newer versions of the STL have an std::make_pair function that takes rvalue references.
</span><span class="cx"> // When either of the parameters are bitfields, the C++ compiler will try to bind them as lvalues, which is invalid. To work around this, use unary "+" to make the parameter an rvalue.
</span><span class="cx"> // See https://bugs.webkit.org/show_bug.cgi?id=59261 for more details
</span><del>- map()->set(make_pair(structure->m_nameInPrevious.get(), +structure->m_attributesInPrevious), structure);
</del><ins>+ map()->set(std::make_pair(structure->m_nameInPrevious.get(), +structure->m_attributesInPrevious), structure);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Structure::dumpStatistics()
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WTF/ChangeLog 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-01-04 Zan Dobersek <zdobersek@igalia.com>
+
+ Explicitly use the std:: nested name specifier when using std::pair, std::make_pair
+ https://bugs.webkit.org/show_bug.cgi?id=126439
+
+ Reviewed by Andreas Kling.
+
+ * wtf/VectorTraits.h: Stop bringing std::pair into the current scope.
+
</ins><span class="cx"> 2014-01-02 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> Refactor NSActivity handling code from ChildProcess to UserActivity
</span></span></pre></div>
<a id="trunkSourceWTFwtfVectorTraitsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/VectorTraits.h (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/VectorTraits.h 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WTF/wtf/VectorTraits.h 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -27,8 +27,6 @@
</span><span class="cx"> #include <utility>
</span><span class="cx"> #include <memory>
</span><span class="cx">
</span><del>-using std::pair;
-
</del><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="cx"> class AtomicString;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/ChangeLog 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -1,3 +1,115 @@
</span><ins>+2014-01-04 Zan Dobersek <zdobersek@igalia.com>
+
+ Explicitly use the std:: nested name specifier when using std::pair, std::make_pair
+ https://bugs.webkit.org/show_bug.cgi?id=126439
+
+ Reviewed by Andreas Kling.
+
+ Instead of relying on std::pair and std::make_pair symbols being present in the current scope
+ through the pair and make_pair symbols, the std:: specifier should be used explicitly.
+
+ * Modules/webdatabase/DatabaseTracker.cpp:
+ (WebCore::DatabaseTracker::scheduleNotifyDatabaseChanged):
+ * accessibility/AXObjectCache.h:
+ * accessibility/AccessibilityARIAGridCell.cpp:
+ (WebCore::AccessibilityARIAGridCell::rowIndexRange):
+ (WebCore::AccessibilityARIAGridCell::columnIndexRange):
+ * accessibility/AccessibilityARIAGridCell.h:
+ * accessibility/AccessibilityObject.h:
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::mathPrescripts):
+ (WebCore::AccessibilityRenderObject::mathPostscripts):
+ * accessibility/AccessibilityTable.cpp:
+ (WebCore::AccessibilityTable::cellForColumnAndRow):
+ * accessibility/AccessibilityTableCell.cpp:
+ (WebCore::AccessibilityTableCell::rowIndexRange):
+ (WebCore::AccessibilityTableCell::columnIndexRange):
+ * accessibility/AccessibilityTableCell.h:
+ * accessibility/atk/WebKitAccessibleInterfaceTable.cpp:
+ (webkitAccessibleTableGetColumnAtIndex):
+ (webkitAccessibleTableGetRowAtIndex):
+ (webkitAccessibleTableGetColumnExtentAt):
+ (webkitAccessibleTableGetRowExtentAt):
+ (webkitAccessibleTableGetColumnHeader):
+ (webkitAccessibleTableGetRowHeader):
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+ (-[WebAccessibilityObjectWrapper accessibilityHeaderElements]):
+ (-[WebAccessibilityObjectWrapper accessibilityRowRange]):
+ (-[WebAccessibilityObjectWrapper accessibilityColumnRange]):
+ * accessibility/mac/WebAccessibilityObjectWrapperBase.mm:
+ (convertMathPairsToNSArray):
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
+ * bindings/js/SerializedScriptValue.cpp:
+ * dom/ContainerNode.cpp:
+ * dom/StyledElement.cpp:
+ (WebCore::attributeNameSort):
+ * html/MediaFragmentURIParser.cpp:
+ (WebCore::MediaFragmentURIParser::parseTimeFragment):
+ * html/parser/HTMLMetaCharsetParser.h:
+ * inspector/ContentSearchUtils.cpp:
+ (WebCore::ContentSearchUtils::getRegularExpressionMatchesByLines):
+ (WebCore::ContentSearchUtils::searchInTextByLines):
+ * inspector/DOMPatchSupport.cpp:
+ (WebCore::DOMPatchSupport::diff):
+ (WebCore::DOMPatchSupport::innerPatchChildren):
+ * inspector/DOMPatchSupport.h:
+ * inspector/InspectorAgent.cpp:
+ (WebCore::InspectorAgent::enable):
+ (WebCore::InspectorAgent::evaluateForTestInFrontend):
+ * inspector/InspectorAgent.h:
+ * loader/FormSubmission.cpp:
+ (WebCore::FormSubmission::create):
+ * loader/cache/CachedImage.cpp:
+ (WebCore::CachedImage::brokenImage):
+ * loader/cache/CachedImage.h:
+ * platform/URL.cpp:
+ (WebCore::findHostnamesInMailToURL):
+ (WebCore::encodeHostnames):
+ * platform/blackberry/CookieDatabaseBackingStore/CookieDatabaseBackingStore.h:
+ * platform/graphics/FontCache.cpp:
+ (WebCore::FontCache::getCachedFontData):
+ * platform/graphics/WidthIterator.cpp:
+ * platform/network/HTTPHeaderMap.cpp:
+ (WebCore::HTTPHeaderMap::adopt):
+ * platform/network/ResourceResponseBase.cpp:
+ (WebCore::ResourceResponseBase::parseCacheControlDirectives):
+ (WebCore::parseCacheHeader):
+ * platform/text/AtomicStringKeyedMRUCache.h:
+ * platform/text/LineBreakIteratorPoolICU.h:
+ * rendering/InlineFlowBox.h:
+ * rendering/RenderImage.cpp:
+ (WebCore::RenderImage::imageSizeForError):
+ (WebCore::RenderImage::paintReplaced):
+ * rendering/RenderTableSection.cpp:
+ (WebCore::RenderTableSection::cachedCollapsedBorder):
+ * rendering/RenderTableSection.h:
+ * rendering/svg/SVGTextRunRenderingContext.cpp:
+ (WebCore::SVGTextRunRenderingContext::glyphDataForCharacter):
+ * svg/SVGAnimatedAngle.cpp:
+ (WebCore::SVGAnimatedAngleAnimator::constructFromString):
+ (WebCore::SVGAnimatedAngleAnimator::addAnimatedTypes):
+ (WebCore::SVGAnimatedAngleAnimator::calculateAnimatedValue):
+ * svg/SVGAnimatedIntegerOptionalInteger.cpp:
+ (WebCore::SVGAnimatedIntegerOptionalIntegerAnimator::constructFromString):
+ (WebCore::SVGAnimatedIntegerOptionalIntegerAnimator::addAnimatedTypes):
+ (WebCore::SVGAnimatedIntegerOptionalIntegerAnimator::calculateAnimatedValue):
+ * svg/SVGAnimatedNumberOptionalNumber.cpp:
+ (WebCore::SVGAnimatedNumberOptionalNumberAnimator::constructFromString):
+ (WebCore::SVGAnimatedNumberOptionalNumberAnimator::addAnimatedTypes):
+ (WebCore::SVGAnimatedNumberOptionalNumberAnimator::calculateAnimatedValue):
+ * svg/SVGAnimatedType.cpp:
+ (WebCore::SVGAnimatedType::createIntegerOptionalInteger):
+ (WebCore::SVGAnimatedType::createNumberOptionalNumber):
+ * svg/SVGAnimatedType.h:
+ (WebCore::SVGAnimatedType::integerOptionalInteger):
+ (WebCore::SVGAnimatedType::numberOptionalNumber):
+ * svg/SVGAnimatedTypeAnimator.h:
+ (WebCore::SVGAnimatedTypeAnimator::constructFromBaseValues):
+ (WebCore::SVGAnimatedTypeAnimator::resetFromBaseValues):
+ * svg/SVGParserUtilities.h:
+ * svg/animation/SMILTimeContainer.h:
+
</ins><span class="cx"> 2014-01-03 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Attempt to fix EFL build.
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -1124,7 +1124,7 @@
</span><span class="cx"> return mutex;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-typedef Vector<pair<RefPtr<SecurityOrigin>, String>> NotificationQueue;
</del><ins>+typedef Vector<std::pair<RefPtr<SecurityOrigin>, String>> NotificationQueue;
</ins><span class="cx">
</span><span class="cx"> static NotificationQueue& notificationQueue()
</span><span class="cx"> {
</span><span class="lines">@@ -1136,7 +1136,7 @@
</span><span class="cx"> {
</span><span class="cx"> MutexLocker locker(notificationMutex());
</span><span class="cx">
</span><del>- notificationQueue().append(pair<RefPtr<SecurityOrigin>, String>(origin->isolatedCopy(), name.isolatedCopy()));
</del><ins>+ notificationQueue().append(std::pair<RefPtr<SecurityOrigin>, String>(origin->isolatedCopy(), name.isolatedCopy()));
</ins><span class="cx"> scheduleForNotification();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAXObjectCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AXObjectCache.h (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AXObjectCache.h 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.h 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> HashSet<AXID> m_idsInUse;
</span><span class="cx">
</span><span class="cx"> Timer<AXObjectCache> m_notificationPostTimer;
</span><del>- Vector<pair<RefPtr<AccessibilityObject>, AXNotification>> m_notificationsToPost;
</del><ins>+ Vector<std::pair<RefPtr<AccessibilityObject>, AXNotification>> m_notificationsToPost;
</ins><span class="cx"> void notificationPostTimerFired(Timer<AXObjectCache>*);
</span><span class="cx">
</span><span class="cx"> static AccessibilityObject* focusedImageMapUIElement(HTMLAreaElement*);
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityARIAGridCellcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityARIAGridCell.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityARIAGridCell.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/accessibility/AccessibilityARIAGridCell.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> return parent;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AccessibilityARIAGridCell::rowIndexRange(pair<unsigned, unsigned>& rowRange)
</del><ins>+void AccessibilityARIAGridCell::rowIndexRange(std::pair<unsigned, unsigned>& rowRange)
</ins><span class="cx"> {
</span><span class="cx"> AccessibilityObject* parent = parentObjectUnignored();
</span><span class="cx"> if (!parent)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> rowRange.second = 1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AccessibilityARIAGridCell::columnIndexRange(pair<unsigned, unsigned>& columnRange)
</del><ins>+void AccessibilityARIAGridCell::columnIndexRange(std::pair<unsigned, unsigned>& columnRange)
</ins><span class="cx"> {
</span><span class="cx"> AccessibilityObject* parent = parentObjectUnignored();
</span><span class="cx"> if (!parent)
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityARIAGridCellh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityARIAGridCell.h (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityARIAGridCell.h 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/accessibility/AccessibilityARIAGridCell.h 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -42,9 +42,9 @@
</span><span class="cx"> virtual ~AccessibilityARIAGridCell();
</span><span class="cx">
</span><span class="cx"> // fills in the start location and row span of cell
</span><del>- virtual void rowIndexRange(pair<unsigned, unsigned>& rowRange) OVERRIDE;
</del><ins>+ virtual void rowIndexRange(std::pair<unsigned, unsigned>& rowRange) OVERRIDE;
</ins><span class="cx"> // fills in the start location and column span of cell
</span><del>- virtual void columnIndexRange(pair<unsigned, unsigned>& columnRange) OVERRIDE;
</del><ins>+ virtual void columnIndexRange(std::pair<unsigned, unsigned>& columnRange) OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> virtual AccessibilityObject* parentTable() const OVERRIDE;
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -858,7 +858,7 @@
</span><span class="cx"> virtual int mathLineThickness() const { return 0; }
</span><span class="cx">
</span><span class="cx"> // Multiscripts components.
</span><del>- typedef Vector<pair<AccessibilityObject*, AccessibilityObject*>> AccessibilityMathMultiscriptPairs;
</del><ins>+ typedef Vector<std::pair<AccessibilityObject*, AccessibilityObject*>> AccessibilityMathMultiscriptPairs;
</ins><span class="cx"> virtual void mathPrescripts(AccessibilityMathMultiscriptPairs&) { }
</span><span class="cx"> virtual void mathPostscripts(AccessibilityMathMultiscriptPairs&) { }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -3716,7 +3716,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> bool foundPrescript = false;
</span><del>- pair<AccessibilityObject*, AccessibilityObject*> prescriptPair;
</del><ins>+ std::pair<AccessibilityObject*, AccessibilityObject*> prescriptPair;
</ins><span class="cx"> for (Node* child = node()->firstChild(); child; child = child->nextSibling()) {
</span><span class="cx"> if (foundPrescript) {
</span><span class="cx"> AccessibilityObject* axChild = axObjectCache()->getOrCreate(child);
</span><span class="lines">@@ -3746,7 +3746,7 @@
</span><span class="cx">
</span><span class="cx"> // In Multiscripts, the post-script elements start after the first element (which is the base)
</span><span class="cx"> // and continue until a <mprescripts> tag is found
</span><del>- pair<AccessibilityObject*, AccessibilityObject*> postscriptPair;
</del><ins>+ std::pair<AccessibilityObject*, AccessibilityObject*> postscriptPair;
</ins><span class="cx"> bool foundBaseElement = false;
</span><span class="cx"> for (Node* child = node()->firstChild(); child; child = child->nextSibling()) {
</span><span class="cx"> if (child->hasTagName(MathMLNames::mprescriptsTag))
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityTablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityTable.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityTable.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/accessibility/AccessibilityTable.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -519,8 +519,8 @@
</span><span class="cx"> if (!child->isTableCell())
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- pair<unsigned, unsigned> columnRange;
- pair<unsigned, unsigned> rowRange;
</del><ins>+ std::pair<unsigned, unsigned> columnRange;
+ std::pair<unsigned, unsigned> rowRange;
</ins><span class="cx"> AccessibilityTableCell* tableCellChild = toAccessibilityTableCell(child);
</span><span class="cx"> tableCellChild->columnIndexRange(columnRange);
</span><span class="cx"> tableCellChild->rowIndexRange(rowRange);
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityTableCellcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityTableCell.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityTableCell.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableCell.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> return CellRole;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AccessibilityTableCell::rowIndexRange(pair<unsigned, unsigned>& rowRange)
</del><ins>+void AccessibilityTableCell::rowIndexRange(std::pair<unsigned, unsigned>& rowRange)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_renderer || !m_renderer->isTableCell())
</span><span class="cx"> return;
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> rowRange.first += rowOffset;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AccessibilityTableCell::columnIndexRange(pair<unsigned, unsigned>& columnRange)
</del><ins>+void AccessibilityTableCell::columnIndexRange(std::pair<unsigned, unsigned>& columnRange)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_renderer || !m_renderer->isTableCell())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityTableCellh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityTableCell.h (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityTableCell.h 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableCell.h 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -44,9 +44,9 @@
</span><span class="cx"> virtual bool isTableCell() const OVERRIDE;
</span><span class="cx">
</span><span class="cx"> // fills in the start location and row span of cell
</span><del>- virtual void rowIndexRange(pair<unsigned, unsigned>& rowRange);
</del><ins>+ virtual void rowIndexRange(std::pair<unsigned, unsigned>& rowRange);
</ins><span class="cx"> // fills in the start location and column span of cell
</span><del>- virtual void columnIndexRange(pair<unsigned, unsigned>& columnRange);
</del><ins>+ virtual void columnIndexRange(std::pair<unsigned, unsigned>& columnRange);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> virtual AccessibilityObject* parentTable() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityatkWebKitAccessibleInterfaceTablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTable.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTable.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTable.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx">
</span><span class="cx"> AccessibilityTableCell* axCell = cellAtIndex(table, index);
</span><span class="cx"> if (axCell) {
</span><del>- pair<unsigned, unsigned> columnRange;
</del><ins>+ std::pair<unsigned, unsigned> columnRange;
</ins><span class="cx"> axCell->columnIndexRange(columnRange);
</span><span class="cx"> return columnRange.first;
</span><span class="cx"> }
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx">
</span><span class="cx"> AccessibilityTableCell* axCell = cellAtIndex(table, index);
</span><span class="cx"> if (axCell) {
</span><del>- pair<unsigned, unsigned> rowRange;
</del><ins>+ std::pair<unsigned, unsigned> rowRange;
</ins><span class="cx"> axCell->rowIndexRange(rowRange);
</span><span class="cx"> return rowRange.first;
</span><span class="cx"> }
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx">
</span><span class="cx"> AccessibilityTableCell* axCell = cell(table, row, column);
</span><span class="cx"> if (axCell) {
</span><del>- pair<unsigned, unsigned> columnRange;
</del><ins>+ std::pair<unsigned, unsigned> columnRange;
</ins><span class="cx"> axCell->columnIndexRange(columnRange);
</span><span class="cx"> return columnRange.second;
</span><span class="cx"> }
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx">
</span><span class="cx"> AccessibilityTableCell* axCell = cell(table, row, column);
</span><span class="cx"> if (axCell) {
</span><del>- pair<unsigned, unsigned> rowRange;
</del><ins>+ std::pair<unsigned, unsigned> rowRange;
</ins><span class="cx"> axCell->rowIndexRange(rowRange);
</span><span class="cx"> return rowRange.second;
</span><span class="cx"> }
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> toAccessibilityTable(accTable)->columnHeaders(allColumnHeaders);
</span><span class="cx"> unsigned columnCount = allColumnHeaders.size();
</span><span class="cx"> for (unsigned k = 0; k < columnCount; ++k) {
</span><del>- pair<unsigned, unsigned> columnRange;
</del><ins>+ std::pair<unsigned, unsigned> columnRange;
</ins><span class="cx"> AccessibilityTableCell* cell = toAccessibilityTableCell(allColumnHeaders.at(k).get());
</span><span class="cx"> cell->columnIndexRange(columnRange);
</span><span class="cx"> if (columnRange.first <= static_cast<unsigned>(column) && static_cast<unsigned>(column) < columnRange.first + columnRange.second)
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> toAccessibilityTable(accTable)->rowHeaders(allRowHeaders);
</span><span class="cx"> unsigned rowCount = allRowHeaders.size();
</span><span class="cx"> for (unsigned k = 0; k < rowCount; ++k) {
</span><del>- pair<unsigned, unsigned> rowRange;
</del><ins>+ std::pair<unsigned, unsigned> rowRange;
</ins><span class="cx"> AccessibilityTableCell* cell = toAccessibilityTableCell(allRowHeaders.at(k).get());
</span><span class="cx"> cell->rowIndexRange(rowRange);
</span><span class="cx"> if (rowRange.first <= static_cast<unsigned>(row) && static_cast<unsigned>(row) < rowRange.first + rowRange.second)
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -813,8 +813,8 @@
</span><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> // Get the row and column range, so we can use them to find the headers.
</span><del>- pair<unsigned, unsigned> rowRange;
- pair<unsigned, unsigned> columnRange;
</del><ins>+ std::pair<unsigned, unsigned> rowRange;
+ std::pair<unsigned, unsigned> columnRange;
</ins><span class="cx"> tableCell->rowIndexRange(rowRange);
</span><span class="cx"> tableCell->columnIndexRange(columnRange);
</span><span class="cx">
</span><span class="lines">@@ -877,7 +877,7 @@
</span><span class="cx"> if (!tableCell)
</span><span class="cx"> return NSMakeRange(NSNotFound, 0);
</span><span class="cx">
</span><del>- pair<unsigned, unsigned> rowRange;
</del><ins>+ std::pair<unsigned, unsigned> rowRange;
</ins><span class="cx"> tableCell->rowIndexRange(rowRange);
</span><span class="cx"> return NSMakeRange(rowRange.first, rowRange.second);
</span><span class="cx"> }
</span><span class="lines">@@ -891,7 +891,7 @@
</span><span class="cx"> if (!tableCell)
</span><span class="cx"> return NSMakeRange(NSNotFound, 0);
</span><span class="cx">
</span><del>- pair<unsigned, unsigned> columnRange;
</del><ins>+ std::pair<unsigned, unsigned> columnRange;
</ins><span class="cx"> tableCell->columnIndexRange(columnRange);
</span><span class="cx"> return NSMakeRange(columnRange.first, columnRange.second);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperBasemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> NSMutableArray *array = [NSMutableArray arrayWithCapacity:length];
</span><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><span class="cx"> NSMutableDictionary *pairDictionary = [NSMutableDictionary dictionary];
</span><del>- pair<AccessibilityObject*, AccessibilityObject*> pair = pairs[i];
</del><ins>+ std::pair<AccessibilityObject*, AccessibilityObject*> pair = pairs[i];
</ins><span class="cx"> if (pair.first && pair.first->wrapper() && !pair.first->accessibilityIsIgnored())
</span><span class="cx"> [pairDictionary setObject:pair.first->wrapper() forKey:subscriptKey];
</span><span class="cx"> if (pair.second && pair.second->wrapper() && !pair.second->accessibilityIsIgnored())
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -2480,12 +2480,12 @@
</span><span class="cx">
</span><span class="cx"> if (m_object->isTableCell()) {
</span><span class="cx"> if ([attributeName isEqualToString:NSAccessibilityRowIndexRangeAttribute]) {
</span><del>- pair<unsigned, unsigned> rowRange;
</del><ins>+ std::pair<unsigned, unsigned> rowRange;
</ins><span class="cx"> toAccessibilityTableCell(m_object)->rowIndexRange(rowRange);
</span><span class="cx"> return [NSValue valueWithRange:NSMakeRange(rowRange.first, rowRange.second)];
</span><span class="cx"> }
</span><span class="cx"> if ([attributeName isEqualToString:NSAccessibilityColumnIndexRangeAttribute]) {
</span><del>- pair<unsigned, unsigned> columnRange;
</del><ins>+ std::pair<unsigned, unsigned> columnRange;
</ins><span class="cx"> toAccessibilityTableCell(m_object)->columnIndexRange(columnRange);
</span><span class="cx"> return [NSValue valueWithRange:NSMakeRange(columnRange.first, columnRange.second)];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsSerializedScriptValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -354,7 +354,7 @@
</span><span class="cx"> * <factorSize:uint32_t> <factor:byte{factorSize}> <crtExponentSize:uint32_t> <crtExponent:byte{crtExponentSize}> <crtCoefficientSize:uint32_t> <crtCoefficient:byte{crtCoefficientSize}>
</span><span class="cx"> */
</span><span class="cx">
</span><del>-typedef pair<JSC::JSValue, SerializationReturnCode> DeserializationResult;
</del><ins>+typedef std::pair<JSC::JSValue, SerializationReturnCode> DeserializationResult;
</ins><span class="cx">
</span><span class="cx"> class CloneBase {
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/dom/ContainerNode.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -63,8 +63,8 @@
</span><span class="cx"> static void dispatchChildInsertionEvents(Node&);
</span><span class="cx"> static void dispatchChildRemovalEvents(Node&);
</span><span class="cx">
</span><del>-typedef pair<RefPtr<Node>, unsigned> CallbackParameters;
-typedef pair<NodeCallback, CallbackParameters> CallbackInfo;
</del><ins>+typedef std::pair<RefPtr<Node>, unsigned> CallbackParameters;
+typedef std::pair<NodeCallback, CallbackParameters> CallbackInfo;
</ins><span class="cx"> typedef Vector<CallbackInfo> NodeCallbackQueue;
</span><span class="cx">
</span><span class="cx"> static NodeCallbackQueue* s_postAttachCallbackQueue;
</span></span></pre></div>
<a id="trunkSourceWebCoredomStyledElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/StyledElement.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/StyledElement.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/dom/StyledElement.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> PresentationAttributeCacheKey() : tagName(0) { }
</span><span class="cx"> AtomicStringImpl* tagName;
</span><span class="cx"> // Only the values need refcounting.
</span><del>- Vector<pair<AtomicStringImpl*, AtomicString>, 3> attributesAndValues;
</del><ins>+ Vector<std::pair<AtomicStringImpl*, AtomicString>, 3> attributesAndValues;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct PresentationAttributeCacheEntry {
</span><span class="lines">@@ -271,7 +271,7 @@
</span><span class="cx"> inlineStyle->addSubresourceStyleURLs(urls, &document().elementSheet().contents());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool attributeNameSort(const pair<AtomicStringImpl*, AtomicString>& p1, const pair<AtomicStringImpl*, AtomicString>& p2)
</del><ins>+static inline bool attributeNameSort(const std::pair<AtomicStringImpl*, AtomicString>& p1, const std::pair<AtomicStringImpl*, AtomicString>& p2)
</ins><span class="cx"> {
</span><span class="cx"> // Sort based on the attribute name pointers. It doesn't matter what the order is as long as it is always the same.
</span><span class="cx"> return p1.first < p2.first;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaFragmentURIParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaFragmentURIParser.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaFragmentURIParser.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/html/MediaFragmentURIParser.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> m_timeFormat = Invalid;
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < m_fragments.size(); ++i) {
</span><del>- pair<String, String>& fragment = m_fragments[i];
</del><ins>+ std::pair<String, String>& fragment = m_fragments[i];
</ins><span class="cx">
</span><span class="cx"> ASSERT(fragment.first.is8Bit());
</span><span class="cx"> ASSERT(fragment.second.is8Bit());
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLMetaCharsetParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLMetaCharsetParser.h (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLMetaCharsetParser.h 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/html/parser/HTMLMetaCharsetParser.h 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> const TextEncoding& encoding() { return m_encoding; }
</span><span class="cx">
</span><del>- typedef Vector<pair<String, String>> AttributeList;
</del><ins>+ typedef Vector<std::pair<String, String>> AttributeList;
</ins><span class="cx"> // The returned encoding might not be valid.
</span><span class="cx"> static TextEncoding encodingFromMetaAttributes(const AttributeList&
</span><span class="cx"> );
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorContentSearchUtilscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/ContentSearchUtils.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/ContentSearchUtils.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/inspector/ContentSearchUtils.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -79,9 +79,9 @@
</span><span class="cx"> return TextPosition(OrdinalNumber::fromZeroBasedInt(lineIndex), OrdinalNumber::fromZeroBasedInt(column));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Vector<pair<int, String>> getRegularExpressionMatchesByLines(const RegularExpression& regex, const String& text)
</del><ins>+static Vector<std::pair<int, String>> getRegularExpressionMatchesByLines(const RegularExpression& regex, const String& text)
</ins><span class="cx"> {
</span><del>- Vector<pair<int, String>> result;
</del><ins>+ Vector<std::pair<int, String>> result;
</ins><span class="cx"> if (text.isEmpty())
</span><span class="cx"> return result;
</span><span class="cx">
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx">
</span><span class="cx"> int matchLength;
</span><span class="cx"> if (regex.match(line, 0, &matchLength) != -1)
</span><del>- result.append(pair<int, String>(lineNumber, line));
</del><ins>+ result.append(std::pair<int, String>(lineNumber, line));
</ins><span class="cx">
</span><span class="cx"> start = lineEnd + 1;
</span><span class="cx"> }
</span><span class="lines">@@ -159,9 +159,9 @@
</span><span class="cx"> RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::GenericTypes::SearchMatch>> result = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::GenericTypes::SearchMatch>::create();
</span><span class="cx">
</span><span class="cx"> RegularExpression regex = ContentSearchUtils::createSearchRegex(query, caseSensitive, isRegex);
</span><del>- Vector<pair<int, String>> matches = getRegularExpressionMatchesByLines(regex, text);
</del><ins>+ Vector<std::pair<int, String>> matches = getRegularExpressionMatchesByLines(regex, text);
</ins><span class="cx">
</span><del>- for (Vector<pair<int, String>>::const_iterator it = matches.begin(); it != matches.end(); ++it)
</del><ins>+ for (Vector<std::pair<int, String>>::const_iterator it = matches.begin(); it != matches.end(); ++it)
</ins><span class="cx"> result->addItem(buildObjectForSearchMatch(it->first, it->second));
</span><span class="cx">
</span><span class="cx"> return result;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorDOMPatchSupportcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/DOMPatchSupport.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/DOMPatchSupport.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/inspector/DOMPatchSupport.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-pair<DOMPatchSupport::ResultMap, DOMPatchSupport::ResultMap>
</del><ins>+std::pair<DOMPatchSupport::ResultMap, DOMPatchSupport::ResultMap>
</ins><span class="cx"> DOMPatchSupport::diff(const Vector<OwnPtr<Digest>>& oldList, const Vector<OwnPtr<Digest>>& newList)
</span><span class="cx"> {
</span><span class="cx"> ResultMap newMap(newList.size());
</span><span class="lines">@@ -296,12 +296,12 @@
</span><span class="cx"> dumpMap(newMap, "NEW");
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- return make_pair(oldMap, newMap);
</del><ins>+ return std::make_pair(oldMap, newMap);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool DOMPatchSupport::innerPatchChildren(ContainerNode* parentNode, const Vector<OwnPtr<Digest>>& oldList, const Vector<OwnPtr<Digest>>& newList, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>- pair<ResultMap, ResultMap> resultMaps = diff(oldList, newList);
</del><ins>+ std::pair<ResultMap, ResultMap> resultMaps = diff(oldList, newList);
</ins><span class="cx"> ResultMap& oldMap = resultMaps.first;
</span><span class="cx"> ResultMap& newMap = resultMaps.second;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorDOMPatchSupporth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/DOMPatchSupport.h (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/DOMPatchSupport.h 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/inspector/DOMPatchSupport.h 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> struct Digest;
</span><del>- typedef Vector<pair<Digest*, size_t>> ResultMap;
</del><ins>+ typedef Vector<std::pair<Digest*, size_t>> ResultMap;
</ins><span class="cx"> typedef HashMap<String, Digest*> UnusedNodesMap;
</span><span class="cx">
</span><span class="cx"> bool innerPatchNode(Digest* oldNode, Digest* newNode, ExceptionCode&);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorAgent.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorAgent.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/inspector/InspectorAgent.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> if (m_pendingInspectData.first)
</span><span class="cx"> inspect(m_pendingInspectData.first, m_pendingInspectData.second);
</span><span class="cx">
</span><del>- for (Vector<pair<long, String>>::iterator it = m_pendingEvaluateTestCommands.begin(); m_frontendDispatcher && it != m_pendingEvaluateTestCommands.end(); ++it)
</del><ins>+ for (Vector<std::pair<long, String>>::iterator it = m_pendingEvaluateTestCommands.begin(); m_frontendDispatcher && it != m_pendingEvaluateTestCommands.end(); ++it)
</ins><span class="cx"> m_frontendDispatcher->evaluateForTestInFrontend(static_cast<int>((*it).first), (*it).second);
</span><span class="cx"> m_pendingEvaluateTestCommands.clear();
</span><span class="cx"> }
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> if (m_enabled && m_frontendDispatcher)
</span><span class="cx"> m_frontendDispatcher->evaluateForTestInFrontend(static_cast<int>(callId), script);
</span><span class="cx"> else
</span><del>- m_pendingEvaluateTestCommands.append(pair<long, String>(callId, script));
</del><ins>+ m_pendingEvaluateTestCommands.append(std::pair<long, String>(callId, script));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorAgent::inspect(PassRefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> objectToInspect, PassRefPtr<InspectorObject> hints)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorAgent.h (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorAgent.h 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/inspector/InspectorAgent.h 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -83,8 +83,8 @@
</span><span class="cx"> std::unique_ptr<Inspector::InspectorInspectorFrontendDispatcher> m_frontendDispatcher;
</span><span class="cx"> RefPtr<Inspector::InspectorInspectorBackendDispatcher> m_backendDispatcher;
</span><span class="cx">
</span><del>- Vector<pair<long, String>> m_pendingEvaluateTestCommands;
- pair<RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>, RefPtr<Inspector::InspectorObject>> m_pendingInspectData;
</del><ins>+ Vector<std::pair<long, String>> m_pendingEvaluateTestCommands;
+ std::pair<RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>, RefPtr<Inspector::InspectorObject>> m_pendingInspectData;
</ins><span class="cx">
</span><span class="cx"> bool m_enabled;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFormSubmissioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FormSubmission.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FormSubmission.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/loader/FormSubmission.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx">
</span><span class="cx"> TextEncoding dataEncoding = isMailtoForm ? UTF8Encoding() : FormDataBuilder::encodingFromAcceptCharset(copiedAttributes.acceptCharset(), document);
</span><span class="cx"> RefPtr<DOMFormData> domFormData = DOMFormData::create(dataEncoding.encodingForFormSubmission());
</span><del>- Vector<pair<String, String>> formValues;
</del><ins>+ Vector<std::pair<String, String>> formValues;
</ins><span class="cx">
</span><span class="cx"> bool containsPasswordData = false;
</span><span class="cx"> for (unsigned i = 0; i < form->associatedElements().size(); ++i) {
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> if (isHTMLInputElement(element)) {
</span><span class="cx"> HTMLInputElement& input = toHTMLInputElement(element);
</span><span class="cx"> if (input.isTextField()) {
</span><del>- formValues.append(pair<String, String>(input.name().string(), input.value()));
</del><ins>+ formValues.append(std::pair<String, String>(input.name().string(), input.value()));
</ins><span class="cx"> input.addSearchResult();
</span><span class="cx"> }
</span><span class="cx"> if (input.isPasswordField() && !input.value().isEmpty())
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedImage.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedImage.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/loader/cache/CachedImage.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> m_image->resetAnimation();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-pair<Image*, float> CachedImage::brokenImage(float deviceScaleFactor) const
</del><ins>+std::pair<Image*, float> CachedImage::brokenImage(float deviceScaleFactor) const
</ins><span class="cx"> {
</span><span class="cx"> if (deviceScaleFactor >= 2) {
</span><span class="cx"> DEFINE_STATIC_LOCAL(Image*, brokenImageHiRes, (Image::loadPlatformResource("missingImage@2x").leakRef()));
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedImage.h (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedImage.h 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/loader/cache/CachedImage.h 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx">
</span><span class="cx"> void addIncrementalDataBuffer(ResourceBuffer*);
</span><span class="cx">
</span><del>- typedef pair<IntSize, float> SizeAndZoom;
</del><ins>+ typedef std::pair<IntSize, float> SizeAndZoom;
</ins><span class="cx"> typedef HashMap<const CachedImageClient*, SizeAndZoom> ContainerSizeRequests;
</span><span class="cx"> ContainerSizeRequests m_pendingContainerSizeRequests;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URL.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URL.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/platform/URL.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -1498,7 +1498,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void findHostnamesInMailToURL(const UChar* str, int strLen, Vector<pair<int, int>>& nameRanges)
</del><ins>+static void findHostnamesInMailToURL(const UChar* str, int strLen, Vector<std::pair<int, int>>& nameRanges)
</ins><span class="cx"> {
</span><span class="cx"> // In a mailto: URL, host names come after a '@' character and end with a '>' or ',' or '?' or end of string character.
</span><span class="cx"> // Skip quoted strings so that characters in them don't confuse us.
</span><span class="lines">@@ -1614,12 +1614,12 @@
</span><span class="cx"> output.clear();
</span><span class="cx">
</span><span class="cx"> if (protocolIs(str, "mailto")) {
</span><del>- Vector<pair<int, int>> hostnameRanges;
</del><ins>+ Vector<std::pair<int, int>> hostnameRanges;
</ins><span class="cx"> findHostnamesInMailToURL(str.characters(), str.length(), hostnameRanges);
</span><span class="cx"> int n = hostnameRanges.size();
</span><span class="cx"> int p = 0;
</span><span class="cx"> for (int i = 0; i < n; ++i) {
</span><del>- const pair<int, int>& r = hostnameRanges[i];
</del><ins>+ const std::pair<int, int>& r = hostnameRanges[i];
</ins><span class="cx"> output.append(&str.characters()[p], r.first - p);
</span><span class="cx"> appendEncodedHostname(output, &str.characters()[r.first], r.second - r.first);
</span><span class="cx"> p = r.second;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformblackberryCookieDatabaseBackingStoreCookieDatabaseBackingStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/blackberry/CookieDatabaseBackingStore/CookieDatabaseBackingStore.h (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/blackberry/CookieDatabaseBackingStore/CookieDatabaseBackingStore.h 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/platform/blackberry/CookieDatabaseBackingStore/CookieDatabaseBackingStore.h 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx">
</span><span class="cx"> void close();
</span><span class="cx">
</span><del>- typedef pair<const RefPtr<ParsedCookie>, UpdateParameter> CookieAction;
</del><ins>+ typedef std::pair<const RefPtr<ParsedCookie>, UpdateParameter> CookieAction;
</ins><span class="cx"> Vector<CookieAction> m_changedCookies;
</span><span class="cx"> Mutex m_mutex;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCache.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCache.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/platform/graphics/FontCache.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-typedef HashMap<FontPlatformData, pair<RefPtr<SimpleFontData>, unsigned>, FontDataCacheKeyHash, FontDataCacheKeyTraits> FontDataCache;
</del><ins>+typedef HashMap<FontPlatformData, std::pair<RefPtr<SimpleFontData>, unsigned>, FontDataCacheKeyHash, FontDataCacheKeyTraits> FontDataCache;
</ins><span class="cx">
</span><span class="cx"> static FontDataCache* gFontDataCache = 0;
</span><span class="cx">
</span><span class="lines">@@ -347,7 +347,7 @@
</span><span class="cx">
</span><span class="cx"> FontDataCache::iterator result = gFontDataCache->find(*platformData);
</span><span class="cx"> if (result == gFontDataCache->end()) {
</span><del>- pair<RefPtr<SimpleFontData>, unsigned> newValue(SimpleFontData::create(*platformData), shouldRetain == Retain ? 1 : 0);
</del><ins>+ std::pair<RefPtr<SimpleFontData>, unsigned> newValue(SimpleFontData::create(*platformData), shouldRetain == Retain ? 1 : 0);
</ins><span class="cx"> gFontDataCache->set(*platformData, newValue);
</span><span class="cx"> if (shouldRetain == DoNotRetain)
</span><span class="cx"> gInactiveFontData->add(newValue.first);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsWidthIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/WidthIterator.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/WidthIterator.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/platform/graphics/WidthIterator.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> float advanceAtCharacter;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-typedef Vector<pair<int, OriginalAdvancesForCharacterTreatedAsSpace>, 64> CharactersTreatedAsSpace;
</del><ins>+typedef Vector<std::pair<int, OriginalAdvancesForCharacterTreatedAsSpace>, 64> CharactersTreatedAsSpace;
</ins><span class="cx">
</span><span class="cx"> static inline float applyFontTransforms(GlyphBuffer* glyphBuffer, bool ltr, int& lastGlyphCount, const SimpleFontData* fontData, WidthIterator& iterator, TypesettingFeatures typesettingFeatures, CharactersTreatedAsSpace& charactersTreatedAsSpace)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkHTTPHeaderMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> clear();
</span><span class="cx"> size_t dataSize = data->size();
</span><span class="cx"> for (size_t index = 0; index < dataSize; ++index) {
</span><del>- pair<String, String>& header = (*data)[index];
</del><ins>+ std::pair<String, String>& header = (*data)[index];
</ins><span class="cx"> set(header.first, header.second);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceResponseBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static void parseCacheHeader(const String& header, Vector<pair<String, String>>& result);
</del><ins>+static void parseCacheHeader(const String& header, Vector<std::pair<String, String>>& result);
</ins><span class="cx">
</span><span class="cx"> inline const ResourceResponse& ResourceResponseBase::asResourceResponse() const
</span><span class="cx"> {
</span><span class="lines">@@ -356,7 +356,7 @@
</span><span class="cx">
</span><span class="cx"> String cacheControlValue = m_httpHeaderFields.get(cacheControlString);
</span><span class="cx"> if (!cacheControlValue.isEmpty()) {
</span><del>- Vector<pair<String, String>> directives;
</del><ins>+ Vector<std::pair<String, String>> directives;
</ins><span class="cx"> parseCacheHeader(cacheControlValue, directives);
</span><span class="cx">
</span><span class="cx"> size_t directivesSize = directives.size();
</span><span class="lines">@@ -636,7 +636,7 @@
</span><span class="cx"> return str.substring(0, str.find(isCacheHeaderSeparator));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void parseCacheHeader(const String& header, Vector<pair<String, String>>& result)
</del><ins>+static void parseCacheHeader(const String& header, Vector<std::pair<String, String>>& result)
</ins><span class="cx"> {
</span><span class="cx"> const String safeHeader = header.removeCharacters(isControlCharacter);
</span><span class="cx"> unsigned max = safeHeader.length();
</span><span class="lines">@@ -654,7 +654,7 @@
</span><span class="cx"> size_t nextDoubleQuotePosition = value.find('"', 1);
</span><span class="cx"> if (nextDoubleQuotePosition != notFound) {
</span><span class="cx"> // Store the value as a quoted string without quotes
</span><del>- result.append(pair<String, String>(directive, value.substring(1, nextDoubleQuotePosition - 1).stripWhiteSpace()));
</del><ins>+ result.append(std::pair<String, String>(directive, value.substring(1, nextDoubleQuotePosition - 1).stripWhiteSpace()));
</ins><span class="cx"> pos += (safeHeader.find('"', pos) - pos) + nextDoubleQuotePosition + 1;
</span><span class="cx"> // Move past next comma, if there is one
</span><span class="cx"> size_t nextCommaPosition2 = safeHeader.find(',', pos);
</span><span class="lines">@@ -664,7 +664,7 @@
</span><span class="cx"> return; // Parse error if there is anything left with no comma
</span><span class="cx"> } else {
</span><span class="cx"> // Parse error; just use the rest as the value
</span><del>- result.append(pair<String, String>(directive, trimToNextSeparator(value.substring(1, value.length() - 1).stripWhiteSpace())));
</del><ins>+ result.append(std::pair<String, String>(directive, trimToNextSeparator(value.substring(1, value.length() - 1).stripWhiteSpace())));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="lines">@@ -672,21 +672,21 @@
</span><span class="cx"> size_t nextCommaPosition2 = value.find(',');
</span><span class="cx"> if (nextCommaPosition2 != notFound) {
</span><span class="cx"> // The value is delimited by the next comma
</span><del>- result.append(pair<String, String>(directive, trimToNextSeparator(value.substring(0, nextCommaPosition2).stripWhiteSpace())));
</del><ins>+ result.append(std::pair<String, String>(directive, trimToNextSeparator(value.substring(0, nextCommaPosition2).stripWhiteSpace())));
</ins><span class="cx"> pos += (safeHeader.find(',', pos) - pos) + 1;
</span><span class="cx"> } else {
</span><span class="cx"> // The rest is the value; no change to value needed
</span><del>- result.append(pair<String, String>(directive, trimToNextSeparator(value)));
</del><ins>+ result.append(std::pair<String, String>(directive, trimToNextSeparator(value)));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } else if (nextCommaPosition != notFound && (nextCommaPosition < nextEqualSignPosition || nextEqualSignPosition == notFound)) {
</span><span class="cx"> // Add directive to map with empty string as value
</span><del>- result.append(pair<String, String>(trimToNextSeparator(safeHeader.substring(pos, nextCommaPosition - pos).stripWhiteSpace()), ""));
</del><ins>+ result.append(std::pair<String, String>(trimToNextSeparator(safeHeader.substring(pos, nextCommaPosition - pos).stripWhiteSpace()), ""));
</ins><span class="cx"> pos += nextCommaPosition - pos + 1;
</span><span class="cx"> } else {
</span><span class="cx"> // Add last directive to map with empty string as value
</span><del>- result.append(pair<String, String>(trimToNextSeparator(safeHeader.substring(pos, max - pos).stripWhiteSpace()), ""));
</del><ins>+ result.append(std::pair<String, String>(trimToNextSeparator(safeHeader.substring(pos, max - pos).stripWhiteSpace()), ""));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextAtomicStringKeyedMRUCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/AtomicStringKeyedMRUCache.h (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/AtomicStringKeyedMRUCache.h 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/platform/text/AtomicStringKeyedMRUCache.h 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> T createValueForNullKey();
</span><span class="cx"> T createValueForKey(const AtomicString&);
</span><span class="cx">
</span><del>- typedef pair<AtomicString, T> Entry;
</del><ins>+ typedef std::pair<AtomicString, T> Entry;
</ins><span class="cx"> typedef Vector<Entry, capacity> Cache;
</span><span class="cx"> Cache m_cache;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextLineBreakIteratorPoolICUh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/LineBreakIteratorPoolICU.h (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/LineBreakIteratorPoolICU.h 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/platform/text/LineBreakIteratorPoolICU.h 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx">
</span><span class="cx"> static const size_t capacity = 4;
</span><span class="cx">
</span><del>- typedef pair<AtomicString, UBreakIterator*> Entry;
</del><ins>+ typedef std::pair<AtomicString, UBreakIterator*> Entry;
</ins><span class="cx"> typedef Vector<Entry, capacity> Pool;
</span><span class="cx"> Pool m_pool;
</span><span class="cx"> HashMap<UBreakIterator*, AtomicString> m_vendedIterators;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineFlowBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineFlowBox.h (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineFlowBox.h 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/rendering/InlineFlowBox.h 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> struct GlyphOverflow;
</span><span class="cx">
</span><del>-typedef HashMap<const InlineTextBox*, pair<Vector<const SimpleFontData*>, GlyphOverflow>> GlyphOverflowAndFallbackFontsMap;
</del><ins>+typedef HashMap<const InlineTextBox*, std::pair<Vector<const SimpleFontData*>, GlyphOverflow>> GlyphOverflowAndFallbackFontsMap;
</ins><span class="cx">
</span><span class="cx"> class InlineFlowBox : public InlineBox {
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderImage.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderImage.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/rendering/RenderImage.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> IntSize imageSize;
</span><span class="cx"> if (newImage->willPaintBrokenImage()) {
</span><span class="cx"> float deviceScaleFactor = WebCore::deviceScaleFactor(&frame());
</span><del>- pair<Image*, float> brokenImageAndImageScaleFactor = newImage->brokenImage(deviceScaleFactor);
</del><ins>+ std::pair<Image*, float> brokenImageAndImageScaleFactor = newImage->brokenImage(deviceScaleFactor);
</ins><span class="cx"> imageSize = brokenImageAndImageScaleFactor.first->size();
</span><span class="cx"> imageSize.scale(1 / brokenImageAndImageScaleFactor.second);
</span><span class="cx"> } else
</span><span class="lines">@@ -438,7 +438,7 @@
</span><span class="cx"> if (m_imageResource->errorOccurred() && !image->isNull() && usableWidth >= image->width() && usableHeight >= image->height()) {
</span><span class="cx"> float deviceScaleFactor = WebCore::deviceScaleFactor(&frame());
</span><span class="cx"> // Call brokenImage() explicitly to ensure we get the broken image icon at the appropriate resolution.
</span><del>- pair<Image*, float> brokenImageAndImageScaleFactor = m_imageResource->cachedImage()->brokenImage(deviceScaleFactor);
</del><ins>+ std::pair<Image*, float> brokenImageAndImageScaleFactor = m_imageResource->cachedImage()->brokenImage(deviceScaleFactor);
</ins><span class="cx"> image = brokenImageAndImageScaleFactor.first;
</span><span class="cx"> IntSize imageSize = image->size();
</span><span class="cx"> imageSize.scale(1 / brokenImageAndImageScaleFactor.second);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableSectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableSection.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableSection.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/rendering/RenderTableSection.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -1565,7 +1565,7 @@
</span><span class="cx"> CollapsedBorderValue& RenderTableSection::cachedCollapsedBorder(const RenderTableCell* cell, CollapsedBorderSide side)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(table()->collapseBorders());
</span><del>- HashMap<pair<const RenderTableCell*, int>, CollapsedBorderValue>::iterator it = m_cellsCollapsedBorders.find(std::make_pair(cell, side));
</del><ins>+ HashMap<std::pair<const RenderTableCell*, int>, CollapsedBorderValue>::iterator it = m_cellsCollapsedBorders.find(std::make_pair(cell, side));
</ins><span class="cx"> ASSERT(it != m_cellsCollapsedBorders.end());
</span><span class="cx"> return it->value;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableSectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableSection.h (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableSection.h 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/rendering/RenderTableSection.h 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -306,7 +306,7 @@
</span><span class="cx">
</span><span class="cx"> // This map holds the collapsed border values for cells with collapsed borders.
</span><span class="cx"> // It is held at RenderTableSection level to spare memory consumption by table cells.
</span><del>- HashMap<pair<const RenderTableCell*, int>, CollapsedBorderValue > m_cellsCollapsedBorders;
</del><ins>+ HashMap<std::pair<const RenderTableCell*, int>, CollapsedBorderValue > m_cellsCollapsedBorders;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<> inline bool isRendererOfType<const RenderTableSection>(const RenderObject& renderer) { return renderer.isTableSection(); }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGTextRunRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGTextRunRenderingContext.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGTextRunRenderingContext.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/rendering/svg/SVGTextRunRenderingContext.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> const SimpleFontData* primaryFont = font.primaryFont();
</span><span class="cx"> ASSERT(primaryFont);
</span><span class="cx">
</span><del>- pair<GlyphData, GlyphPage*> pair = font.glyphDataAndPageForCharacter(character, mirror, AutoVariant);
</del><ins>+ std::pair<GlyphData, GlyphPage*> pair = font.glyphDataAndPageForCharacter(character, mirror, AutoVariant);
</ins><span class="cx"> GlyphData glyphData = pair.first;
</span><span class="cx">
</span><span class="cx"> // Check if we have the missing glyph data, in which case we can just return.
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGAnimatedAnglecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGAnimatedAngle.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGAnimatedAngle.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/svg/SVGAnimatedAngle.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -34,8 +34,8 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<SVGAnimatedType> SVGAnimatedAngleAnimator::constructFromString(const String& string)
</span><span class="cx"> {
</span><del>- auto animatedType = SVGAnimatedType::createAngleAndEnumeration(std::make_unique<pair<SVGAngle, unsigned>>());
- pair<SVGAngle, unsigned>& animatedPair = animatedType->angleAndEnumeration();
</del><ins>+ auto animatedType = SVGAnimatedType::createAngleAndEnumeration(std::make_unique<std::pair<SVGAngle, unsigned>>());
+ std::pair<SVGAngle, unsigned>& animatedPair = animatedType->angleAndEnumeration();
</ins><span class="cx">
</span><span class="cx"> SVGAngle angle;
</span><span class="cx"> SVGMarkerOrientType orientType = SVGPropertyTraits<SVGMarkerOrientType>::fromString(string, angle);
</span><span class="lines">@@ -77,8 +77,8 @@
</span><span class="cx"> ASSERT(from->type() == AnimatedAngle);
</span><span class="cx"> ASSERT(from->type() == to->type());
</span><span class="cx">
</span><del>- const pair<SVGAngle, unsigned>& fromAngleAndEnumeration = from->angleAndEnumeration();
- pair<SVGAngle, unsigned>& toAngleAndEnumeration = to->angleAndEnumeration();
</del><ins>+ const std::pair<SVGAngle, unsigned>& fromAngleAndEnumeration = from->angleAndEnumeration();
+ std::pair<SVGAngle, unsigned>& toAngleAndEnumeration = to->angleAndEnumeration();
</ins><span class="cx"> // Only respect by animations, if from and by are both specified in angles (and not eg. 'auto').
</span><span class="cx"> if (fromAngleAndEnumeration.second != toAngleAndEnumeration.second || fromAngleAndEnumeration.second != SVGMarkerOrientAngle)
</span><span class="cx"> return;
</span><span class="lines">@@ -92,10 +92,10 @@
</span><span class="cx"> ASSERT(m_animationElement);
</span><span class="cx"> ASSERT(m_contextElement);
</span><span class="cx">
</span><del>- const pair<SVGAngle, unsigned>& fromAngleAndEnumeration = m_animationElement->animationMode() == ToAnimation ? animated->angleAndEnumeration() : from->angleAndEnumeration();
- const pair<SVGAngle, unsigned>& toAngleAndEnumeration = to->angleAndEnumeration();
- const pair<SVGAngle, unsigned>& toAtEndOfDurationAngleAndEnumeration = toAtEndOfDuration->angleAndEnumeration();
- pair<SVGAngle, unsigned>& animatedAngleAndEnumeration = animated->angleAndEnumeration();
</del><ins>+ const std::pair<SVGAngle, unsigned>& fromAngleAndEnumeration = m_animationElement->animationMode() == ToAnimation ? animated->angleAndEnumeration() : from->angleAndEnumeration();
+ const std::pair<SVGAngle, unsigned>& toAngleAndEnumeration = to->angleAndEnumeration();
+ const std::pair<SVGAngle, unsigned>& toAtEndOfDurationAngleAndEnumeration = toAtEndOfDuration->angleAndEnumeration();
+ std::pair<SVGAngle, unsigned>& animatedAngleAndEnumeration = animated->angleAndEnumeration();
</ins><span class="cx">
</span><span class="cx"> if (fromAngleAndEnumeration.second != toAngleAndEnumeration.second) {
</span><span class="cx"> // Animating from eg. auto to 90deg, or auto to 90deg.
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGAnimatedIntegerOptionalIntegercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGAnimatedIntegerOptionalInteger.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGAnimatedIntegerOptionalInteger.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/svg/SVGAnimatedIntegerOptionalInteger.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<SVGAnimatedType> SVGAnimatedIntegerOptionalIntegerAnimator::constructFromString(const String& string)
</span><span class="cx"> {
</span><del>- auto animatedType = SVGAnimatedType::createIntegerOptionalInteger(std::make_unique<pair<int, int>>());
- pair<int, int>& animatedInteger = animatedType->integerOptionalInteger();
</del><ins>+ auto animatedType = SVGAnimatedType::createIntegerOptionalInteger(std::make_unique<std::pair<int, int>>());
+ std::pair<int, int>& animatedInteger = animatedType->integerOptionalInteger();
</ins><span class="cx"> float firstNumber = 0;
</span><span class="cx"> float secondNumber = 0;
</span><span class="cx"> if (!parseNumberOptionalNumber(string, firstNumber, secondNumber)) {
</span><span class="lines">@@ -79,8 +79,8 @@
</span><span class="cx"> ASSERT(from->type() == AnimatedIntegerOptionalInteger);
</span><span class="cx"> ASSERT(from->type() == to->type());
</span><span class="cx">
</span><del>- const pair<int, int>& fromIntegerPair = from->integerOptionalInteger();
- pair<int, int>& toIntegerPair = to->integerOptionalInteger();
</del><ins>+ const std::pair<int, int>& fromIntegerPair = from->integerOptionalInteger();
+ std::pair<int, int>& toIntegerPair = to->integerOptionalInteger();
</ins><span class="cx">
</span><span class="cx"> toIntegerPair.first += fromIntegerPair.first;
</span><span class="cx"> toIntegerPair.second += fromIntegerPair.second;
</span><span class="lines">@@ -91,10 +91,10 @@
</span><span class="cx"> ASSERT(m_animationElement);
</span><span class="cx"> ASSERT(m_contextElement);
</span><span class="cx">
</span><del>- const pair<int, int>& fromIntegerPair = m_animationElement->animationMode() == ToAnimation ? animated->integerOptionalInteger() : from->integerOptionalInteger();
- const pair<int, int>& toIntegerPair = to->integerOptionalInteger();
- const pair<int, int>& toAtEndOfDurationIntegerPair = toAtEndOfDuration->integerOptionalInteger();
- pair<int, int>& animatedIntegerPair = animated->integerOptionalInteger();
</del><ins>+ const std::pair<int, int>& fromIntegerPair = m_animationElement->animationMode() == ToAnimation ? animated->integerOptionalInteger() : from->integerOptionalInteger();
+ const std::pair<int, int>& toIntegerPair = to->integerOptionalInteger();
+ const std::pair<int, int>& toAtEndOfDurationIntegerPair = toAtEndOfDuration->integerOptionalInteger();
+ std::pair<int, int>& animatedIntegerPair = animated->integerOptionalInteger();
</ins><span class="cx">
</span><span class="cx"> SVGAnimatedIntegerAnimator::calculateAnimatedInteger(m_animationElement, percentage, repeatCount, fromIntegerPair.first, toIntegerPair.first, toAtEndOfDurationIntegerPair.first, animatedIntegerPair.first);
</span><span class="cx"> SVGAnimatedIntegerAnimator::calculateAnimatedInteger(m_animationElement, percentage, repeatCount, fromIntegerPair.second, toIntegerPair.second, toAtEndOfDurationIntegerPair.second, animatedIntegerPair.second);
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGAnimatedNumberOptionalNumbercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGAnimatedNumberOptionalNumber.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGAnimatedNumberOptionalNumber.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/svg/SVGAnimatedNumberOptionalNumber.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<SVGAnimatedType> SVGAnimatedNumberOptionalNumberAnimator::constructFromString(const String& string)
</span><span class="cx"> {
</span><del>- auto animatedType = SVGAnimatedType::createNumberOptionalNumber(std::make_unique<pair<float, float>>());
- pair<float, float>& animatedNumber = animatedType->numberOptionalNumber();
</del><ins>+ auto animatedType = SVGAnimatedType::createNumberOptionalNumber(std::make_unique<std::pair<float, float>>());
+ std::pair<float, float>& animatedNumber = animatedType->numberOptionalNumber();
</ins><span class="cx"> if (!parseNumberOptionalNumber(string, animatedNumber.first, animatedNumber.second)) {
</span><span class="cx"> animatedNumber.first = 0;
</span><span class="cx"> animatedNumber.second = 0;
</span><span class="lines">@@ -74,8 +74,8 @@
</span><span class="cx"> ASSERT(from->type() == AnimatedNumberOptionalNumber);
</span><span class="cx"> ASSERT(from->type() == to->type());
</span><span class="cx">
</span><del>- const pair<float, float>& fromNumberPair = from->numberOptionalNumber();
- pair<float, float>& toNumberPair = to->numberOptionalNumber();
</del><ins>+ const std::pair<float, float>& fromNumberPair = from->numberOptionalNumber();
+ std::pair<float, float>& toNumberPair = to->numberOptionalNumber();
</ins><span class="cx">
</span><span class="cx"> toNumberPair.first += fromNumberPair.first;
</span><span class="cx"> toNumberPair.second += fromNumberPair.second;
</span><span class="lines">@@ -86,10 +86,10 @@
</span><span class="cx"> ASSERT(m_animationElement);
</span><span class="cx"> ASSERT(m_contextElement);
</span><span class="cx">
</span><del>- const pair<float, float>& fromNumberPair = m_animationElement->animationMode() == ToAnimation ? animated->numberOptionalNumber() : from->numberOptionalNumber();
- const pair<float, float>& toNumberPair = to->numberOptionalNumber();
- const pair<float, float>& toAtEndOfDurationNumberPair = toAtEndOfDuration->numberOptionalNumber();
- pair<float, float>& animatedNumberPair = animated->numberOptionalNumber();
</del><ins>+ const std::pair<float, float>& fromNumberPair = m_animationElement->animationMode() == ToAnimation ? animated->numberOptionalNumber() : from->numberOptionalNumber();
+ const std::pair<float, float>& toNumberPair = to->numberOptionalNumber();
+ const std::pair<float, float>& toAtEndOfDurationNumberPair = toAtEndOfDuration->numberOptionalNumber();
+ std::pair<float, float>& animatedNumberPair = animated->numberOptionalNumber();
</ins><span class="cx">
</span><span class="cx"> m_animationElement->animateAdditiveNumber(percentage, repeatCount, fromNumberPair.first, toNumberPair.first, toAtEndOfDurationNumberPair.first, animatedNumberPair.first);
</span><span class="cx"> m_animationElement->animateAdditiveNumber(percentage, repeatCount, fromNumberPair.second, toNumberPair.second, toAtEndOfDurationNumberPair.second, animatedNumberPair.second);
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGAnimatedTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGAnimatedType.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGAnimatedType.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/svg/SVGAnimatedType.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> return animatedType;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<SVGAnimatedType> SVGAnimatedType::createIntegerOptionalInteger(std::unique_ptr<pair<int, int>> integerOptionalInteger)
</del><ins>+std::unique_ptr<SVGAnimatedType> SVGAnimatedType::createIntegerOptionalInteger(std::unique_ptr<std::pair<int, int>> integerOptionalInteger)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(integerOptionalInteger);
</span><span class="cx"> auto animatedType = std::make_unique<SVGAnimatedType>(AnimatedIntegerOptionalInteger);
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx"> return animatedType;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<SVGAnimatedType> SVGAnimatedType::createNumberOptionalNumber(std::unique_ptr<pair<float, float>> numberOptionalNumber)
</del><ins>+std::unique_ptr<SVGAnimatedType> SVGAnimatedType::createNumberOptionalNumber(std::unique_ptr<std::pair<float, float>> numberOptionalNumber)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(numberOptionalNumber);
</span><span class="cx"> auto animatedType = std::make_unique<SVGAnimatedType>(AnimatedNumberOptionalNumber);
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGAnimatedTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGAnimatedType.h (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGAnimatedType.h 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/svg/SVGAnimatedType.h 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> return *m_data.integer;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const pair<int, int>& integerOptionalInteger() const
</del><ins>+ const std::pair<int, int>& integerOptionalInteger() const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_type == AnimatedIntegerOptionalInteger);
</span><span class="cx"> return *m_data.integerOptionalInteger;
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> return *m_data.numberList;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const pair<float, float>& numberOptionalNumber() const
</del><ins>+ const std::pair<float, float>& numberOptionalNumber() const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_type == AnimatedNumberOptionalNumber);
</span><span class="cx"> return *m_data.numberOptionalNumber;
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> return *m_data.integer;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- pair<int, int>& integerOptionalInteger()
</del><ins>+ std::pair<int, int>& integerOptionalInteger()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_type == AnimatedIntegerOptionalInteger);
</span><span class="cx"> return *m_data.integerOptionalInteger;
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> return *m_data.numberList;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- pair<float, float>& numberOptionalNumber()
</del><ins>+ std::pair<float, float>& numberOptionalNumber()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_type == AnimatedNumberOptionalNumber);
</span><span class="cx"> return *m_data.numberOptionalNumber;
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGAnimatedTypeAnimatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGAnimatedTypeAnimator.h (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGAnimatedTypeAnimator.h 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/svg/SVGAnimatedTypeAnimator.h 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -115,26 +115,26 @@
</span><span class="cx">
</span><span class="cx"> // Helpers for animators that operate on pair types, eg. a pair of SVGAnimatedIntegers.
</span><span class="cx"> template<typename AnimValType1, typename AnimValType2>
</span><del>- std::unique_ptr<pair<typename AnimValType1::ContentType, typename AnimValType2::ContentType>> constructFromBaseValues(const SVGElementAnimatedPropertyList& animatedTypes)
</del><ins>+ std::unique_ptr<std::pair<typename AnimValType1::ContentType, typename AnimValType2::ContentType>> constructFromBaseValues(const SVGElementAnimatedPropertyList& animatedTypes)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(animatedTypes[0].properties.size() == 2);
</span><span class="cx"> const typename AnimValType1::ContentType& firstType = castAnimatedPropertyToActualType<AnimValType1>(animatedTypes[0].properties[0].get())->currentBaseValue();
</span><span class="cx"> const typename AnimValType2::ContentType& secondType = castAnimatedPropertyToActualType<AnimValType2>(animatedTypes[0].properties[1].get())->currentBaseValue();
</span><span class="cx">
</span><del>- auto copy = std::make_unique<pair<typename AnimValType1::ContentType, typename AnimValType2::ContentType>>(firstType, secondType);
</del><ins>+ auto copy = std::make_unique<std::pair<typename AnimValType1::ContentType, typename AnimValType2::ContentType>>(firstType, secondType);
</ins><span class="cx"> executeAction<AnimValType1>(StartAnimationAction, animatedTypes, 0, &copy->first);
</span><span class="cx"> executeAction<AnimValType2>(StartAnimationAction, animatedTypes, 1, &copy->second);
</span><span class="cx"> return copy;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename AnimValType1, typename AnimValType2>
</span><del>- void resetFromBaseValues(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType* type, pair<typename AnimValType1::ContentType, typename AnimValType2::ContentType>& (SVGAnimatedType::*getter)())
</del><ins>+ void resetFromBaseValues(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType* type, std::pair<typename AnimValType1::ContentType, typename AnimValType2::ContentType>& (SVGAnimatedType::*getter)())
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(animatedTypes[0].properties.size() == 2);
</span><span class="cx"> ASSERT(type);
</span><span class="cx"> ASSERT(type->type() == m_type);
</span><span class="cx">
</span><del>- pair<typename AnimValType1::ContentType, typename AnimValType2::ContentType>& animatedTypeValue = (type->*getter)();
</del><ins>+ std::pair<typename AnimValType1::ContentType, typename AnimValType2::ContentType>& animatedTypeValue = (type->*getter)();
</ins><span class="cx"> animatedTypeValue.first = castAnimatedPropertyToActualType<AnimValType1>(animatedTypes[0].properties[0].get())->currentBaseValue();
</span><span class="cx"> animatedTypeValue.second = castAnimatedPropertyToActualType<AnimValType2>(animatedTypes[0].properties[1].get())->currentBaseValue();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGParserUtilitiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGParserUtilities.h (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGParserUtilities.h 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/svg/SVGParserUtilities.h 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "ParserUtilities.h"
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx">
</span><del>-typedef pair<unsigned, unsigned> UnicodeRange;
</del><ins>+typedef std::pair<unsigned, unsigned> UnicodeRange;
</ins><span class="cx"> typedef Vector<UnicodeRange> UnicodeRanges;
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoresvganimationSMILTimeContainerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/animation/SMILTimeContainer.h (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/animation/SMILTimeContainer.h 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebCore/svg/animation/SMILTimeContainer.h 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx">
</span><span class="cx"> Timer<SMILTimeContainer> m_timer;
</span><span class="cx">
</span><del>- typedef pair<SVGElement*, QualifiedName> ElementAttributePair;
</del><ins>+ typedef std::pair<SVGElement*, QualifiedName> ElementAttributePair;
</ins><span class="cx"> typedef Vector<SVGSMILElement*> AnimationsVector;
</span><span class="cx"> typedef HashMap<ElementAttributePair, std::unique_ptr<AnimationsVector>> GroupedAnimationsMap;
</span><span class="cx"> GroupedAnimationsMap m_scheduledAnimations;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-01-04 Zan Dobersek <zdobersek@igalia.com>
+
+ Explicitly use the std:: nested name specifier when using std::pair, std::make_pair
+ https://bugs.webkit.org/show_bug.cgi?id=126439
+
+ Reviewed by Andreas Kling.
+
+ Instead of relying on std::pair and std::make_pair symbols being present in the current scope
+ through the pair and make_pair symbols, the std:: specifier should be used explicitly.
+
+ * Plugins/Hosted/NetscapePluginInstanceProxy.h:
+ * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
+ (WebKit::NetscapePluginInstanceProxy::LocalObjectMap::idForObject):
+ (WebKit::NetscapePluginInstanceProxy::LocalObjectMap::retain):
+ (WebKit::NetscapePluginInstanceProxy::LocalObjectMap::release):
+ (WebKit::NetscapePluginInstanceProxy::LocalObjectMap::forget):
+
</ins><span class="cx"> 2014-01-02 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove WindowIsVisible
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsHostedNetscapePluginInstanceProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -334,7 +334,7 @@
</span><span class="cx"> HashMap<uint32_t, JSC::Strong<JSC::JSObject>> m_idToJSObjectMap;
</span><span class="cx"> // The pair consists of object ID and a reference count. One reference belongs to remote plug-in,
</span><span class="cx"> // and the proxy will add transient references for arguments that are being sent out.
</span><del>- HashMap<JSC::JSObject*, pair<uint32_t, uint32_t>> m_jsObjectToIDMap;
</del><ins>+ HashMap<JSC::JSObject*, std::pair<uint32_t, uint32_t>> m_jsObjectToIDMap;
</ins><span class="cx"> uint32_t m_objectIDCounter;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsHostedNetscapePluginInstanceProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx">
</span><span class="cx"> uint32_t objectID = 0;
</span><span class="cx">
</span><del>- HashMap<JSC::JSObject*, pair<uint32_t, uint32_t>>::iterator iter = m_jsObjectToIDMap.find(object);
</del><ins>+ HashMap<JSC::JSObject*, std::pair<uint32_t, uint32_t>>::iterator iter = m_jsObjectToIDMap.find(object);
</ins><span class="cx"> if (iter != m_jsObjectToIDMap.end())
</span><span class="cx"> return iter->value.first;
</span><span class="cx">
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx">
</span><span class="cx"> void NetscapePluginInstanceProxy::LocalObjectMap::retain(JSC::JSObject* object)
</span><span class="cx"> {
</span><del>- HashMap<JSC::JSObject*, pair<uint32_t, uint32_t>>::iterator iter = m_jsObjectToIDMap.find(object);
</del><ins>+ HashMap<JSC::JSObject*, std::pair<uint32_t, uint32_t>>::iterator iter = m_jsObjectToIDMap.find(object);
</ins><span class="cx"> ASSERT(iter != m_jsObjectToIDMap.end());
</span><span class="cx">
</span><span class="cx"> iter->value.second = iter->value.second + 1;
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx">
</span><span class="cx"> void NetscapePluginInstanceProxy::LocalObjectMap::release(JSC::JSObject* object)
</span><span class="cx"> {
</span><del>- HashMap<JSC::JSObject*, pair<uint32_t, uint32_t>>::iterator iter = m_jsObjectToIDMap.find(object);
</del><ins>+ HashMap<JSC::JSObject*, std::pair<uint32_t, uint32_t>>::iterator iter = m_jsObjectToIDMap.find(object);
</ins><span class="cx"> ASSERT(iter != m_jsObjectToIDMap.end());
</span><span class="cx">
</span><span class="cx"> ASSERT(iter->value.second > 0);
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- HashMap<JSC::JSObject*, pair<uint32_t, uint32_t>>::iterator rIter = m_jsObjectToIDMap.find(iter->value.get());
</del><ins>+ HashMap<JSC::JSObject*, std::pair<uint32_t, uint32_t>>::iterator rIter = m_jsObjectToIDMap.find(iter->value.get());
</ins><span class="cx">
</span><span class="cx"> // If the object is being sent to plug-in right now, then it's not the time to forget.
</span><span class="cx"> if (rIter->value.second != 1)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-01-04 Zan Dobersek <zdobersek@igalia.com>
+
+ Explicitly use the std:: nested name specifier when using std::pair, std::make_pair
+ https://bugs.webkit.org/show_bug.cgi?id=126439
+
+ Reviewed by Andreas Kling.
+
+ Instead of relying on std::pair and std::make_pair symbols being present in the current scope
+ through the pair and make_pair symbols, the std:: specifier should be used explicitly.
+
+ * Shared/mac/ArgumentCodersMac.mm:
+ (IPC::encode):
+ * UIProcess/Notifications/WebNotificationManagerProxy.cpp:
+ (WebKit::WebNotificationManagerProxy::show):
+ (WebKit::WebNotificationManagerProxy::cancel):
+ (WebKit::WebNotificationManagerProxy::didDestroyNotification):
+ * UIProcess/Notifications/WebNotificationManagerProxy.h:
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::createNewWebProcess):
+ * UIProcess/WebContext.h:
+
</ins><span class="cx"> 2014-01-03 Piotr Grad <p.grad@samsung.com>
</span><span class="cx">
</span><span class="cx"> Build brake after 161045 on EFL port with WebKit2 and gcc 4.6.3
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacArgumentCodersMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/ArgumentCodersMac.mm (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/ArgumentCodersMac.mm 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebKit2/Shared/mac/ArgumentCodersMac.mm 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx"> NSUInteger length = [plainString length];
</span><span class="cx"> IPC::encode(encoder, plainString);
</span><span class="cx">
</span><del>- Vector<pair<NSRange, RetainPtr<NSDictionary>>> ranges;
</del><ins>+ Vector<std::pair<NSRange, RetainPtr<NSDictionary>>> ranges;
</ins><span class="cx">
</span><span class="cx"> NSUInteger position = 0;
</span><span class="cx"> while (position < length) {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNotificationsWebNotificationManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -104,21 +104,21 @@
</span><span class="cx"> {
</span><span class="cx"> uint64_t globalNotificationID = generateGlobalNotificationID();
</span><span class="cx"> RefPtr<WebNotification> notification = WebNotification::create(title, body, iconURL, tag, lang, dir, originString, globalNotificationID);
</span><del>- pair<uint64_t, uint64_t> notificationIDPair = make_pair(webPage->pageID(), pageNotificationID);
</del><ins>+ std::pair<uint64_t, uint64_t> notificationIDPair = std::make_pair(webPage->pageID(), pageNotificationID);
</ins><span class="cx"> m_globalNotificationMap.set(globalNotificationID, notificationIDPair);
</span><del>- m_notifications.set(notificationIDPair, make_pair(globalNotificationID, notification));
</del><ins>+ m_notifications.set(notificationIDPair, std::make_pair(globalNotificationID, notification));
</ins><span class="cx"> m_provider.show(webPage, notification.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebNotificationManagerProxy::cancel(WebPageProxy* webPage, uint64_t pageNotificationID)
</span><span class="cx"> {
</span><del>- if (WebNotification* notification = m_notifications.get(make_pair(webPage->pageID(), pageNotificationID)).second.get())
</del><ins>+ if (WebNotification* notification = m_notifications.get(std::make_pair(webPage->pageID(), pageNotificationID)).second.get())
</ins><span class="cx"> m_provider.cancel(notification);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebNotificationManagerProxy::didDestroyNotification(WebPageProxy* webPage, uint64_t pageNotificationID)
</span><span class="cx"> {
</span><del>- auto globalIDNotificationPair = m_notifications.take(make_pair(webPage->pageID(), pageNotificationID));
</del><ins>+ auto globalIDNotificationPair = m_notifications.take(std::make_pair(webPage->pageID(), pageNotificationID));
</ins><span class="cx"> if (uint64_t globalNotificationID = globalIDNotificationPair.first) {
</span><span class="cx"> WebNotification* notification = globalIDNotificationPair.second.get();
</span><span class="cx"> m_globalNotificationMap.remove(globalNotificationID);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNotificationsWebNotificationManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -84,9 +84,9 @@
</span><span class="cx">
</span><span class="cx"> WebNotificationProvider m_provider;
</span><span class="cx"> // Pair comprised of web page ID and the web process's notification ID
</span><del>- HashMap<uint64_t, pair<uint64_t, uint64_t>> m_globalNotificationMap;
</del><ins>+ HashMap<uint64_t, std::pair<uint64_t, uint64_t>> m_globalNotificationMap;
</ins><span class="cx"> // Key pair comprised of web page ID and the web process's notification ID; value pair comprised of global notification ID, and notification object
</span><del>- HashMap<pair<uint64_t, uint64_t>, pair<uint64_t, RefPtr<WebNotification>>> m_notifications;
</del><ins>+ HashMap<std::pair<uint64_t, uint64_t>, std::pair<uint64_t, RefPtr<WebNotification>>> m_notifications;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -599,7 +599,7 @@
</span><span class="cx">
</span><span class="cx"> if (m_processModel == ProcessModelSharedSecondaryProcess) {
</span><span class="cx"> for (size_t i = 0; i != m_messagesToInjectedBundlePostedToEmptyContext.size(); ++i) {
</span><del>- pair<String, RefPtr<API::Object>>& message = m_messagesToInjectedBundlePostedToEmptyContext[i];
</del><ins>+ std::pair<String, RefPtr<API::Object>>& message = m_messagesToInjectedBundlePostedToEmptyContext[i];
</ins><span class="cx">
</span><span class="cx"> IPC::ArgumentEncoder messageData;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (161308 => 161309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.h 2014-01-04 07:43:10 UTC (rev 161308)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2014-01-04 17:26:52 UTC (rev 161309)
</span><span class="lines">@@ -446,7 +446,7 @@
</span><span class="cx">
</span><span class="cx"> // Messages that were posted before any pages were created.
</span><span class="cx"> // The client should use initialization messages instead, so that a restarted process would get the same state.
</span><del>- Vector<pair<String, RefPtr<API::Object>>> m_messagesToInjectedBundlePostedToEmptyContext;
</del><ins>+ Vector<std::pair<String, RefPtr<API::Object>>> m_messagesToInjectedBundlePostedToEmptyContext;
</ins><span class="cx">
</span><span class="cx"> CacheModel m_cacheModel;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>