Remove workaround for compilers not supporting deleted functions
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 17 Jan 2014 12:24:16 +0000 (12:24 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 17 Jan 2014 12:24:16 +0000 (12:24 +0000)
https://bugs.webkit.org/show_bug.cgi?id=127166

Patch by Peter Molnar <pmolnar.u-szeged@partner.samsung.com> on 2014-01-17
Reviewed by Andreas Kling.

Source/JavaScriptCore:

* inspector/InspectorAgentRegistry.h:

Source/WebCore:

* bindings/js/JSLazyEventListener.h:
* dom/ContainerNode.h:
* dom/Document.h:
* dom/Element.h:
* rendering/InlineFlowBox.h:
* rendering/InlineTextBox.h:
* rendering/RenderButton.h:
* rendering/RenderCombineText.h:
* rendering/RenderElement.h:
* rendering/RenderFieldset.h:
* rendering/RenderFileUploadControl.h:
* rendering/RenderFrame.h:
* rendering/RenderFrameBase.h:
* rendering/RenderFrameSet.h:
* rendering/RenderHTMLCanvas.h:
* rendering/RenderIFrame.h:
* rendering/RenderLineBreak.h:
* rendering/RenderListBox.h:
* rendering/RenderListMarker.h:
* rendering/RenderMedia.h:
* rendering/RenderMenuList.h:
* rendering/RenderSnapshottedPlugIn.h:
* rendering/RenderTableCell.h:
* rendering/RenderTableRow.h:
* rendering/RenderTableSection.h:
* rendering/RenderText.h:
* rendering/RenderTextControl.h:
* rendering/RenderTextControlMultiLine.h:
* rendering/RenderTextControlSingleLine.h:
* rendering/RenderVideo.h:
* rendering/RenderWidget.h:
* rendering/svg/RenderSVGBlock.h:
* rendering/svg/RenderSVGForeignObject.h:
* rendering/svg/RenderSVGImage.h:
* rendering/svg/RenderSVGInline.h:
* rendering/svg/RenderSVGRect.h:
* rendering/svg/RenderSVGResourceClipper.h:
* rendering/svg/RenderSVGResourceFilter.h:
* rendering/svg/RenderSVGResourceFilterPrimitive.h:
* rendering/svg/RenderSVGResourceGradient.h:
* rendering/svg/RenderSVGResourceLinearGradient.h:
* rendering/svg/RenderSVGResourceMarker.h:
* rendering/svg/RenderSVGResourceMasker.h:
* rendering/svg/RenderSVGResourcePattern.h:
* rendering/svg/RenderSVGResourceRadialGradient.h:
* rendering/svg/RenderSVGRoot.h:
* rendering/svg/RenderSVGShape.h:
* rendering/svg/RenderSVGTSpan.h:
* rendering/svg/RenderSVGText.h:
* rendering/svg/RenderSVGTextPath.h:
* rendering/svg/RenderSVGTransformableContainer.h:
* rendering/svg/RenderSVGViewportContainer.h:
* xml/XPathValue.h:

Source/WTF:

* wtf/Compiler.h:
* wtf/Noncopyable.h:
* wtf/PassRefPtr.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@162198 268f45cc-cd09-0410-ab3c-d52691b4dbfc

60 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/inspector/InspectorAgentRegistry.h
Source/WTF/ChangeLog
Source/WTF/wtf/Compiler.h
Source/WTF/wtf/Noncopyable.h
Source/WTF/wtf/PassRefPtr.h
Source/WebCore/ChangeLog
Source/WebCore/bindings/js/JSLazyEventListener.h
Source/WebCore/dom/ContainerNode.h
Source/WebCore/dom/Document.h
Source/WebCore/dom/Element.h
Source/WebCore/rendering/InlineFlowBox.h
Source/WebCore/rendering/InlineTextBox.h
Source/WebCore/rendering/RenderButton.h
Source/WebCore/rendering/RenderCombineText.h
Source/WebCore/rendering/RenderElement.h
Source/WebCore/rendering/RenderFieldset.h
Source/WebCore/rendering/RenderFileUploadControl.h
Source/WebCore/rendering/RenderFrame.h
Source/WebCore/rendering/RenderFrameBase.h
Source/WebCore/rendering/RenderFrameSet.h
Source/WebCore/rendering/RenderHTMLCanvas.h
Source/WebCore/rendering/RenderIFrame.h
Source/WebCore/rendering/RenderLineBreak.h
Source/WebCore/rendering/RenderListBox.h
Source/WebCore/rendering/RenderListMarker.h
Source/WebCore/rendering/RenderMedia.h
Source/WebCore/rendering/RenderMenuList.h
Source/WebCore/rendering/RenderSnapshottedPlugIn.h
Source/WebCore/rendering/RenderTableCell.h
Source/WebCore/rendering/RenderTableRow.h
Source/WebCore/rendering/RenderTableSection.h
Source/WebCore/rendering/RenderText.h
Source/WebCore/rendering/RenderTextControl.h
Source/WebCore/rendering/RenderTextControlMultiLine.h
Source/WebCore/rendering/RenderTextControlSingleLine.h
Source/WebCore/rendering/RenderVideo.h
Source/WebCore/rendering/RenderWidget.h
Source/WebCore/rendering/svg/RenderSVGBlock.h
Source/WebCore/rendering/svg/RenderSVGForeignObject.h
Source/WebCore/rendering/svg/RenderSVGImage.h
Source/WebCore/rendering/svg/RenderSVGInline.h
Source/WebCore/rendering/svg/RenderSVGRect.h
Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
Source/WebCore/rendering/svg/RenderSVGResourceFilter.h
Source/WebCore/rendering/svg/RenderSVGResourceFilterPrimitive.h
Source/WebCore/rendering/svg/RenderSVGResourceGradient.h
Source/WebCore/rendering/svg/RenderSVGResourceLinearGradient.h
Source/WebCore/rendering/svg/RenderSVGResourceMarker.h
Source/WebCore/rendering/svg/RenderSVGResourceMasker.h
Source/WebCore/rendering/svg/RenderSVGResourcePattern.h
Source/WebCore/rendering/svg/RenderSVGResourceRadialGradient.h
Source/WebCore/rendering/svg/RenderSVGRoot.h
Source/WebCore/rendering/svg/RenderSVGShape.h
Source/WebCore/rendering/svg/RenderSVGTSpan.h
Source/WebCore/rendering/svg/RenderSVGText.h
Source/WebCore/rendering/svg/RenderSVGTextPath.h
Source/WebCore/rendering/svg/RenderSVGTransformableContainer.h
Source/WebCore/rendering/svg/RenderSVGViewportContainer.h
Source/WebCore/xml/XPathValue.h

index 56e0421..f7f9a51 100644 (file)
@@ -1,3 +1,12 @@
+2014-01-17  Peter Molnar  <pmolnar.u-szeged@partner.samsung.com>
+
+        Remove workaround for compilers not supporting deleted functions
+        https://bugs.webkit.org/show_bug.cgi?id=127166
+
+        Reviewed by Andreas Kling.
+
+        * inspector/InspectorAgentRegistry.h:
+
 2014-01-17  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r162185, r162186, and r162187.
index 7c1095a..2e89039 100644 (file)
@@ -48,8 +48,8 @@ public:
 private:
     // These are declared here to avoid MSVC from trying to create default iplementations which would
     // involve generating a copy constructor and copy assignment operator for the Vector of std::unique_ptrs.
-    InspectorAgentRegistry(const InspectorAgentRegistry&) WTF_DELETED_FUNCTION;
-    InspectorAgentRegistry& operator=(const InspectorAgentRegistry&) WTF_DELETED_FUNCTION;
+    InspectorAgentRegistry(const InspectorAgentRegistry&) = delete;
+    InspectorAgentRegistry& operator=(const InspectorAgentRegistry&) = delete;
 
     Vector<std::unique_ptr<InspectorAgentBase>> m_agents;
 };
index 64f1324..e03153e 100644 (file)
@@ -1,3 +1,14 @@
+2014-01-17  Peter Molnar  <pmolnar.u-szeged@partner.samsung.com>
+
+        Remove workaround for compilers not supporting deleted functions
+        https://bugs.webkit.org/show_bug.cgi?id=127166
+
+        Reviewed by Andreas Kling.
+
+        * wtf/Compiler.h:
+        * wtf/Noncopyable.h:
+        * wtf/PassRefPtr.h:
+
 2014-01-16  Benjamin Poulain  <bpoulain@apple.com>
 
         Remove Nix from WTF
index d11830c..d800e74 100644 (file)
 #define WARN_UNUSED_RETURN
 #endif
 
-#if COMPILER_SUPPORTS(CXX_DELETED_FUNCTIONS)
-#define WTF_DELETED_FUNCTION = delete
-#else
-#define WTF_DELETED_FUNCTION
-#endif
 
 /* REFERENCED_FROM_ASM */
 
index c64cf63..9ea5ae6 100644 (file)
@@ -25,7 +25,7 @@
 
 #define WTF_MAKE_NONCOPYABLE(ClassName) \
     private: \
-        ClassName(const ClassName&) WTF_DELETED_FUNCTION; \
-        ClassName& operator=(const ClassName&) WTF_DELETED_FUNCTION; \
+        ClassName(const ClassName&) = delete; \
+        ClassName& operator=(const ClassName&) = delete; \
 
 #endif // WTF_Noncopyable_h
index 616227d..6292446 100644 (file)
@@ -70,7 +70,7 @@ namespace WTF {
         friend PassRefPtr adoptRef<T>(T*);
 
     private:
-        PassRefPtr& operator=(const PassRefPtr&) WTF_DELETED_FUNCTION;
+        PassRefPtr& operator=(const PassRefPtr&) = delete;
 
         enum AdoptTag { Adopt };
         PassRefPtr(T* ptr, AdoptTag) : m_ptr(ptr) { }
index a9fcc01..3f42153 100644 (file)
@@ -1,3 +1,64 @@
+2014-01-17  Peter Molnar  <pmolnar.u-szeged@partner.samsung.com>
+
+        Remove workaround for compilers not supporting deleted functions
+        https://bugs.webkit.org/show_bug.cgi?id=127166
+
+        Reviewed by Andreas Kling.
+
+        * bindings/js/JSLazyEventListener.h:
+        * dom/ContainerNode.h:
+        * dom/Document.h:
+        * dom/Element.h:
+        * rendering/InlineFlowBox.h:
+        * rendering/InlineTextBox.h:
+        * rendering/RenderButton.h:
+        * rendering/RenderCombineText.h:
+        * rendering/RenderElement.h:
+        * rendering/RenderFieldset.h:
+        * rendering/RenderFileUploadControl.h:
+        * rendering/RenderFrame.h:
+        * rendering/RenderFrameBase.h:
+        * rendering/RenderFrameSet.h:
+        * rendering/RenderHTMLCanvas.h:
+        * rendering/RenderIFrame.h:
+        * rendering/RenderLineBreak.h:
+        * rendering/RenderListBox.h:
+        * rendering/RenderListMarker.h:
+        * rendering/RenderMedia.h:
+        * rendering/RenderMenuList.h:
+        * rendering/RenderSnapshottedPlugIn.h:
+        * rendering/RenderTableCell.h:
+        * rendering/RenderTableRow.h:
+        * rendering/RenderTableSection.h:
+        * rendering/RenderText.h:
+        * rendering/RenderTextControl.h:
+        * rendering/RenderTextControlMultiLine.h:
+        * rendering/RenderTextControlSingleLine.h:
+        * rendering/RenderVideo.h:
+        * rendering/RenderWidget.h:
+        * rendering/svg/RenderSVGBlock.h:
+        * rendering/svg/RenderSVGForeignObject.h:
+        * rendering/svg/RenderSVGImage.h:
+        * rendering/svg/RenderSVGInline.h:
+        * rendering/svg/RenderSVGRect.h:
+        * rendering/svg/RenderSVGResourceClipper.h:
+        * rendering/svg/RenderSVGResourceFilter.h:
+        * rendering/svg/RenderSVGResourceFilterPrimitive.h:
+        * rendering/svg/RenderSVGResourceGradient.h:
+        * rendering/svg/RenderSVGResourceLinearGradient.h:
+        * rendering/svg/RenderSVGResourceMarker.h:
+        * rendering/svg/RenderSVGResourceMasker.h:
+        * rendering/svg/RenderSVGResourcePattern.h:
+        * rendering/svg/RenderSVGResourceRadialGradient.h:
+        * rendering/svg/RenderSVGRoot.h:
+        * rendering/svg/RenderSVGShape.h:
+        * rendering/svg/RenderSVGTSpan.h:
+        * rendering/svg/RenderSVGText.h:
+        * rendering/svg/RenderSVGTextPath.h:
+        * rendering/svg/RenderSVGTransformableContainer.h:
+        * rendering/svg/RenderSVGViewportContainer.h:
+        * xml/XPathValue.h:
+
 2014-01-17  Zan Dobersek  <zdobersek@igalia.com>
 
         [ATK] Modernize the for loops in ATK AX code
index 2208914..3190017 100644 (file)
@@ -43,7 +43,7 @@ namespace WebCore {
         virtual JSC::JSObject* initializeJSFunction(ScriptExecutionContext*) const override;
         virtual bool wasCreatedFromMarkup() const override { return true; }
 
-        static void create() WTF_DELETED_FUNCTION;
+        static void create() = delete;
 
         mutable String m_functionName;
         mutable String m_eventParameterName;
index 3d51d8b..491196b 100644 (file)
@@ -169,7 +169,7 @@ private:
 
     void updateTreeAfterInsertion(Node& child);
 
-    bool isContainerNode() const WTF_DELETED_FUNCTION;
+    bool isContainerNode() const = delete;
 
     Node* m_firstChild;
     Node* m_lastChild;
index 5707913..3ae7f49 100644 (file)
@@ -1235,8 +1235,8 @@ private:
 
     void commonTeardown();
 
-    RenderObject* renderer() const WTF_DELETED_FUNCTION;
-    void setRenderer(RenderObject*) WTF_DELETED_FUNCTION;
+    RenderObject* renderer() const = delete;
+    void setRenderer(RenderObject*) = delete;
 
     void createRenderTree();
     void detachParser();
index c3866af..a65c480 100644 (file)
@@ -674,7 +674,7 @@ private:
     bool isJavaScriptURLAttribute(const Attribute&) const;
 
     // Anyone thinking of using this should call document instead of ownerDocument.
-    void ownerDocument() const WTF_DELETED_FUNCTION;
+    void ownerDocument() const = delete;
 
     QualifiedName m_tagName;
     RefPtr<ElementData> m_elementData;
index ebf4569..1665345 100644 (file)
@@ -296,7 +296,7 @@ public:
 
 private:
     virtual bool isInlineFlowBox() const override final { return true; }
-    void boxModelObject() const WTF_DELETED_FUNCTION;
+    void boxModelObject() const = delete;
 
     void addBoxShadowVisualOverflow(LayoutRect& logicalVisualOverflow);
     void addBorderOutsetVisualOverflow(LayoutRect& logicalVisualOverflow);
index fe5735b..fb2fffd 100644 (file)
@@ -182,7 +182,7 @@ private:
             | (expansion() && nextLeafChild() ? TextRun::AllowTrailingExpansion : TextRun::ForbidTrailingExpansion);
     }
 
-    void behavesLikeText() const WTF_DELETED_FUNCTION;
+    void behavesLikeText() const = delete;
 
     InlineTextBox* m_prevTextBox; // The previous box that also uses our RenderObject
     InlineTextBox* m_nextTextBox; // The next box that also uses our RenderObject
index f718d18..17c1761 100644 (file)
@@ -62,7 +62,7 @@ public:
 #endif
 
 private:
-    void element() const WTF_DELETED_FUNCTION;
+    void element() const = delete;
 
     virtual const char* renderName() const override { return "RenderButton"; }
     virtual bool isRenderButton() const override { return true; }
index 7814ec8..184190f 100644 (file)
@@ -43,7 +43,7 @@ public:
     const Font& textCombineFont() const { return m_combineFontStyle->font(); }
 
 private:
-    void node() const WTF_DELETED_FUNCTION;
+    void node() const = delete;
 
     virtual bool isCombineText() const { return true; }
     virtual float width(unsigned from, unsigned length, const Font&, float xPosition, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOverflow* = 0) const;
index 4855b3d..31dc734 100644 (file)
@@ -177,11 +177,11 @@ protected:
     bool renderInlineAlwaysCreatesLineBoxes() const { return m_renderInlineAlwaysCreatesLineBoxes; }
 
 private:
-    void node() const WTF_DELETED_FUNCTION;
-    void nonPseudoNode() const WTF_DELETED_FUNCTION;
-    void generatingNode() const WTF_DELETED_FUNCTION;
-    void isText() const WTF_DELETED_FUNCTION;
-    void isRenderElement() const WTF_DELETED_FUNCTION;
+    void node() const = delete;
+    void nonPseudoNode() const = delete;
+    void generatingNode() const = delete;
+    void isText() const = delete;
+    void isRenderElement() const = delete;
 
     virtual RenderObject* firstChildSlow() const override final { return firstChild(); }
     virtual RenderObject* lastChildSlow() const override final { return lastChild(); }
index 7e61ebb..a405aa4 100644 (file)
@@ -41,7 +41,7 @@ public:
     HTMLFieldSetElement& fieldSetElement() const { return toHTMLFieldSetElement(nodeForNonAnonymous()); }
 
 private:
-    void element() const WTF_DELETED_FUNCTION;
+    void element() const = delete;
 
     virtual const char* renderName() const override { return "RenderFieldSet"; }
     virtual bool isFieldset() const override { return true; }
index bb5aa9f..b13fb81 100644 (file)
@@ -42,7 +42,7 @@ public:
     HTMLInputElement& inputElement() const;
     
 private:
-    void element() const WTF_DELETED_FUNCTION;
+    void element() const = delete;
 
     virtual bool isFileUploadControl() const override { return true; }
 
index 3bca65f..03f5a4f 100644 (file)
@@ -38,7 +38,7 @@ public:
     FrameEdgeInfo edgeInfo() const;
 
 private:
-    void frameOwnerElement() const WTF_DELETED_FUNCTION;
+    void frameOwnerElement() const = delete;
 
     virtual const char* renderName() const override { return "RenderFrame"; }
     virtual bool isFrame() const override { return true; }
index 3111cc9..d52cab1 100644 (file)
@@ -44,7 +44,7 @@ public:
     void layoutWithFlattening(bool fixedWidth, bool fixedHeight);
 
 private:
-    void widget() const WTF_DELETED_FUNCTION;
+    void widget() const = delete;
 };
 
 } // namespace WebCore
index fd1c131..a1838e7 100644 (file)
@@ -73,7 +73,7 @@ public:
     void notifyFrameEdgeInfoChanged();
 
 private:
-    void element() const WTF_DELETED_FUNCTION;
+    void element() const = delete;
 
     static const int noSplit = -1;
 
index e6fe5f6..607ffcc 100644 (file)
@@ -41,7 +41,7 @@ public:
     void canvasSizeChanged();
 
 private:
-    void element() const WTF_DELETED_FUNCTION;
+    void element() const = delete;
     virtual bool requiresLayer() const override;
     virtual bool isCanvas() const override { return true; }
     virtual const char* renderName() const override { return "RenderHTMLCanvas"; }
index a44b9b5..d6478be 100644 (file)
@@ -42,7 +42,7 @@ public:
     bool isSeamless() const;
 
 private:
-    void frameOwnerElement() const WTF_DELETED_FUNCTION;
+    void frameOwnerElement() const = delete;
 
     virtual LayoutUnit minPreferredLogicalWidth() const override;
     virtual LayoutUnit maxPreferredLogicalWidth() const override;
index a6d1d0b..55f4f59 100644 (file)
@@ -53,7 +53,7 @@ public:
     virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const override;
 
 private:
-    void node() const WTF_DELETED_FUNCTION;
+    void node() const = delete;
 
     virtual bool canHaveChildren() const override { return false; }
     virtual void paint(PaintInfo&, const LayoutPoint&) override final { }
index 87e8856..436cace 100644 (file)
@@ -60,7 +60,7 @@ public:
     int size() const;
 
 private:
-    void element() const WTF_DELETED_FUNCTION;
+    void element() const = delete;
 
     virtual const char* renderName() const override { return "RenderListBox"; }
 
index 6ab6dc3..143764a 100644 (file)
@@ -46,7 +46,7 @@ public:
     void updateMarginsAndContent();
 
 private:
-    void element() const WTF_DELETED_FUNCTION;
+    void element() const = delete;
 
     virtual const char* renderName() const override { return "RenderListMarker"; }
     virtual void computePreferredLogicalWidths() override;
index ee74b77..8ef887e 100644 (file)
@@ -45,7 +45,7 @@ protected:
     virtual void layout();
 
 private:
-    void element() const WTF_DELETED_FUNCTION;
+    void element() const = delete;
 
     virtual bool canHaveChildren() const override final { return true; }
 
index 5cf55d6..bba1501 100644 (file)
@@ -61,7 +61,7 @@ public:
     String text() const;
 
 private:
-    void element() const WTF_DELETED_FUNCTION;
+    void element() const = delete;
 
     virtual bool isMenuList() const override { return true; }
 
index dc0b3d8..4aa3ff3 100644 (file)
@@ -46,7 +46,7 @@ public:
     void handleEvent(Event*);
 
 private:
-    void frameOwnerElement() const WTF_DELETED_FUNCTION;
+    void frameOwnerElement() const = delete;
     virtual const char* renderName() const { return "RenderSnapshottedPlugIn"; }
 
     virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const override final;
index b7c9cec..458e9d4 100644 (file)
@@ -284,8 +284,8 @@ private:
     unsigned parseRowSpanFromDOM() const;
     unsigned parseColSpanFromDOM() const;
 
-    void nextSibling() const WTF_DELETED_FUNCTION;
-    void previousSibling() const WTF_DELETED_FUNCTION;
+    void nextSibling() const = delete;
+    void previousSibling() const = delete;
 
     // Note MSVC will only pack members if they have identical types, hence we use unsigned instead of bool here.
     unsigned m_column : 29;
index b87f511..3de96a0 100644 (file)
@@ -111,10 +111,10 @@ private:
 
     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
 
-    void firstChild() const WTF_DELETED_FUNCTION;
-    void lastChild() const WTF_DELETED_FUNCTION;
-    void nextSibling() const WTF_DELETED_FUNCTION;
-    void previousSibling() const WTF_DELETED_FUNCTION;
+    void firstChild() const = delete;
+    void lastChild() const = delete;
+    void nextSibling() const = delete;
+    void previousSibling() const = delete;
 
     unsigned m_rowIndex : 31;
 };
index 014bb97..5ad1187 100644 (file)
@@ -279,8 +279,8 @@ private:
 
     void setLogicalPositionForCell(RenderTableCell*, unsigned effectiveColumn) const;
 
-    void firstChild() const WTF_DELETED_FUNCTION;
-    void lastChild() const WTF_DELETED_FUNCTION;
+    void firstChild() const = delete;
+    void lastChild() const = delete;
 
     Vector<RowStruct> m_grid;
     Vector<int> m_rowPos;
index 5e198d7..3abf1ac 100644 (file)
@@ -185,7 +185,7 @@ private:
 
     void secureText(UChar mask);
 
-    void node() const WTF_DELETED_FUNCTION;
+    void node() const = delete;
 
     // We put the bitfield first to minimize padding on 64-bit.
     bool m_hasBreakableChar : 1; // Whether or not we can be broken into multiple lines.
index fd51c1d..6f9a408 100644 (file)
@@ -72,7 +72,7 @@ protected:
     virtual RenderObject* layoutSpecialExcludedChild(bool relayoutChildren) override;
 
 private:
-    void element() const WTF_DELETED_FUNCTION;
+    void element() const = delete;
 
     virtual const char* renderName() const override { return "RenderTextControl"; }
     virtual bool isTextControl() const override final { return true; }
index 24e51f9..42ff331 100644 (file)
@@ -36,7 +36,7 @@ public:
     HTMLTextAreaElement& textAreaElement() const;
 
 private:
-    void element() const WTF_DELETED_FUNCTION;
+    void element() const = delete;
 
     virtual bool isTextArea() const { return true; }
 
index d830ab1..9f145c7 100644 (file)
@@ -48,7 +48,7 @@ protected:
     HTMLInputElement& inputElement() const;
 
 private:
-    void textFormControlElement() const WTF_DELETED_FUNCTION;
+    void textFormControlElement() const = delete;
 
     virtual bool hasControlClip() const override;
     virtual LayoutRect controlClipRect(const LayoutPoint&) const override;
index bdc56a0..1643054 100644 (file)
@@ -55,7 +55,7 @@ public:
     virtual bool shouldDisplayVideo() const;
 
 private:
-    void mediaElement() const WTF_DELETED_FUNCTION;
+    void mediaElement() const = delete;
 
     virtual void updateFromElement();
 
index 07180cf..afcef3a 100644 (file)
@@ -89,7 +89,7 @@ protected:
 #endif
 
 private:
-    void element() const WTF_DELETED_FUNCTION;
+    void element() const = delete;
 
     virtual bool isWidget() const override final { return true; }
 
index 9264eef..23efff5 100644 (file)
@@ -40,7 +40,7 @@ protected:
     virtual void willBeDestroyed() override;
 
 private:
-    void element() const WTF_DELETED_FUNCTION;
+    void element() const = delete;
 
     virtual void updateFromStyle() override final;
 
index e48bdef..b75c373 100644 (file)
@@ -59,7 +59,7 @@ public:
     virtual void setNeedsTransformUpdate() { m_needsTransformUpdate = true; }
 
 private:
-    void graphicsElement() const WTF_DELETED_FUNCTION;
+    void graphicsElement() const = delete;
     virtual const char* renderName() const override { return "RenderSVGForeignObject"; }
 
     virtual void updateLogicalWidth() override;
index 6e1aeaa..6e696a7 100644 (file)
@@ -54,7 +54,7 @@ public:
     void paintForeground(PaintInfo&);
 
 private:
-    void element() const WTF_DELETED_FUNCTION;
+    void element() const = delete;
 
     virtual const char* renderName() const { return "RenderSVGImage"; }
     virtual bool isSVGImage() const override { return true; }
index c21623e..f6dee80 100644 (file)
@@ -34,7 +34,7 @@ public:
     SVGGraphicsElement& graphicsElement() const { return toSVGGraphicsElement(nodeForNonAnonymous()); }
 
 private:
-    void element() const WTF_DELETED_FUNCTION;
+    void element() const = delete;
 
     virtual const char* renderName() const override { return "RenderSVGInline"; }
     virtual bool requiresLayer() const override final { return false; }
index 1282f46..c305726 100644 (file)
@@ -42,7 +42,7 @@ public:
     SVGRectElement& rectElement() const;
 
 private:
-    void graphicsElement() const WTF_DELETED_FUNCTION;
+    void graphicsElement() const = delete;
 
     virtual const char* renderName() const { return "RenderSVGRect"; }
 
index d711cbc..31c64b8 100644 (file)
@@ -63,7 +63,7 @@ public:
 
     static RenderSVGResourceType s_resourceType;
 private:
-    void element() const WTF_DELETED_FUNCTION;
+    void element() const = delete;
 
     virtual const char* renderName() const override { return "RenderSVGResourceClipper"; }
 
index 32ecf44..97e6fdb 100644 (file)
@@ -88,7 +88,7 @@ public:
 
     FloatRect drawingRegion(RenderObject*) const;
 private:
-    void element() const WTF_DELETED_FUNCTION;
+    void element() const = delete;
 
     virtual const char* renderName() const override { return "RenderSVGResourceFilter"; }
     virtual bool isSVGResourceFilter() const override { return true; }
index 7c52306..f67d61a 100644 (file)
@@ -57,7 +57,7 @@ public:
         static_cast<RenderSVGResourceFilter*>(filter)->primitiveAttributeChanged(this, attribute);
     }
 private:
-    void element() const WTF_DELETED_FUNCTION;
+    void element() const = delete;
 };
 
 } // namespace WebCore
index e28209f..c37fc7a 100644 (file)
@@ -55,7 +55,7 @@ public:
 protected:
     RenderSVGResourceGradient(SVGGradientElement&, PassRef<RenderStyle>);
 
-    void element() const WTF_DELETED_FUNCTION;
+    void element() const = delete;
 
     void addStops(GradientData*, const Vector<Gradient::ColorStop>&) const;
 
index 3271b01..eaec659 100644 (file)
@@ -47,7 +47,7 @@ public:
     FloatPoint endPoint(const LinearGradientAttributes&) const;
 
 private:
-    void gradientElement() const WTF_DELETED_FUNCTION;
+    void gradientElement() const = delete;
 
     virtual const char* renderName() const override { return "RenderSVGResourceLinearGradient"; }
 
index b6d1814..442cc60 100644 (file)
@@ -64,7 +64,7 @@ public:
     static RenderSVGResourceType s_resourceType;
 
 private:
-    void element() const WTF_DELETED_FUNCTION;
+    void element() const = delete;
 
     virtual const char* renderName() const override { return "RenderSVGResourceMarker"; }
 
index 338986a..ecae433 100644 (file)
@@ -55,7 +55,7 @@ public:
     static RenderSVGResourceType s_resourceType;
 
 private:
-    void element() const WTF_DELETED_FUNCTION;
+    void element() const = delete;
 
     virtual const char* renderName() const override { return "RenderSVGResourceMasker"; }
 
index 7c54974..9eebeef 100644 (file)
@@ -56,7 +56,7 @@ public:
     static RenderSVGResourceType s_resourceType;
 
 private:
-    void element() const WTF_DELETED_FUNCTION;
+    void element() const = delete;
     virtual const char* renderName() const override { return "RenderSVGResourcePattern"; }
 
     bool buildTileImageTransform(RenderObject*, const PatternAttributes&, const SVGPatternElement&, FloatRect& patternBoundaries, AffineTransform& tileImageTransform) const;
index 8d2539d..f1e61a4 100644 (file)
@@ -50,7 +50,7 @@ public:
     float focalRadius(const RadialGradientAttributes&) const;
 
 private:
-    void gradientElement() const WTF_DELETED_FUNCTION;
+    void gradientElement() const = delete;
 
     virtual const char* renderName() const override { return "RenderSVGResourceRadialGradient"; }
     virtual bool collectGradientAttributes() override;
index 9cf41e9..edebf1c 100644 (file)
@@ -69,7 +69,7 @@ public:
     void setHasSVGShadow(bool hasShadow) { m_hasSVGShadow = hasShadow; }
 
 private:
-    void element() const WTF_DELETED_FUNCTION;
+    void element() const = delete;
 
     virtual bool isSVGRoot() const override { return true; }
     virtual const char* renderName() const override { return "RenderSVGRoot"; }
index 71c36b2..e27b4b4 100644 (file)
@@ -67,7 +67,7 @@ public:
     }
 
 protected:
-    void element() const WTF_DELETED_FUNCTION;
+    void element() const = delete;
 
     virtual void updateShapeFromElement();
     virtual bool isEmpty() const override;
index ef4d197..bdd33bb 100644 (file)
@@ -37,7 +37,7 @@ public:
     SVGTextPositioningElement& textPositioningElement() const { return static_cast<SVGTextPositioningElement&>(RenderSVGInline::graphicsElement()); }
 
 private:
-    void graphicsElement() const WTF_DELETED_FUNCTION;
+    void graphicsElement() const = delete;
     virtual const char* renderName() const { return "RenderSVGTSpan"; }
 };
 }
index cbce883..93ac442 100644 (file)
@@ -60,7 +60,7 @@ public:
     void subtreeTextDidChange(RenderSVGInlineText*);
 
 private:
-    void graphicsElement() const WTF_DELETED_FUNCTION;
+    void graphicsElement() const = delete;
 
     virtual const char* renderName() const { return "RenderSVGText"; }
     virtual bool isSVGText() const { return true; }
index 19f0891..e7e11ad 100644 (file)
@@ -38,7 +38,7 @@ public:
     bool stretchMethod() const;
 
 private:
-    void graphicsElement() const WTF_DELETED_FUNCTION;
+    void graphicsElement() const = delete;
 
     virtual bool isSVGTextPath() const override { return true; }
     virtual const char* renderName() const override { return "RenderSVGTextPath"; }
index f82aed3..d97eafd 100644 (file)
@@ -39,7 +39,7 @@ public:
     virtual bool didTransformToRootUpdate() { return m_didTransformToRootUpdate; }
 
 private:
-    void element() const WTF_DELETED_FUNCTION;
+    void element() const = delete;
     virtual bool calculateLocalTransform();
     virtual AffineTransform localTransform() const { return m_localTransform; }
 
index f23c246..182431e 100644 (file)
@@ -47,7 +47,7 @@ public:
     virtual void paint(PaintInfo&, const LayoutPoint&) override;
 
 private:
-    void element() const WTF_DELETED_FUNCTION;
+    void element() const = delete;
 
     virtual bool isSVGViewportContainer() const { return true; }
     virtual const char* renderName() const { return "RenderSVGViewportContainer"; }
index 1deec33..ff80e1c 100644 (file)
@@ -65,7 +65,7 @@ namespace WebCore {
 
         private:
             // This constructor creates ambiguity so that we don't accidentally call the boolean overload for pointer types.
-            Value(void*) WTF_DELETED_FUNCTION;
+            Value(void*) = delete;
 
             struct Data : public RefCounted<Data> {
                 static PassRefPtr<Data> create() { return adoptRef(new Data); }