Title: [150138] trunk/Source/WebCore
Revision
150138
Author
[email protected]
Date
2013-05-15 12:37:58 -0700 (Wed, 15 May 2013)

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

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (150137 => 150138)


--- trunk/Source/WebCore/ChangeLog	2013-05-15 19:37:07 UTC (rev 150137)
+++ trunk/Source/WebCore/ChangeLog	2013-05-15 19:37:58 UTC (rev 150138)
@@ -1,3 +1,15 @@
+2013-05-15  Darin Adler  <[email protected]>
+
+        [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  <[email protected]>
 
         Remove an overloaded strokeRect in <canvas>

Modified: trunk/Source/WebCore/WebCore.exp.in (150137 => 150138)


--- trunk/Source/WebCore/WebCore.exp.in	2013-05-15 19:37:07 UTC (rev 150137)
+++ trunk/Source/WebCore/WebCore.exp.in	2013-05-15 19:37:58 UTC (rev 150138)
@@ -1901,6 +1901,7 @@
 __ZN7WebCore7nsColorERKNS_5ColorE
 __ZN7WebCore8IntPointC1ERK8_NSPoint
 __ZN7WebCore8IntPointC1ERK7CGPoint
+__ZN7WebCore9ClipboardD1Ev
 __ZN7WebCore9FloatRectC1ERK7_NSRect
 __ZNK7WebCore10FloatPointcv8_NSPointEv
 __ZNK7WebCore14ScrollableArea18visibleContentRectENS0_36VisibleContentRectIncludesScrollbarsE

Modified: trunk/Source/WebCore/dom/Clipboard.h (150137 => 150138)


--- trunk/Source/WebCore/dom/Clipboard.h	2013-05-15 19:37:07 UTC (rev 150137)
+++ trunk/Source/WebCore/dom/Clipboard.h	2013-05-15 19:37:58 UTC (rev 150138)
@@ -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)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to