summaryrefslogtreecommitdiffstats
path: root/webkit/webkit.gyp
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-06 20:32:41 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-06 20:32:41 +0000
commite4c0329c31debaec3b5fe8a1136321c143de7d97 (patch)
tree29609d0333ce7841305b942653085fb413e30b79 /webkit/webkit.gyp
parent1ee61486ee0854be7b82d9fca66bb49d563ede4c (diff)
downloadchromium_src-e4c0329c31debaec3b5fe8a1136321c143de7d97.zip
chromium_src-e4c0329c31debaec3b5fe8a1136321c143de7d97.tar.gz
chromium_src-e4c0329c31debaec3b5fe8a1136321c143de7d97.tar.bz2
linux: OOP windowed plugins
There are still a few issues, but that's a start. - only windowed plugins - we can't currently create the gtksocket in background tabs, because their gtkwidgets are not yet in the hierarchy, so they can't be realized (that's what gives the XID). - the plugin process talks to the browser process through the renderer process to create/destroy the gtksockets, because the plugin doesn't know which renderer it's talking to. We need a bit more plumbing to be able to have direct IPC. - some code is duplicated between chrome and test_shell. We should probably factor it, but I'm not sure where the common part should live. Review URL: http://codereview.chromium.org/146078 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19983 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/webkit.gyp')
-rw-r--r--webkit/webkit.gyp4
1 files changed, 3 insertions, 1 deletions
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index be7658d..fccec1e 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -4469,6 +4469,8 @@
'glue/plugins/nphostapi.h',
'glue/plugins/gtk_plugin_container.h',
'glue/plugins/gtk_plugin_container.cc',
+ 'glue/plugins/gtk_plugin_container_manager.h',
+ 'glue/plugins/gtk_plugin_container_manager.cc',
'glue/plugins/plugin_constants_win.h',
'glue/plugins/plugin_host.cc',
'glue/plugins/plugin_host.h',
@@ -4659,7 +4661,7 @@
],
}, { # else: OS!="linux"
'sources/': [['exclude', '_(linux|gtk)(_data)?\\.cc$'],
- ['exclude', r'gtk_plugin_container\.(cc|h)']],
+ ['exclude', r'/gtk_']],
}],
['OS!="mac"', {
'sources/': [['exclude', '_mac\\.(cc|mm)$']]