Title: [150141] trunk/Source/WebCore
- Revision
- 150141
- Author
- [email protected]
- Date
- 2013-05-15 13:20:02 -0700 (Wed, 15 May 2013)
Log Message
Try to fix iOS build.
* platform/Pasteboard.h: Fix #if so that we don't try to compile pasteboard name code
on iOS.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (150140 => 150141)
--- trunk/Source/WebCore/ChangeLog 2013-05-15 19:47:47 UTC (rev 150140)
+++ trunk/Source/WebCore/ChangeLog 2013-05-15 20:20:02 UTC (rev 150141)
@@ -1,3 +1,10 @@
+2013-05-15 Darin Adler <[email protected]>
+
+ Try to fix iOS build.
+
+ * platform/Pasteboard.h: Fix #if so that we don't try to compile pasteboard name code
+ on iOS.
+
2013-05-13 Anders Carlsson <[email protected]>
Frame::editor() should return a reference
Modified: trunk/Source/WebCore/platform/Pasteboard.h (150140 => 150141)
--- trunk/Source/WebCore/platform/Pasteboard.h 2013-05-15 19:47:47 UTC (rev 150140)
+++ trunk/Source/WebCore/platform/Pasteboard.h 2013-05-15 20:20:02 UTC (rev 150141)
@@ -80,17 +80,20 @@
CannotSmartReplace
};
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) && !PLATFORM(IOS)
static PassOwnPtr<Pasteboard> create(const String& pasteboardName);
String name() const { return m_pasteboardName; }
// This is required to support OS X services.
void writeSelectionForTypes(const Vector<String>& pasteboardTypes, bool canSmartCopyOrDelete, Frame*, ShouldSerializeSelectedTextForClipboard);
explicit Pasteboard(const String& pasteboardName);
- static String getStringSelection(Frame*, ShouldSerializeSelectedTextForClipboard);
static PassRefPtr<SharedBuffer> getDataSelection(Frame*, const String& pasteboardType);
#endif
-
+
+#if PLATFORM(MAC)
+ static String getStringSelection(Frame*, ShouldSerializeSelectedTextForClipboard);
+#endif
+
static Pasteboard* generalPasteboard();
bool hasData();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
