diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-13 16:23:25 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-16 11:35:02 +0100 |
| commit | 65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch) | |
| tree | f478babb801e720de7bfaee23443ffe029f58731 /Source/WebCore/platform/win | |
| parent | 47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff) | |
| download | external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.zip external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.gz external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.bz2 | |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
Diffstat (limited to 'Source/WebCore/platform/win')
| -rw-r--r-- | Source/WebCore/platform/win/DragDataWin.cpp | 15 | ||||
| -rw-r--r-- | Source/WebCore/platform/win/WebCoreTextRenderer.h | 5 |
2 files changed, 13 insertions, 7 deletions
diff --git a/Source/WebCore/platform/win/DragDataWin.cpp b/Source/WebCore/platform/win/DragDataWin.cpp index 56345e2..906119d 100644 --- a/Source/WebCore/platform/win/DragDataWin.cpp +++ b/Source/WebCore/platform/win/DragDataWin.cpp @@ -27,6 +27,7 @@ #include "DragData.h" #include "ClipboardUtilitiesWin.h" +#include "Frame.h" #include "DocumentFragment.h" #include "PlatformString.h" #include "Markup.h" @@ -37,7 +38,7 @@ namespace WebCore { -bool DragData::containsURL(FilenameConversionPolicy filenamePolicy) const +bool DragData::containsURL(Frame*, FilenameConversionPolicy filenamePolicy) const { return SUCCEEDED(m_platformDragData->QueryGetData(urlWFormat())) || SUCCEEDED(m_platformDragData->QueryGetData(urlFormat())) @@ -46,7 +47,7 @@ bool DragData::containsURL(FilenameConversionPolicy filenamePolicy) const || SUCCEEDED(m_platformDragData->QueryGetData(filenameFormat())))); } -String DragData::asURL(FilenameConversionPolicy filenamePolicy, String* title) const +String DragData::asURL(Frame*, FilenameConversionPolicy filenamePolicy, String* title) const { bool success; return getURL(m_platformDragData, filenamePolicy, success, title); @@ -89,7 +90,7 @@ bool DragData::containsPlainText() const || SUCCEEDED(m_platformDragData->QueryGetData(plainTextFormat())); } -String DragData::asPlainText() const +String DragData::asPlainText(Frame*) const { bool success; return getPlainText(m_platformDragData, success); @@ -107,13 +108,13 @@ bool DragData::canSmartReplace() const bool DragData::containsCompatibleContent() const { - return containsPlainText() || containsURL() + return containsPlainText() || containsURL(0) || containsHTML(m_platformDragData) || containsFilenames(m_platformDragData) || containsColor(); } -PassRefPtr<DocumentFragment> DragData::asFragment(Document* doc) const +PassRefPtr<DocumentFragment> DragData::asFragment(Frame* frame, PassRefPtr<Range>, bool, bool&) const { /* * Order is richest format first. On OSX this is: @@ -126,11 +127,11 @@ PassRefPtr<DocumentFragment> DragData::asFragment(Document* doc) const */ if (containsFilenames(m_platformDragData)) - if (PassRefPtr<DocumentFragment> fragment = fragmentFromFilenames(doc, m_platformDragData)) + if (PassRefPtr<DocumentFragment> fragment = fragmentFromFilenames(frame->document(), m_platformDragData)) return fragment; if (containsHTML(m_platformDragData)) - if (PassRefPtr<DocumentFragment> fragment = fragmentFromHTML(doc, m_platformDragData)) + if (PassRefPtr<DocumentFragment> fragment = fragmentFromHTML(frame->document(), m_platformDragData)) return fragment; return 0; diff --git a/Source/WebCore/platform/win/WebCoreTextRenderer.h b/Source/WebCore/platform/win/WebCoreTextRenderer.h index 7efc1f3..6deef4a 100644 --- a/Source/WebCore/platform/win/WebCoreTextRenderer.h +++ b/Source/WebCore/platform/win/WebCoreTextRenderer.h @@ -23,6 +23,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifndef WebCoreTextRenderer_h +#define WebCoreTextRenderer_h + #include <wtf/Forward.h> namespace WebCore { @@ -43,3 +46,5 @@ namespace WebCore { bool WebCoreAlwaysUsesComplexTextCodePath(); } // namespace WebCore + +#endif // WebCoreTextRenderer_h |