From dd8bb3de4f353a81954234999f1fea748aee2ea9 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Wed, 11 Aug 2010 14:44:44 +0100 Subject: Merge WebKit at r65072 : Initial merge by git. Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585 --- WebCore/platform/android/TemporaryLinkStubs.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'WebCore/platform/android/TemporaryLinkStubs.cpp') diff --git a/WebCore/platform/android/TemporaryLinkStubs.cpp b/WebCore/platform/android/TemporaryLinkStubs.cpp index 911d849..2cacef9 100644 --- a/WebCore/platform/android/TemporaryLinkStubs.cpp +++ b/WebCore/platform/android/TemporaryLinkStubs.cpp @@ -311,7 +311,17 @@ void* WebCore::Frame::dragImageForSelection() return 0; } +<<<<<<< HEAD void WebCore::Pasteboard::writeImage(WebCore::Node*, WebCore::KURL const&, WebCore::String const&) {} +======= + +WTF::String WebCore::MIMETypeRegistry::getMIMETypeForExtension(WTF::String const&) +{ + return WTF::String(); +} + +void WebCore::Pasteboard::writeImage(WebCore::Node*, WebCore::KURL const&, WTF::String const&) {} +>>>>>>> webkit.org at r65072 namespace WebCore { -- cgit v1.1 From 82eeb7b660065e6e990280e6563ca7eafe4be1cd Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Wed, 11 Aug 2010 15:21:07 +0100 Subject: Merge Webkit at r65072 : Fix conflicts. HTMLInputElement.cpp: New include. See http://trac.webkit.org/changeset/64616 TemporaryLinkStubs.cpp, Navigator.h: Relocation of string forwarders. See http://trac.webkit.org/changeset/65021 GraphicsContext.h, ImageSource.h: addition of WebCore namespace on Chromium's NativeImagePtr type. See http://trac.webkit.org/changeset/64584 Platform.h: Renaming of iPhone PLATFORM macros. See http://trac.webkit.org/changeset/64798 Change-Id: Ife412e30f733fe6bb66321a3600814d6499ddf70 --- WebCore/platform/android/TemporaryLinkStubs.cpp | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'WebCore/platform/android/TemporaryLinkStubs.cpp') diff --git a/WebCore/platform/android/TemporaryLinkStubs.cpp b/WebCore/platform/android/TemporaryLinkStubs.cpp index 2cacef9..bedb91b 100644 --- a/WebCore/platform/android/TemporaryLinkStubs.cpp +++ b/WebCore/platform/android/TemporaryLinkStubs.cpp @@ -311,17 +311,7 @@ void* WebCore::Frame::dragImageForSelection() return 0; } -<<<<<<< HEAD -void WebCore::Pasteboard::writeImage(WebCore::Node*, WebCore::KURL const&, WebCore::String const&) {} -======= - -WTF::String WebCore::MIMETypeRegistry::getMIMETypeForExtension(WTF::String const&) -{ - return WTF::String(); -} - void WebCore::Pasteboard::writeImage(WebCore::Node*, WebCore::KURL const&, WTF::String const&) {} ->>>>>>> webkit.org at r65072 namespace WebCore { -- cgit v1.1