summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-24 01:05:35 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-24 01:05:35 +0000
commit5cc28884e9e6771825f12059e4c29136e47659cd (patch)
tree1934b158e7ee42cec79df08d1cd90b96563f8a00
parent181d8c8ebecc040e90818f2090263d8ecd848953 (diff)
downloadchromium_src-5cc28884e9e6771825f12059e4c29136e47659cd.zip
chromium_src-5cc28884e9e6771825f12059e4c29136e47659cd.tar.gz
chromium_src-5cc28884e9e6771825f12059e4c29136e47659cd.tar.bz2
Don't use some Mac-specific editor methods that now come in from Editor.cpp
now that PLATFORM(MAC) is off. Review URL: http://codereview.chromium.org/8136 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3891 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/port/platform/mac/EditorMac.mm10
1 files changed, 8 insertions, 2 deletions
diff --git a/webkit/port/platform/mac/EditorMac.mm b/webkit/port/platform/mac/EditorMac.mm
index 121384a..5ccab91 100644
--- a/webkit/port/platform/mac/EditorMac.mm
+++ b/webkit/port/platform/mac/EditorMac.mm
@@ -60,6 +60,11 @@ static void initializeKillRingIfNeeded()
}
}
+// TODO(port): WebCore's Editor.cpp provides these functions as stubs when
+// PLATFORM(MAC) is not in effect. We no longer use PLATFORM(MAC) for the
+// Chromium verison of WebKit, but we may want these implementations instead of
+// the stubs in Editor.cpp.
+#if 0
void Editor::appendToKillRing(const String& string)
{
initializeKillRingIfNeeded();
@@ -89,6 +94,7 @@ void Editor::setKillRingToYankedState()
initializeKillRingIfNeeded();
_NSSetKillRingToYankedState();
}
+#endif
void Editor::showFontPanel()
{
@@ -109,9 +115,9 @@ void Editor::showColorPanel()
// tried to do so it seemed that we first need to move more of the logic from
// -[WebHTMLView.cpp _documentFragmentFromPasteboard] into PasteboardMac.
+#if 0
void Editor::paste()
{
-#if 0
ASSERT(m_frame->document());
FrameView* view = m_frame->view();
if (!view)
@@ -120,7 +126,7 @@ void Editor::paste()
loader->setAllowStaleResources(true);
[view->documentView() tryToPerform:@selector(paste:) with:nil];
loader->setAllowStaleResources(false);
-#endif
}
+#endif
} // namespace WebCore