summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-21 00:14:42 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-21 00:14:42 +0000
commit25db381a7bf6cf120524247c834094c6226cf00b (patch)
tree52559e6cc61119cadbf76975c7762fa7d1adc52d
parent7860182a99356eb7ae8bb0de293c612df1ffe6ac (diff)
downloadchromium_src-25db381a7bf6cf120524247c834094c6226cf00b.zip
chromium_src-25db381a7bf6cf120524247c834094c6226cf00b.tar.gz
chromium_src-25db381a7bf6cf120524247c834094c6226cf00b.tar.bz2
fix linux build by adding necessary idl files
TBR=erg Review URL: http://codereview.chromium.org/7535 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3639 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/build/WebCore/SConscript2
-rw-r--r--webkit/build/port/SConscript5
-rw-r--r--webkit/glue/plugins/test/SConscript2
-rw-r--r--webkit/glue/plugins/test/plugin_javascript_open_popup.h2
4 files changed, 8 insertions, 3 deletions
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index 4cc20d1..4d89455 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -457,7 +457,7 @@ input_files = [
'$WEBCORE_DIR/plugins/MimeType.cpp',
'$WEBCORE_DIR/plugins/MimeTypeArray.cpp',
- '$WEBCORE_DIR/plugins/Plugin.cpp.cpp',
+ '$WEBCORE_DIR/plugins/Plugin.cpp',
'$WEBCORE_DIR/plugins/PluginArray.cpp',
'$WEBCORE_DIR/plugins/PluginData.cpp',
diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript
index b1e27e2..7a3d622 100644
--- a/webkit/build/port/SConscript
+++ b/webkit/build/port/SConscript
@@ -312,6 +312,11 @@ idl_files = [
'page/inspector/InspectorController.idl',
+ 'plugins/MimeTypeArray.idl',
+ 'plugins/MimeType.idl',
+ 'plugins/PluginArray.idl',
+ 'plugins/Plugin.idl',
+
'ksvg2/svg/SVGMatrix.idl',
'ksvg2/svg/SVGPathSegList.idl',
'ksvg2/svg/SVGPointList.idl',
diff --git a/webkit/glue/plugins/test/SConscript b/webkit/glue/plugins/test/SConscript
index d57e7b2..ee8a4f2 100644
--- a/webkit/glue/plugins/test/SConscript
+++ b/webkit/glue/plugins/test/SConscript
@@ -16,7 +16,6 @@ input_files = [
'plugin_geturl_test.cc',
'plugin_new_fails_test.cc',
'plugin_npobject_proxy_test.cc',
- 'plugin_javascript_open_popup.cc',
'plugin_test.cc'
]
@@ -25,6 +24,7 @@ if env['PLATFORM'] == 'win32':
input_files.extend([
'plugin_execute_script_delete_test.cc',
'plugin_geturl_test.cc',
+ 'plugin_javascript_open_popup.cc',
'plugin_client.cc', # Includes not ported headers.
'plugin_npobject_lifetime_test.cc', # Has win32-isms (HWND, CALLBACK).
'plugin_window_size_test.cc' # Has w32-isms including HWND.
diff --git a/webkit/glue/plugins/test/plugin_javascript_open_popup.h b/webkit/glue/plugins/test/plugin_javascript_open_popup.h
index e2a29a8..d5fd8de 100644
--- a/webkit/glue/plugins/test/plugin_javascript_open_popup.h
+++ b/webkit/glue/plugins/test/plugin_javascript_open_popup.h
@@ -39,4 +39,4 @@ class ExecuteJavascriptPopupWindowTargetPluginTest : public PluginTest {
} // namespace NPAPIClient
-#endif // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_JAVASCRIPT_OPEN_POPUP_H \ No newline at end of file
+#endif // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_JAVASCRIPT_OPEN_POPUP_H