<!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>[197591] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/197591">197591</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-04 15:28:22 -0800 (Fri, 04 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Added missing override specifiers under Source/WebCore.
https://bugs.webkit.org/show_bug.cgi?id=155021
Patch by Konstantin Tokarev <annulen@yandex.ru> on 2016-03-04
Reviewed by Michael Catanzaro.
No new tests needed.
* bridge/NP_jsobject.cpp:
* css/CSSStyleSheet.cpp:
* dom/MutationObserver.cpp:
* editing/DictationCommand.cpp:
* editing/EditingStyle.cpp:
* loader/EmptyClients.cpp:
* loader/SinkDocument.cpp:
* page/DOMWindow.cpp:
* page/animation/CSSPropertyAnimation.cpp:
* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
Also added #if(SOUP) guard to
ResourceHandleStreamingClient::getOrCreateReadBuffer
because it is not an overridden method otherwise.
* platform/text/LineEnding.cpp:
* xml/parser/XMLDocumentParserLibxml2.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebridgeNP_jsobjectcpp">trunk/Source/WebCore/bridge/NP_jsobject.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSStyleSheetcpp">trunk/Source/WebCore/css/CSSStyleSheet.cpp</a></li>
<li><a href="#trunkSourceWebCoredomMutationObservercpp">trunk/Source/WebCore/dom/MutationObserver.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingDictationCommandcpp">trunk/Source/WebCore/editing/DictationCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditingStylecpp">trunk/Source/WebCore/editing/EditingStyle.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientscpp">trunk/Source/WebCore/loader/EmptyClients.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderSinkDocumentcpp">trunk/Source/WebCore/loader/SinkDocument.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationCSSPropertyAnimationcpp">trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformtextLineEndingcpp">trunk/Source/WebCore/platform/text/LineEnding.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlparserXMLDocumentParserLibxml2cpp">trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197590 => 197591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-04 22:18:10 UTC (rev 197590)
+++ trunk/Source/WebCore/ChangeLog 2016-03-04 23:28:22 UTC (rev 197591)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-03-04 Konstantin Tokarev <annulen@yandex.ru>
+
+ Added missing override specifiers under Source/WebCore.
+ https://bugs.webkit.org/show_bug.cgi?id=155021
+
+ Reviewed by Michael Catanzaro.
+
+ No new tests needed.
+
+ * bridge/NP_jsobject.cpp:
+ * css/CSSStyleSheet.cpp:
+ * dom/MutationObserver.cpp:
+ * editing/DictationCommand.cpp:
+ * editing/EditingStyle.cpp:
+ * loader/EmptyClients.cpp:
+ * loader/SinkDocument.cpp:
+ * page/DOMWindow.cpp:
+ * page/animation/CSSPropertyAnimation.cpp:
+ * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+ Also added #if(SOUP) guard to
+ ResourceHandleStreamingClient::getOrCreateReadBuffer
+ because it is not an overridden method otherwise.
+ * platform/text/LineEnding.cpp:
+ * xml/parser/XMLDocumentParserLibxml2.cpp:
+
</ins><span class="cx"> 2016-03-04 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> Max out timer throttling immediately for pre-render pages
</span></span></pre></div>
<a id="trunkSourceWebCorebridgeNP_jsobjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bridge/NP_jsobject.cpp (197590 => 197591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bridge/NP_jsobject.cpp 2016-03-04 22:18:10 UTC (rev 197590)
+++ trunk/Source/WebCore/bridge/NP_jsobject.cpp 2016-03-04 23:28:22 UTC (rev 197591)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> struct RootObjectInvalidationCallback : public RootObject::InvalidationCallback {
</span><del>- virtual void operator()(RootObject*);
</del><ins>+ void operator()(RootObject*) override;
</ins><span class="cx"> };
</span><span class="cx"> RootObjectInvalidationCallback m_invalidationCallback;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSStyleSheet.cpp (197590 => 197591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSStyleSheet.cpp 2016-03-04 22:18:10 UTC (rev 197590)
+++ trunk/Source/WebCore/css/CSSStyleSheet.cpp 2016-03-04 23:28:22 UTC (rev 197591)
</span><span class="lines">@@ -52,14 +52,14 @@
</span><span class="cx"> StyleSheetCSSRuleList(CSSStyleSheet* sheet) : m_styleSheet(sheet) { }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual void ref() { m_styleSheet->ref(); }
- virtual void deref() { m_styleSheet->deref(); }
-
- virtual unsigned length() const { return m_styleSheet->length(); }
- virtual CSSRule* item(unsigned index) const { return m_styleSheet->item(index); }
-
- virtual CSSStyleSheet* styleSheet() const { return m_styleSheet; }
</del><ins>+ void ref() override { m_styleSheet->ref(); }
+ void deref() override { m_styleSheet->deref(); }
</ins><span class="cx">
</span><ins>+ unsigned length() const override { return m_styleSheet->length(); }
+ CSSRule* item(unsigned index) const override { return m_styleSheet->item(index); }
+
+ CSSStyleSheet* styleSheet() const override { return m_styleSheet; }
+
</ins><span class="cx"> CSSStyleSheet* m_styleSheet;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomMutationObservercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MutationObserver.cpp (197590 => 197591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MutationObserver.cpp 2016-03-04 22:18:10 UTC (rev 197590)
+++ trunk/Source/WebCore/dom/MutationObserver.cpp 2016-03-04 23:28:22 UTC (rev 197591)
</span><span class="lines">@@ -167,8 +167,8 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-private:
- virtual Result run()
</del><ins>+private:
+ Result run() override
</ins><span class="cx"> {
</span><span class="cx"> mutationObserverCompoundMicrotaskQueuedFlag = false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingDictationCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/DictationCommand.cpp (197590 => 197591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/DictationCommand.cpp 2016-03-04 22:18:10 UTC (rev 197590)
+++ trunk/Source/WebCore/editing/DictationCommand.cpp 2016-03-04 23:28:22 UTC (rev 197591)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> return adoptRef(*new DictationMarkerSupplier(alternatives));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void addMarkersToTextNode(Text* textNode, unsigned offsetOfInsertion, const String& textToBeInserted)
</del><ins>+ void addMarkersToTextNode(Text* textNode, unsigned offsetOfInsertion, const String& textToBeInserted) override
</ins><span class="cx"> {
</span><span class="cx"> DocumentMarkerController& markerController = textNode->document().markers();
</span><span class="cx"> for (auto& alternative : m_alternatives) {
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditingStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/EditingStyle.cpp (197590 => 197591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/EditingStyle.cpp 2016-03-04 22:18:10 UTC (rev 197590)
+++ trunk/Source/WebCore/editing/EditingStyle.cpp 2016-03-04 23:28:22 UTC (rev 197591)
</span><span class="lines">@@ -251,10 +251,10 @@
</span><span class="cx"> HTMLAttributeEquivalent(CSSPropertyID, const QualifiedName& tagName, const QualifiedName& attrName);
</span><span class="cx"> HTMLAttributeEquivalent(CSSPropertyID, const QualifiedName& attrName);
</span><span class="cx">
</span><del>- bool matches(const Element& element) const { return HTMLElementEquivalent::matches(element) && element.hasAttribute(m_attrName); }
- virtual bool hasAttribute() const { return true; }
- virtual bool valueIsPresentInStyle(Element&, const EditingStyle&) const;
- virtual void addToStyle(Element*, EditingStyle*) const;
</del><ins>+ bool matches(const Element& element) const override { return HTMLElementEquivalent::matches(element) && element.hasAttribute(m_attrName); }
+ bool hasAttribute() const override { return true; }
+ bool valueIsPresentInStyle(Element&, const EditingStyle&) const override;
+ void addToStyle(Element*, EditingStyle*) const override;
</ins><span class="cx"> virtual PassRefPtr<CSSValue> attributeValueAsCSSValue(Element*) const;
</span><span class="cx"> inline const QualifiedName& attributeName() const { return m_attrName; }
</span><span class="cx">
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> public:
</span><span class="cx"> HTMLFontSizeEquivalent();
</span><span class="cx">
</span><del>- virtual PassRefPtr<CSSValue> attributeValueAsCSSValue(Element*) const;
</del><ins>+ PassRefPtr<CSSValue> attributeValueAsCSSValue(Element*) const override;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> HTMLFontSizeEquivalent::HTMLFontSizeEquivalent()
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.cpp (197590 => 197591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.cpp 2016-03-04 22:18:10 UTC (rev 197590)
+++ trunk/Source/WebCore/loader/EmptyClients.cpp 2016-03-04 23:28:22 UTC (rev 197591)
</span><span class="lines">@@ -141,18 +141,18 @@
</span><span class="cx">
</span><span class="cx"> class EmptyPopupMenu : public PopupMenu {
</span><span class="cx"> public:
</span><del>- virtual void show(const IntRect&, FrameView*, int) { }
- virtual void hide() { }
- virtual void updateFromElement() { }
- virtual void disconnectClient() { }
</del><ins>+ void show(const IntRect&, FrameView*, int) override { }
+ void hide() override { }
+ void updateFromElement() override { }
+ void disconnectClient() override { }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class EmptySearchPopupMenu : public SearchPopupMenu {
</span><span class="cx"> public:
</span><del>- virtual PopupMenu* popupMenu() { return m_popup.get(); }
- virtual void saveRecentSearches(const AtomicString&, const Vector<RecentSearch>&) { }
- virtual void loadRecentSearches(const AtomicString&, Vector<RecentSearch>&) { }
- virtual bool enabled() { return false; }
</del><ins>+ PopupMenu* popupMenu() override { return m_popup.get(); }
+ void saveRecentSearches(const AtomicString&, const Vector<RecentSearch>&) override { }
+ void loadRecentSearches(const AtomicString&, Vector<RecentSearch>&) override { }
+ bool enabled() override { return false; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> RefPtr<EmptyPopupMenu> m_popup;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSinkDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SinkDocument.cpp (197590 => 197591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SinkDocument.cpp 2016-03-04 22:18:10 UTC (rev 197590)
+++ trunk/Source/WebCore/loader/SinkDocument.cpp 2016-03-04 23:28:22 UTC (rev 197591)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Ignore all data.
</span><del>- virtual void appendBytes(DocumentWriter&, const char*, size_t)
</del><ins>+ void appendBytes(DocumentWriter&, const char*, size_t) override
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (197590 => 197591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp 2016-03-04 22:18:10 UTC (rev 197590)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2016-03-04 23:28:22 UTC (rev 197591)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> ScriptCallStack* stackTrace() const { return m_stackTrace.get(); }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual void fired()
</del><ins>+ void fired() override
</ins><span class="cx"> {
</span><span class="cx"> // This object gets deleted when std::unique_ptr falls out of scope..
</span><span class="cx"> std::unique_ptr<PostMessageTimer> timer(this);
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationCSSPropertyAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp (197590 => 197591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2016-03-04 22:18:10 UTC (rev 197590)
+++ trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2016-03-04 23:28:22 UTC (rev 197591)
</span><span class="lines">@@ -401,7 +401,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual bool equals(const RenderStyle* a, const RenderStyle* b) const
</del><ins>+ bool equals(const RenderStyle* a, const RenderStyle* b) const override
</ins><span class="cx"> {
</span><span class="cx"> if (a == b)
</span><span class="cx"> return true;
</span><span class="lines">@@ -479,7 +479,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual bool equals(const RenderStyle* a, const RenderStyle* b) const
</del><ins>+ bool equals(const RenderStyle* a, const RenderStyle* b) const override
</ins><span class="cx"> {
</span><span class="cx"> // If the style pointers are the same, don't bother doing the test.
</span><span class="cx"> // If either is null, return false. If both are null, return true.
</span><span class="lines">@@ -507,7 +507,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual bool equals(const RenderStyle* a, const RenderStyle* b) const
</del><ins>+ bool equals(const RenderStyle* a, const RenderStyle* b) const override
</ins><span class="cx"> {
</span><span class="cx"> // If the style pointers are the same, don't bother doing the test.
</span><span class="cx"> // If either is null, return false. If both are null, return true.
</span><span class="lines">@@ -535,7 +535,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual bool equals(const RenderStyle* a, const RenderStyle* b) const
</del><ins>+ bool equals(const RenderStyle* a, const RenderStyle* b) const override
</ins><span class="cx"> {
</span><span class="cx"> if (a == b)
</span><span class="cx"> return true;
</span><span class="lines">@@ -557,7 +557,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const
</del><ins>+ void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const override
</ins><span class="cx"> {
</span><span class="cx"> (dst->*m_setter)(blendFunc(anim, (a->*PropertyWrapperGetter<Color>::m_getter)(), (b->*PropertyWrapperGetter<Color>::m_getter)(), progress));
</span><span class="cx"> }
</span><span class="lines">@@ -575,9 +575,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual bool animationIsAccelerated() const { return true; }
</del><ins>+ bool animationIsAccelerated() const override { return true; }
</ins><span class="cx">
</span><del>- virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const
</del><ins>+ void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const override
</ins><span class="cx"> {
</span><span class="cx"> float fromOpacity = a->opacity();
</span><span class="cx">
</span><span class="lines">@@ -594,9 +594,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual bool animationIsAccelerated() const { return true; }
</del><ins>+ bool animationIsAccelerated() const override { return true; }
</ins><span class="cx">
</span><del>- virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const
</del><ins>+ void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const override
</ins><span class="cx"> {
</span><span class="cx"> dst->setTransform(blendFunc(anim, a->transform(), b->transform(), progress));
</span><span class="cx"> }
</span><span class="lines">@@ -610,9 +610,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual bool animationIsAccelerated() const { return true; }
</del><ins>+ bool animationIsAccelerated() const override { return true; }
</ins><span class="cx">
</span><del>- virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const
</del><ins>+ void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const override
</ins><span class="cx"> {
</span><span class="cx"> dst->setFilter(blendFunc(anim, a->filter(), b->filter(), progress));
</span><span class="cx"> }
</span><span class="lines">@@ -670,7 +670,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual bool equals(const RenderStyle* a, const RenderStyle* b) const
</del><ins>+ bool equals(const RenderStyle* a, const RenderStyle* b) const override
</ins><span class="cx"> {
</span><span class="cx"> if (a == b)
</span><span class="cx"> return true;
</span><span class="lines">@@ -699,7 +699,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const
</del><ins>+ void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const override
</ins><span class="cx"> {
</span><span class="cx"> const ShadowData* shadowA = (a->*m_getter)();
</span><span class="cx"> const ShadowData* shadowB = (b->*m_getter)();
</span><span class="lines">@@ -791,7 +791,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual bool equals(const RenderStyle* a, const RenderStyle* b) const
</del><ins>+ bool equals(const RenderStyle* a, const RenderStyle* b) const override
</ins><span class="cx"> {
</span><span class="cx"> if (a == b)
</span><span class="cx"> return true;
</span><span class="lines">@@ -812,7 +812,7 @@
</span><span class="cx"> return fromColor == toColor;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const
</del><ins>+ void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const override
</ins><span class="cx"> {
</span><span class="cx"> Color fromColor = (a->*m_getter)();
</span><span class="cx"> Color toColor = (b->*m_getter)();
</span><span class="lines">@@ -851,11 +851,11 @@
</span><span class="cx"> , m_visitedWrapper(std::make_unique<PropertyWrapperMaybeInvalidColor>(prop, visitedGetter, visitedSetter))
</span><span class="cx"> {
</span><span class="cx"> }
</span><del>- virtual bool equals(const RenderStyle* a, const RenderStyle* b) const
</del><ins>+ bool equals(const RenderStyle* a, const RenderStyle* b) const override
</ins><span class="cx"> {
</span><span class="cx"> return m_wrapper->equals(a, b) && m_visitedWrapper->equals(a, b);
</span><span class="cx"> }
</span><del>- virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const
</del><ins>+ void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const override
</ins><span class="cx"> {
</span><span class="cx"> m_wrapper->blend(anim, dst, a, b, progress);
</span><span class="cx"> m_visitedWrapper->blend(anim, dst, a, b, progress);
</span><span class="lines">@@ -890,7 +890,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual bool equals(const FillLayer* a, const FillLayer* b) const
</del><ins>+ bool equals(const FillLayer* a, const FillLayer* b) const override
</ins><span class="cx"> {
</span><span class="cx"> if (a == b)
</span><span class="cx"> return true;
</span><span class="lines">@@ -949,7 +949,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual bool equals(const FillLayer* a, const FillLayer* b) const
</del><ins>+ bool equals(const FillLayer* a, const FillLayer* b) const override
</ins><span class="cx"> {
</span><span class="cx"> if (a == b)
</span><span class="cx"> return true;
</span><span class="lines">@@ -995,7 +995,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual bool equals(const RenderStyle* a, const RenderStyle* b) const
</del><ins>+ bool equals(const RenderStyle* a, const RenderStyle* b) const override
</ins><span class="cx"> {
</span><span class="cx"> if (a == b)
</span><span class="cx"> return true;
</span><span class="lines">@@ -1016,7 +1016,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const
</del><ins>+ void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const override
</ins><span class="cx"> {
</span><span class="cx"> const FillLayer* aLayer = (a->*m_layersGetter)();
</span><span class="cx"> const FillLayer* bLayer = (b->*m_layersGetter)();
</span><span class="lines">@@ -1046,9 +1046,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual bool isShorthandWrapper() const { return true; }
</del><ins>+ bool isShorthandWrapper() const override { return true; }
</ins><span class="cx">
</span><del>- virtual bool equals(const RenderStyle* a, const RenderStyle* b) const
</del><ins>+ bool equals(const RenderStyle* a, const RenderStyle* b) const override
</ins><span class="cx"> {
</span><span class="cx"> if (a == b)
</span><span class="cx"> return true;
</span><span class="lines">@@ -1062,7 +1062,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const
</del><ins>+ void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const override
</ins><span class="cx"> {
</span><span class="cx"> for (auto& wrapper : m_propertyWrappers)
</span><span class="cx"> wrapper->blend(anim, dst, a, b, progress);
</span><span class="lines">@@ -1082,7 +1082,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual bool equals(const RenderStyle* a, const RenderStyle* b) const
</del><ins>+ bool equals(const RenderStyle* a, const RenderStyle* b) const override
</ins><span class="cx"> {
</span><span class="cx"> if (a == b)
</span><span class="cx"> return true;
</span><span class="lines">@@ -1092,7 +1092,7 @@
</span><span class="cx"> return a->flexBasis() == b->flexBasis() && a->flexGrow() == b->flexGrow() && a->flexShrink() == b->flexShrink();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const
</del><ins>+ void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const override
</ins><span class="cx"> {
</span><span class="cx"> dst->setFlexBasis(blendFunc(anim, a->flexBasis(), b->flexBasis(), progress));
</span><span class="cx"> dst->setFlexGrow(blendFunc(anim, a->flexGrow(), b->flexGrow(), progress));
</span><span class="lines">@@ -1111,7 +1111,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual bool equals(const RenderStyle* a, const RenderStyle* b) const
</del><ins>+ bool equals(const RenderStyle* a, const RenderStyle* b) const override
</ins><span class="cx"> {
</span><span class="cx"> if (a == b)
</span><span class="cx"> return true;
</span><span class="lines">@@ -1141,7 +1141,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const
</del><ins>+ void blend(const AnimationBase* anim, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress) const override
</ins><span class="cx"> {
</span><span class="cx"> if ((a->*m_paintTypeGetter)() != SVGPaint::SVG_PAINTTYPE_RGBCOLOR
</span><span class="cx"> || (b->*m_paintTypeGetter)() != SVGPaint::SVG_PAINTTYPE_RGBCOLOR)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (197590 => 197591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2016-03-04 22:18:10 UTC (rev 197590)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2016-03-04 23:28:22 UTC (rev 197591)
</span><span class="lines">@@ -92,15 +92,17 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> // ResourceHandleClient virtual methods.
</span><del>- virtual char* getOrCreateReadBuffer(size_t requestedSize, size_t& actualSize);
- virtual void willSendRequest(ResourceHandle*, ResourceRequest&, const ResourceResponse&);
- virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&);
- virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int);
- virtual void didReceiveBuffer(ResourceHandle*, PassRefPtr<SharedBuffer>, int encodedLength);
- virtual void didFinishLoading(ResourceHandle*, double /*finishTime*/);
- virtual void didFail(ResourceHandle*, const ResourceError&);
- virtual void wasBlocked(ResourceHandle*);
- virtual void cannotShowURL(ResourceHandle*);
</del><ins>+#if USE(SOUP)
+ char* getOrCreateReadBuffer(size_t requestedSize, size_t& actualSize) override;
+#endif
+ void willSendRequest(ResourceHandle*, ResourceRequest&, const ResourceResponse&) override;
+ void didReceiveResponse(ResourceHandle*, const ResourceResponse&) override;
+ void didReceiveData(ResourceHandle*, const char*, unsigned, int) override;
+ void didReceiveBuffer(ResourceHandle*, PassRefPtr<SharedBuffer>, int encodedLength) override;
+ void didFinishLoading(ResourceHandle*, double /*finishTime*/) override;
+ void didFail(ResourceHandle*, const ResourceError&) override;
+ void wasBlocked(ResourceHandle*) override;
+ void cannotShowURL(ResourceHandle*) override;
</ins><span class="cx">
</span><span class="cx"> RefPtr<ResourceHandle> m_resource;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextLineEndingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/LineEnding.cpp (197590 => 197591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/LineEnding.cpp 2016-03-04 22:18:10 UTC (rev 197590)
+++ trunk/Source/WebCore/platform/text/LineEnding.cpp 2016-03-04 23:28:22 UTC (rev 197591)
</span><span class="lines">@@ -52,14 +52,14 @@
</span><span class="cx"> }
</span><span class="cx"> virtual ~CStringBuffer() { }
</span><span class="cx">
</span><del>- virtual char* allocate(size_t size)
</del><ins>+ char* allocate(size_t size) override
</ins><span class="cx"> {
</span><span class="cx"> char* ptr;
</span><span class="cx"> m_buffer = CString::newUninitialized(size, ptr);
</span><span class="cx"> return ptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void copy(const CString& source)
</del><ins>+ void copy(const CString& source) override
</ins><span class="cx"> {
</span><span class="cx"> m_buffer = source;
</span><span class="cx"> }
</span><span class="lines">@@ -78,14 +78,14 @@
</span><span class="cx"> }
</span><span class="cx"> virtual ~VectorCharAppendBuffer() { }
</span><span class="cx">
</span><del>- virtual char* allocate(size_t size)
</del><ins>+ char* allocate(size_t size) override
</ins><span class="cx"> {
</span><span class="cx"> size_t oldSize = m_buffer.size();
</span><span class="cx"> m_buffer.grow(oldSize + size);
</span><span class="cx"> return m_buffer.data() + oldSize;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void copy(const CString& source)
</del><ins>+ void copy(const CString& source) override
</ins><span class="cx"> {
</span><span class="cx"> m_buffer.append(source.data(), source.length());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorexmlparserXMLDocumentParserLibxml2cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp (197590 => 197591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp 2016-03-04 22:18:10 UTC (rev 197590)
+++ trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp 2016-03-04 23:28:22 UTC (rev 197591)
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> xmlFree(attributes);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void call(XMLDocumentParser* parser)
</del><ins>+ void call(XMLDocumentParser* parser) override
</ins><span class="cx"> {
</span><span class="cx"> parser->startElementNs(xmlLocalName, xmlPrefix, xmlURI,
</span><span class="cx"> nb_namespaces, const_cast<const xmlChar**>(namespaces),
</span><span class="lines">@@ -245,7 +245,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct PendingEndElementNSCallback : public PendingCallback {
</span><del>- virtual void call(XMLDocumentParser* parser)
</del><ins>+ void call(XMLDocumentParser* parser) override
</ins><span class="cx"> {
</span><span class="cx"> parser->endElementNs();
</span><span class="cx"> }
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx"> xmlFree(s);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void call(XMLDocumentParser* parser)
</del><ins>+ void call(XMLDocumentParser* parser) override
</ins><span class="cx"> {
</span><span class="cx"> parser->characters(s, len);
</span><span class="cx"> }
</span><span class="lines">@@ -273,7 +273,7 @@
</span><span class="cx"> xmlFree(data);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void call(XMLDocumentParser* parser)
</del><ins>+ void call(XMLDocumentParser* parser) override
</ins><span class="cx"> {
</span><span class="cx"> parser->processingInstruction(target, data);
</span><span class="cx"> }
</span><span class="lines">@@ -288,7 +288,7 @@
</span><span class="cx"> xmlFree(s);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void call(XMLDocumentParser* parser)
</del><ins>+ void call(XMLDocumentParser* parser) override
</ins><span class="cx"> {
</span><span class="cx"> parser->cdataBlock(s, len);
</span><span class="cx"> }
</span><span class="lines">@@ -303,7 +303,7 @@
</span><span class="cx"> xmlFree(s);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void call(XMLDocumentParser* parser)
</del><ins>+ void call(XMLDocumentParser* parser) override
</ins><span class="cx"> {
</span><span class="cx"> parser->comment(s);
</span><span class="cx"> }
</span><span class="lines">@@ -319,7 +319,7 @@
</span><span class="cx"> xmlFree(systemID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void call(XMLDocumentParser* parser)
</del><ins>+ void call(XMLDocumentParser* parser) override
</ins><span class="cx"> {
</span><span class="cx"> parser->internalSubset(name, externalID, systemID);
</span><span class="cx"> }
</span><span class="lines">@@ -335,7 +335,7 @@
</span><span class="cx"> xmlFree(message);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void call(XMLDocumentParser* parser)
</del><ins>+ void call(XMLDocumentParser* parser) override
</ins><span class="cx"> {
</span><span class="cx"> parser->handleError(type, reinterpret_cast<char*>(message), TextPosition(lineNumber, columnNumber));
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>