diff options
author | Ben Murdoch <benm@google.com> | 2011-05-16 16:25:10 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:14 +0100 |
commit | ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb (patch) | |
tree | db769fadd053248f85db67434a5b275224defef7 /Source/WebCore/platform/chromium/WritableDataObject.cpp | |
parent | 52e2557aeb8477967e97fd24f20f8f407a10fa15 (diff) | |
download | external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.zip external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.gz external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.bz2 |
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
Diffstat (limited to 'Source/WebCore/platform/chromium/WritableDataObject.cpp')
-rw-r--r-- | Source/WebCore/platform/chromium/WritableDataObject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/platform/chromium/WritableDataObject.cpp b/Source/WebCore/platform/chromium/WritableDataObject.cpp index 7cbf42c..a1ac7d9 100644 --- a/Source/WebCore/platform/chromium/WritableDataObject.cpp +++ b/Source/WebCore/platform/chromium/WritableDataObject.cpp @@ -31,8 +31,8 @@ #include "config.h" #include "WritableDataObject.h" -#include "ChromiumBridge.h" #include "ClipboardMimeTypes.h" +#include "PlatformBridge.h" namespace WebCore { @@ -80,7 +80,7 @@ bool WritableDataObject::setData(const String& type, const String& data) // FIXME: This is currently unimplemented on the Chromium-side. This is // "okay" for now since the original implementation didn't support it // anyway. Going forward, this is something we'll need to fix though. - ChromiumBridge::clipboardWriteData(type, data, ""); + PlatformBridge::clipboardWriteData(type, data, ""); return true; } m_dataMap.set(type, data); |