13 files changed, 188 insertions, 4 deletions
diff --git a/chrome/common/resource_dispatcher.cc b/chrome/common/resource_dispatcher.cc
index 81ed5a2..04693ab 100644
--- a/chrome/common/resource_dispatcher.cc
+++ b/chrome/common/resource_dispatcher.cc
@@ -516,4 +516,5 @@ bool ResourceDispatcher::IsResourceMessage(const IPC::Message& message) const {
   }
 
   return false;
-}
-\ No newline at end of file
+}
+
diff --git a/webkit/SConscript b/webkit/SConscript
index 1952c93..a622930 100644
--- a/webkit/SConscript
+++ b/webkit/SConscript
@@ -174,6 +174,7 @@ env.Append(
       '_SCL_SECURE_NO_WARNINGS',
       ['ENABLE_DATABASE', '0'],
       ['ENABLE_DASHBOARD_SUPPORT', '0'],
+      ['ENABLE_JAVASCRIPT_DEBUGGER', '0'],
       ['ENABLE_JSC_MULTIPLE_THREADS', '0'],
       ['ENABLE_ICONDATABASE', '0'],
       ['ENABLE_XSLT', '1'],
diff --git a/webkit/SConscript.port b/webkit/SConscript.port
index 3af7859..262960c 100644
--- a/webkit/SConscript.port
+++ b/webkit/SConscript.port
@@ -125,6 +125,9 @@ if env['PLATFORM'] == 'posix':
   # Linux specific implementations
   input_files.extend([
     '$PORT_DIR/platform/chromium/ScreenLinux.cpp',
+    '$PORT_DIR/platform/chromium/EditorLinux.cpp',
+    '$PORT_DIR/platform/chromium/IconLinux.cpp',
+    '$PORT_DIR/platform/graphics/chromium/GlyphPageTreeNodeLinux.cpp',
     '$PORT_DIR/platform/chromium/PasteboardLinux.cpp',
   ])
 
diff --git a/webkit/glue/SConscript b/webkit/glue/SConscript
index 9006cd0..65de5bf 100644
--- a/webkit/glue/SConscript
+++ b/webkit/glue/SConscript
@@ -69,6 +69,18 @@ input_files = [
   'webview_impl.cc',
 ]
 
+if env['PLATFORM'] == 'posix':
+  # TODO(port): until we have plugin support for Linux, these files aren't built.
+  remove_files = [
+    'plugins/plugin_host.cc',
+    'plugins/plugin_instance.cc',
+    'plugins/plugin_string_stream.cc',
+    'plugins/plugin_stream_url.cc',
+  ]
+
+  for file in remove_files:
+    input_files.remove(file)
+
 if env['PLATFORM'] == 'win32':
   # TODO(port): These extra files aren't win32-specific, they've just not been
   # tested on other platforms yet.
diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc
index 2429c0b..496de7f 100644
--- a/webkit/glue/webplugin_impl.cc
+++ b/webkit/glue/webplugin_impl.cc
@@ -5,6 +5,7 @@
 #include "config.h"
 
 #include "base/compiler_specific.h"
+#include "build/build_config.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "Cursor.h"
@@ -375,7 +376,13 @@ bool WebPluginImpl::SetPostData(WebCore::ResourceRequest* request,
   std::vector<std::string> names;
   std::vector<std::string> values;
   std::vector<char> body;
+#if !defined(OS_LINUX)
   bool rv = NPAPI::PluginHost::SetPostData(buf, length, &names, &values, &body);
+#else
+  // TODO(port): unstub once we have plugin support
+  bool rv = false;
+  NOTREACHED();
+#endif
 
   for (size_t i = 0; i < names.size(); ++i)
     request->addHTTPHeaderField(webkit_glue::StdStringToString(names[i]),
diff --git a/webkit/port/bridge/chromium/PluginsChromium.cpp b/webkit/port/bridge/chromium/PluginsChromium.cpp
index eb6188d..d337bf6 100644
--- a/webkit/port/bridge/chromium/PluginsChromium.cpp
+++ b/webkit/port/bridge/chromium/PluginsChromium.cpp
@@ -144,11 +144,14 @@ String GetPluginMimeTypeFromExtension(const String& extension) {
     std::string mime_type;
     std::string extension_std = WideToUTF8(
         webkit_glue::StringToStdWString(extension));
+#if !defined(__linux__)
+    // TODO(port): unstub once we have plugin support for Linux
     for (size_t i = 0; i < g_plugins.size(); ++i) {
         if (NPAPI::PluginList::SupportsExtension(
                 g_plugins[i], extension_std, &mime_type))
             break;
     }
+#endif
 
     return webkit_glue::StdStringToString(mime_type);
 }
diff --git a/webkit/port/platform/chromium/EditorLinux.cpp b/webkit/port/platform/chromium/EditorLinux.cpp
new file mode 100644
index 0000000..808d617
--- /dev/null
+++ b/webkit/port/platform/chromium/EditorLinux.cpp
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ *
+ * 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 APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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 "Clipboard.h"
+#include "NotImplemented.h"
+
+namespace WebCore {
+
+PassRefPtr<Clipboard> Editor::newGeneralClipboard(ClipboardAccessPolicy policy)
+{
+    notImplemented();
+    return NULL;
+}
+
+} // namespace WebCore
diff --git a/webkit/port/platform/chromium/IconLinux.cpp b/webkit/port/platform/chromium/IconLinux.cpp
new file mode 100644
index 0000000..963373b
--- /dev/null
+++ b/webkit/port/platform/chromium/IconLinux.cpp
@@ -0,0 +1,52 @@
+/*
+* Copyright (C) 2006, 2007 Apple Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Library General Public
+* License as published by the Free Software Foundation; either
+* version 2 of the License, or (at your option) any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Library General Public License for more details.
+*
+* You should have received a copy of the GNU Library General Public License
+* along with this library; see the file COPYING.LIB.  If not, write to
+* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+* Boston, MA 02111-1307, USA.
+*
+*/
+
+#include "config.h"
+
+#include "Icon.h"
+
+#include "GraphicsContext.h"
+#include "NotImplemented.h"
+#include "PlatformString.h"
+#include "SkiaUtils.h"
+
+namespace WebCore {
+
+Icon::Icon(const PlatformIcon& icon)
+    : m_icon(icon)
+{
+}
+
+Icon::~Icon()
+{
+}
+
+PassRefPtr<Icon> Icon::newIconForFile(const String& filename)
+{
+  notImplemented();
+  return NULL;
+}
+
+void Icon::paint(GraphicsContext* context, const IntRect& r)
+{
+  notImplemented();
+}
+
+} // namespace WebCore
diff --git a/webkit/port/platform/chromium/RenderThemeGtk.cpp b/webkit/port/platform/chromium/RenderThemeGtk.cpp
index f37c7f6..150f616 100644
--- a/webkit/port/platform/chromium/RenderThemeGtk.cpp
+++ b/webkit/port/platform/chromium/RenderThemeGtk.cpp
@@ -436,7 +436,7 @@ void RenderThemeGtk::systemFont(int, FontDescription&) const
     notImplemented();
 }
 
-void RenderTheme::systemFont(int, Document*, FontDescription&) const
+void RenderThemeGtk::systemFont(int, Document*, FontDescription&) const
 {
     notImplemented();
 }
diff --git a/webkit/port/platform/chromium/TemporaryLinkStubs.cpp b/webkit/port/platform/chromium/TemporaryLinkStubs.cpp
index 810d234..25a4494 100644
--- a/webkit/port/platform/chromium/TemporaryLinkStubs.cpp
+++ b/webkit/port/platform/chromium/TemporaryLinkStubs.cpp
@@ -48,5 +48,7 @@ PassRefPtr<SharedBuffer> SharedBuffer::createWithContentsOfFile(const String& fi
 }
 
 namespace WTF {
+#if !defined(__linux__)
 void scheduleDispatchFunctionsOnMainThread() { notImplemented(); }
+#endif
 }
diff --git a/webkit/port/platform/graphics/chromium/GlyphPageTreeNodeLinux.cpp b/webkit/port/platform/graphics/chromium/GlyphPageTreeNodeLinux.cpp
new file mode 100644
index 0000000..8dece07
--- /dev/null
+++ b/webkit/port/platform/graphics/chromium/GlyphPageTreeNodeLinux.cpp
@@ -0,0 +1,46 @@
+// Copyright (c) 2008, Google Inc.
+// All rights reserved.
+// 
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+// 
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * 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.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+// 
+// 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 "Font.h"
+#include "GlyphPageTreeNode.h"
+#include "NotImplemented.h"
+#include "SimpleFontData.h"
+
+namespace WebCore
+{
+
+bool GlyphPage::fill(unsigned offset, unsigned length, UChar* characterBuffer, unsigned bufferLength, const SimpleFontData* fontData)
+{
+    notImplemented();
+    return false;
+}
+
+}  // namespace WebCore
diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript
index ec3bf02..b00dfda 100644
--- a/webkit/tools/test_shell/SConscript
+++ b/webkit/tools/test_shell/SConscript
@@ -115,7 +115,7 @@ elif env['PLATFORM'] == 'posix':
   input_files.extend([
       'gtk/test_shell.cc',
       'gtk/webwidget_host.cc',
-      'gtk/webview_host.cc'
+      'gtk/webview_host.cc',
   ])
 
 lib = env.ChromeStaticLibrary('test_shell', input_files)
diff --git a/webkit/tools/test_shell/gtk/test_shell.cc b/webkit/tools/test_shell/gtk/test_shell.cc
index 702195f..fcb5d1b 100644
--- a/webkit/tools/test_shell/gtk/test_shell.cc
+++ b/webkit/tools/test_shell/gtk/test_shell.cc
@@ -12,6 +12,7 @@
 #include "net/base/mime_util.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/plugins/plugin_list.h"
+#include "webkit/glue/resource_loader_bridge.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 
 WebPreferences* TestShell::web_prefs_ = NULL;
@@ -21,7 +22,7 @@ WindowList* TestShell::window_list_;
 TestShell::TestShell() {
   // Uncomment this line to get a bunch of linker errors.  This is what we need
   // to fix.
-  //m_webViewHost.reset(WebViewHost::Create(NULL, NULL, *TestShell::web_prefs_));
+  m_webViewHost.reset(WebViewHost::Create(NULL, NULL, *TestShell::web_prefs_));
 }
 
 TestShell::~TestShell() {
@@ -191,4 +192,20 @@ std::wstring GetWebKitLocale() {
   return L"en-US";
 }
 
+// The following cookie functions shouldn't live here, but do for now in order
+// to get things linking
+
+std::string GetCookies(const GURL &url, const GURL &policy_url) {
+  return "";
+}
+
+void SetCookie(const GURL &url, const GURL &policy_url, const std::string &cookie) {
+}
+
+
+ResourceLoaderBridge *
+ResourceLoaderBridge::Create(WebFrame*, std::string const &, GURL const&, GURL const&, GURL const&, std::string const&, int, int, ResourceType::Type, bool) {
+  return NULL;
+}
+
 }  // namespace webkit_glue