commit 46d4dda51d0207e46e218614c4074a60151715de
author darin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Wed May 15 19:37:58 2013
committer darin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Wed May 15 19:37:58 2013
tree 8bf439e98361660d987a940e5c2dd6569ffb3726
parent 3f634e92f557ecd80c64125342f4df3910d0ed38

[Mac] Make Clipboard class no longer polymorphic by removing the last virtual functions
https://bugs.webkit.org/show_bug.cgi?id=116166

Reviewed by Anders Carlsson.

* WebCore.exp.in: Add ~Clipboard since it's no longer a virtual function, but to the
non-iOS section, since iOS is still using the legacy version of Clipboard.

* dom/Clipboard.h: Mark items non-virtual, too. It's not implemented on Mac yet.

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

Source/WebCore/ChangeLog

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 87a603a..47e4a0f 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2013-05-15  Darin Adler  <darin@apple.com>
+
+        [Mac] Make Clipboard class no longer polymorphic by removing the last virtual functions
+        https://bugs.webkit.org/show_bug.cgi?id=116166
+
+        Reviewed by Anders Carlsson.
+
+        * WebCore.exp.in: Add ~Clipboard since it's no longer a virtual function, but to the
+        non-iOS section, since iOS is still using the legacy version of Clipboard.
+
+        * dom/Clipboard.h: Mark items non-virtual, too. It's not implemented on Mac yet.
+
 2013-05-15  Dongseong Hwang  <dongseong.hwang@intel.com>
 
         Remove an overloaded strokeRect in <canvas>

Source/WebCore/WebCore.exp.in

diff --git a/Source/WebCore/WebCore.exp.in b/Source/WebCore/WebCore.exp.in
index e5b36f8..6859ad5 100644
--- a/Source/WebCore/WebCore.exp.in
+++ b/Source/WebCore/WebCore.exp.in
@@ -1901,6 +1901,7 @@
 __ZN7WebCore7nsColorERKNS_5ColorE
 __ZN7WebCore8IntPointC1ERK8_NSPoint
 __ZN7WebCore8IntPointC1ERK7CGPoint
+__ZN7WebCore9ClipboardD1Ev
 __ZN7WebCore9FloatRectC1ERK7_NSRect
 __ZNK7WebCore10FloatPointcv8_NSPointEv
 __ZNK7WebCore14ScrollableArea18visibleContentRectENS0_36VisibleContentRectIncludesScrollbarsE

Source/WebCore/dom/Clipboard.h

diff --git a/Source/WebCore/dom/Clipboard.h b/Source/WebCore/dom/Clipboard.h
index dff3501..ac33cf5 100644
--- a/Source/WebCore/dom/Clipboard.h
+++ b/Source/WebCore/dom/Clipboard.h
@@ -69,7 +69,7 @@
         
         static PassRefPtr<Clipboard> create(ClipboardAccessPolicy, DragData*, Frame*);
 
-        virtual ~Clipboard();
+        LEGACY_VIRTUAL ~Clipboard();
 
         bool isForCopyAndPaste() const { return m_clipboardType == CopyAndPaste; }
         bool isForDragAndDrop() const { return m_clipboardType == DragAndDrop; }
@@ -124,7 +124,7 @@
         void setDragHasStarted() { m_dragStarted = true; }
 
 #if ENABLE(DATA_TRANSFER_ITEMS)
-        virtual PassRefPtr<DataTransferItemList> items() = 0;
+        LEGACY_VIRTUAL PassRefPtr<DataTransferItemList> items() = 0;
 #endif
         
 #if !USE(LEGACY_STYLE_ABSTRACT_CLIPBOARD_CLASS)