Modified: trunk/Source/WebCore/ChangeLog (159853 => 159854)
--- trunk/Source/WebCore/ChangeLog 2013-11-28 19:35:24 UTC (rev 159853)
+++ trunk/Source/WebCore/ChangeLog 2013-11-28 19:43:50 UTC (rev 159854)
@@ -1,3 +1,15 @@
+2013-11-28 Thiago de Barros Lacerda <thiago.lace...@openbossa.org>
+
+ Nix Upstream: Adding EditorNix to WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=124984
+
+ Reviewed by Csaba Osztrogonác.
+
+ No new tests needed.
+
+ * PlatformNix.cmake:
+ * editing/nix/EditorNix.cpp: Added.
+
2013-11-28 Zoltan Horvath <zol...@webkit.org>
[Win] Update vcxproj.filters, since LineInfo.h and LineLayoutState.h have been moved to rendering/line
Modified: trunk/Source/WebCore/PlatformNix.cmake (159853 => 159854)
--- trunk/Source/WebCore/PlatformNix.cmake 2013-11-28 19:35:24 UTC (rev 159853)
+++ trunk/Source/WebCore/PlatformNix.cmake 2013-11-28 19:43:50 UTC (rev 159854)
@@ -24,6 +24,8 @@
editing/SmartReplaceICU.cpp
+ editing/nix/EditorNix.cpp
+
html/shadow/MediaControlsNix.cpp
page/TouchAdjustment.cpp
Added: trunk/Source/WebCore/editing/nix/EditorNix.cpp (0 => 159854)
--- trunk/Source/WebCore/editing/nix/EditorNix.cpp (rev 0)
+++ trunk/Source/WebCore/editing/nix/EditorNix.cpp 2013-11-28 19:43:50 UTC (rev 159854)
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR 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.
+ */
+
+#include "config.h"
+#include "Editor.h"
+
+#include "NotImplemented.h"
+
+namespace WebCore {
+
+void Editor::writeSelectionToPasteboard(Pasteboard&)
+{
+ notImplemented();
+}
+
+void Editor::writeImageToPasteboard(Pasteboard&, Element&, const URL&, const String&)
+{
+ notImplemented();
+}
+
+void Editor::pasteWithPasteboard(Pasteboard*, bool)
+{
+ notImplemented();
+}
+
+} // namespace WebCore
+
