Title: [161718] trunk/Source/WebCore
- Revision
- 161718
- Author
- [email protected]
- Date
- 2014-01-10 19:46:20 -0800 (Fri, 10 Jan 2014)
Log Message
Fix DragData.o for iOS. Unreviewed build fix.
String m_pasteboardName is unused on iOS, so ifdef it out.
* platform/DragData.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161717 => 161718)
--- trunk/Source/WebCore/ChangeLog 2014-01-11 03:32:51 UTC (rev 161717)
+++ trunk/Source/WebCore/ChangeLog 2014-01-11 03:46:20 UTC (rev 161718)
@@ -1,5 +1,13 @@
2014-01-10 Joseph Pecoraro <[email protected]>
+ Fix DragData.o for iOS. Unreviewed build fix.
+
+ String m_pasteboardName is unused on iOS, so ifdef it out.
+
+ * platform/DragData.h:
+
+2014-01-10 Joseph Pecoraro <[email protected]>
+
Fix FrameIOS.o for iOS. Unreviewed build fix.
Remove stale include to file that no longer exists. It was not needed.
Modified: trunk/Source/WebCore/platform/DragData.h (161717 => 161718)
--- trunk/Source/WebCore/platform/DragData.h 2014-01-11 03:32:51 UTC (rev 161717)
+++ trunk/Source/WebCore/platform/DragData.h 2014-01-11 03:46:20 UTC (rev 161718)
@@ -20,7 +20,7 @@
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef DragData_h
@@ -109,7 +109,7 @@
bool containsFiles() const;
unsigned numberOfFiles() const;
int modifierKeyState() const;
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) && !PLATFORM(IOS)
const String& pasteboardName() const { return m_pasteboardName; }
#endif
@@ -135,7 +135,7 @@
DragDataRef m_platformDragData;
DragOperation m_draggingSourceOperationMask;
DragApplicationFlags m_applicationFlags;
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) && !PLATFORM(IOS)
String m_pasteboardName;
#endif
#if PLATFORM(WIN)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
