diff options
author | tkent@google.com <tkent@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-10 07:19:24 +0000 |
---|---|---|
committer | tkent@google.com <tkent@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-10 07:19:24 +0000 |
commit | 9f7b4d98cb1fb1065cbf8b045e50adcc6d4a2524 (patch) | |
tree | d3b599f89835284321e8196a054b13d96c514f56 /webkit/tools/npapi_layout_test_plugin | |
parent | bee2335c8e86ab394e5380005d9d481b3f2b8ee3 (diff) | |
download | chromium_src-9f7b4d98cb1fb1065cbf8b045e50adcc6d4a2524.zip chromium_src-9f7b4d98cb1fb1065cbf8b045e50adcc6d4a2524.tar.gz chromium_src-9f7b4d98cb1fb1065cbf8b045e50adcc6d4a2524.tar.bz2 |
Move npapi_layout_test_plugin target to webkit_support to use it from
WebKit DumpRenderTree.
The following code change affects only WebKit DumpRenderTree.
* webkit_support.cc
- WebPluginImplWithPageDelegate passes a plugin path and MIME type to WebPluginImpl.
- CreateWebPlugin checks a MIME type.
This is the same logic as test_shell.
* test_webplugin_page_delegate.h
Creates and returns a WebPluginDelegateImpl instance.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2729004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49372 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/npapi_layout_test_plugin')
-rw-r--r-- | webkit/tools/npapi_layout_test_plugin/npapi_layout_test_plugin.gypi | 99 |
1 files changed, 99 insertions, 0 deletions
diff --git a/webkit/tools/npapi_layout_test_plugin/npapi_layout_test_plugin.gypi b/webkit/tools/npapi_layout_test_plugin/npapi_layout_test_plugin.gypi new file mode 100644 index 0000000..b329bed --- /dev/null +++ b/webkit/tools/npapi_layout_test_plugin/npapi_layout_test_plugin.gypi @@ -0,0 +1,99 @@ +# Copyright (c) 2010 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +{ + 'targets': [ + { + 'target_name': 'npapi_layout_test_plugin', + 'type': 'loadable_module', + 'variables': { + 'chromium_code': 1, + }, + 'mac_bundle': 1, + 'msvs_guid': 'BE6D5659-A8D5-4890-A42C-090DD10EF62C', + 'sources': [ + 'PluginObject.cpp', + 'TestObject.cpp', + 'main.cpp', + 'npapi_layout_test_plugin.def', + 'npapi_layout_test_plugin.rc', + ], + 'include_dirs': [ + '../../..', + ], + 'dependencies': [ + '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', + ], + 'msvs_disabled_warnings': [ 4996 ], + 'mac_bundle_resources': [ + 'Info.r', + ], + 'xcode_settings': { + 'INFOPLIST_FILE': '<(DEPTH)/webkit/tools/npapi_layout_test_plugin/Info.plist', + }, + 'conditions': [ + ['inside_chromium_build==0', { + 'dependencies': ['../../../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf'], + },{ + 'dependencies': ['<(DEPTH)/third_party/WebKit/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf'], + }], + ['OS!="win"', { + 'sources!': [ + 'npapi_layout_test_plugin.def', + 'npapi_layout_test_plugin.rc', + ], + # TODO(bradnelson): + # This copy should really live here, as a post-build step, + # but it's currently being implemented via + # AdditionalDependencies, which tries to do the copy before + # the file is built... + # + }, { # OS == "win" + # # The old VS build would explicitly copy the .dll into the + # # plugins subdirectory like this. It might be possible to + # # use the 'product_dir' setting to build directly into + # # plugins/ (as is done on Linux), but we'd need to verify + # # that nothing breaks first. + # 'copies': [ + # { + # 'destination': '<(PRODUCT_DIR)/plugins', + # 'files': ['<(PRODUCT_DIR)/npapi_layout_test_plugin.dll'], + # }, + # ], + 'variables': { + # This is not a relative pathname. Avoid pathname relativization + # by sticking it in a variable that isn't recognized as one + # containing pathnames, and by using the >(late) form of variable + # expansion. + 'winmm_lib': 'winmm.lib', + }, + 'link_settings': { + 'libraries': [ + '>(winmm_lib)', + ], + }, + }], + ['OS=="mac"', { + 'product_name': 'TestNetscapePlugIn', + 'product_extension': 'plugin', + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', + ], + }, + }], + ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and (target_arch=="x64" or target_arch=="arm")', { + # Shared libraries need -fPIC on x86-64 + 'cflags': ['-fPIC'] + }], + ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: |