Changeset 150138 in webkit

Timestamp:

May 15, 2013 12:37:58 PM (11 years ago)

Author:

Darin Adler

Message:

[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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.exp.in (modified) (1 diff)
• dom/Clipboard.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -1902 +1902 @@
 __ZN7WebCore8IntPointC1ERK8_NSPoint
 __ZN7WebCore8IntPointC1ERK7CGPoint
+__ZN7WebCore9ClipboardD1Ev
 __ZN7WebCore9FloatRectC1ERK7_NSRect
 __ZNK7WebCore10FloatPointcv8_NSPointEv

trunk/Source/WebCore/dom/Clipboard.h

@@ -70 +70 @@
         static PassRefPtr<Clipboard> create(ClipboardAccessPolicy, DragData*, Frame*);
 
-        virtual ~Clipboard();
+        LEGACY_VIRTUAL ~Clipboard();
 
         bool isForCopyAndPaste() const { return m_clipboardType == CopyAndPaste; }
@@ -125 +125 @@
 
 #if ENABLE(DATA_TRANSFER_ITEMS)
-        virtual PassRefPtr<DataTransferItemList> items() = 0;
+        LEGACY_VIRTUAL PassRefPtr<DataTransferItemList> items() = 0;
 #endif