summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/chrome_tests.gypi2
-rw-r--r--chrome/test/data/pepper/pepper_3d.html2
-rw-r--r--chrome/test/ui/pepper_uitest.cc10
-rw-r--r--webkit/tools/npapi_pepper_test_plugin/Info.plist46
-rw-r--r--webkit/tools/npapi_pepper_test_plugin/main.cc (renamed from webkit/tools/pepper_test_plugin/pepper_test_plugin.cc)0
-rw-r--r--webkit/tools/npapi_pepper_test_plugin/pepper_3d_test.cc (renamed from webkit/tools/pepper_test_plugin/pepper_3d_test.cc)2
-rw-r--r--webkit/tools/npapi_pepper_test_plugin/pepper_3d_test.h (renamed from webkit/tools/pepper_test_plugin/pepper_3d_test.h)6
-rw-r--r--webkit/tools/npapi_pepper_test_plugin/plugin.def6
-rw-r--r--webkit/tools/npapi_pepper_test_plugin/plugin.rc29
-rw-r--r--webkit/tools/npapi_pepper_test_plugin/test_factory.cc (renamed from webkit/tools/pepper_test_plugin/pepper_test_factory.cc)2
-rw-r--r--webkit/tools/test_shell/test_shell.gypi18
11 files changed, 103 insertions, 20 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 98333db..3af2605 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -327,7 +327,7 @@
['target_arch!="x64" and target_arch!="arm"', {
'dependencies': [
'../webkit/webkit.gyp:npapi_test_plugin',
- '../webkit/webkit.gyp:pepper_test_plugin',
+ '../webkit/webkit.gyp:npapi_pepper_test_plugin',
],
}],
['OS=="linux"', {
diff --git a/chrome/test/data/pepper/pepper_3d.html b/chrome/test/data/pepper/pepper_3d.html
index df1bea7..3491bda 100644
--- a/chrome/test/data/pepper/pepper_3d.html
+++ b/chrome/test/data/pepper/pepper_3d.html
@@ -9,7 +9,7 @@
Test running....
</div>
-<object type="pepper-application/x-pepper-test-plugin"
+<object type="pepper-application/x-pepper-test"
id="1"
name="pepper_3d"
width="256" height="256" />
diff --git a/chrome/test/ui/pepper_uitest.cc b/chrome/test/ui/pepper_uitest.cc
index be247e2..d7b1a933 100644
--- a/chrome/test/ui/pepper_uitest.cc
+++ b/chrome/test/ui/pepper_uitest.cc
@@ -6,11 +6,11 @@
#include "chrome/test/ui/npapi_test_helper.h"
#if defined(OS_WIN)
-static const char kPepperTestPluginName[] = "pepper_test_plugin.dll";
+static const char kPepperTestPluginName[] = "npapi_pepper_test_plugin.dll";
#elif defined(OS_MACOSX)
-static const char kPepperTestPluginName[] = "PepperTestPlugin.plugin";
+static const char kPepperTestPluginName[] = "npapi_pepper_test_plugin.plugin";
#elif defined(OS_LINUX)
-static const char kPepperTestPluginName[] = "libpepper_test_plugin.so";
+static const char kPepperTestPluginName[] = "libnpapi_pepper_test_plugin.so";
#endif
using npapi_test::kTestCompleteCookie;
@@ -24,6 +24,8 @@ class PepperTester : public NPAPITesterBase {
PepperTester() : NPAPITesterBase(kPepperTestPluginName) {}
virtual void SetUp() {
+ // TODO(alokp): Remove no-sandbox flag once gpu plugin can run in sandbox.
+ launch_arguments_.AppendSwitch(switches::kNoSandbox);
launch_arguments_.AppendSwitch(switches::kInternalPepper);
launch_arguments_.AppendSwitch(switches::kEnableGPUPlugin);
NPAPITesterBase::SetUp();
@@ -38,5 +40,5 @@ TEST_F(PepperTester, DISABLED_Pepper3D) {
ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
WaitForFinish("pepper_3d", "1", url,
kTestCompleteCookie, kTestCompleteSuccess,
- kLongWaitTimeout);
+ kShortWaitTimeout);
}
diff --git a/webkit/tools/npapi_pepper_test_plugin/Info.plist b/webkit/tools/npapi_pepper_test_plugin/Info.plist
new file mode 100644
index 0000000..3d06b29
--- /dev/null
+++ b/webkit/tools/npapi_pepper_test_plugin/Info.plist
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>${EXECUTABLE_NAME}</string>
+ <key>CFBundleGetInfoString</key>
+ <string>Copyright 2010 Google, Inc.</string>
+ <key>CFBundleIdentifier</key>
+ <string>com.google.testpepperplugin</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>${PRODUCT_NAME}</string>
+ <key>CFBundlePackageType</key>
+ <string>BRPL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.0</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>1.0</string>
+ <key>CFPlugInDynamicRegisterFunction</key>
+ <string></string>
+ <key>CFPlugInDynamicRegistration</key>
+ <string>NO</string>
+ <key>WebPluginDescription</key>
+ <string>Simple NPAPI Pepper plug-in that handles tests</string>
+ <key>WebPluginMIMETypes</key>
+ <dict>
+ <key>pepper-application/x-pepper-test</key>
+ <dict>
+ <key>WebPluginExtensions</key>
+ <array>
+ <string>testpepper</string>
+ </array>
+ <key>WebPluginTypeDescription</key>
+ <string>Test Pepper API</string>
+ </dict>
+ </dict>
+ <key>WebPluginName</key>
+ <string>NPAPI Pepper Test PlugIn</string>
+</dict>
+</plist>
diff --git a/webkit/tools/pepper_test_plugin/pepper_test_plugin.cc b/webkit/tools/npapi_pepper_test_plugin/main.cc
index 4560a79..4560a79 100644
--- a/webkit/tools/pepper_test_plugin/pepper_test_plugin.cc
+++ b/webkit/tools/npapi_pepper_test_plugin/main.cc
diff --git a/webkit/tools/pepper_test_plugin/pepper_3d_test.cc b/webkit/tools/npapi_pepper_test_plugin/pepper_3d_test.cc
index 60d57f9..d5df069 100644
--- a/webkit/tools/pepper_test_plugin/pepper_3d_test.cc
+++ b/webkit/tools/npapi_pepper_test_plugin/pepper_3d_test.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "webkit/tools/pepper_test_plugin/pepper_3d_test.h"
+#include "webkit/tools/npapi_pepper_test_plugin/pepper_3d_test.h"
namespace {
const int32 kCommandBufferSize = 1024 * 1024;
diff --git a/webkit/tools/pepper_test_plugin/pepper_3d_test.h b/webkit/tools/npapi_pepper_test_plugin/pepper_3d_test.h
index f9801d7..20b10ed 100644
--- a/webkit/tools/pepper_test_plugin/pepper_3d_test.h
+++ b/webkit/tools/npapi_pepper_test_plugin/pepper_3d_test.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_PEPPER_3D_TEST_H
-#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_PEPPER_3D_TEST_H
+#ifndef WEBKIT_TOOLS_NPAPI_PEPPER_TEST_PLUGIN_PEPPER_3D_TEST_H
+#define WEBKIT_TOOLS_NPAPI_PEPPER_TEST_PLUGIN_PEPPER_3D_TEST_H
#include "gpu/pgl/pgl.h"
#include "third_party/gles2_book/Chapter_11/Stencil_Test/Stencil_Test.h"
@@ -53,4 +53,4 @@ class Pepper3DTest : public PluginTest {
} // namespace NPAPIClient
-#endif // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_PEPPER_3D_TEST_H
+#endif // WEBKIT_TOOLS_NPAPI_PEPPER_TEST_PLUGIN_PEPPER_3D_TEST_H
diff --git a/webkit/tools/npapi_pepper_test_plugin/plugin.def b/webkit/tools/npapi_pepper_test_plugin/plugin.def
new file mode 100644
index 0000000..2f62dfd
--- /dev/null
+++ b/webkit/tools/npapi_pepper_test_plugin/plugin.def
@@ -0,0 +1,6 @@
+LIBRARY npapi_pepper_test_plugin
+
+EXPORTS
+ NP_GetEntryPoints @1
+ NP_Initialize @2
+ NP_Shutdown @3
diff --git a/webkit/tools/npapi_pepper_test_plugin/plugin.rc b/webkit/tools/npapi_pepper_test_plugin/plugin.rc
new file mode 100644
index 0000000..6ee5243
--- /dev/null
+++ b/webkit/tools/npapi_pepper_test_plugin/plugin.rc
@@ -0,0 +1,29 @@
+1 VERSIONINFO
+ FILEVERSION 1,0,0,1
+ PRODUCTVERSION 1,0,0,1
+ FILEFLAGSMASK 0x17L
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "CompanyName", "Google"
+ VALUE "FileDescription", "NPAPI Pepper Test Plugin"
+ VALUE "FileVersion", "1, 0, 0, 1"
+ VALUE "InternalName", "npapi_pepper_test_plugin"
+ VALUE "LegalCopyright", "Copyright (C) 2010"
+ VALUE "OriginalFilename", "npapi_pepper_test_plugin.dll"
+ VALUE "ProductName", "NPAPI Pepper Test Plugin"
+ VALUE "ProductVersion", "1, 0, 0, 1"
+ VALUE "MIMEType", "pepper-application/x-pepper-test"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
diff --git a/webkit/tools/pepper_test_plugin/pepper_test_factory.cc b/webkit/tools/npapi_pepper_test_plugin/test_factory.cc
index 1e22d0b..95055f3 100644
--- a/webkit/tools/pepper_test_plugin/pepper_test_factory.cc
+++ b/webkit/tools/npapi_pepper_test_plugin/test_factory.cc
@@ -4,7 +4,7 @@
#include "webkit/glue/plugins/test/plugin_test_factory.h"
-#include "webkit/tools/pepper_test_plugin/pepper_3d_test.h"
+#include "webkit/tools/npapi_pepper_test_plugin/pepper_3d_test.h"
namespace NPAPIClient {
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index a414092..d40cac0 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -686,25 +686,25 @@
],
},
{
- 'target_name': 'pepper_test_plugin',
+ 'target_name': 'npapi_pepper_test_plugin',
'type': 'loadable_module',
'mac_bundle': 1,
- 'msvs_guid': 'EE00E36E-9E8C-4DFB-925E-FBE32CEDB91A',
+ 'msvs_guid': '821F3B89-6AE1-4254-99CB-93C04D0A79BE',
'dependencies': [
'<(DEPTH)/gpu/gpu.gyp:pgl',
'<(DEPTH)/third_party/gles2_book/gles2_book.gyp:stencil_test',
'npapi_test_common',
],
'sources': [
- '../pepper_test_plugin/pepper_3d_test.cc',
- '../pepper_test_plugin/pepper_3d_test.h',
- '../pepper_test_plugin/pepper_test_factory.cc',
- '../pepper_test_plugin/pepper_test_plugin.cc',
- '../pepper_test_plugin/pepper_test_plugin.def',
- '../pepper_test_plugin/pepper_test_plugin.rc',
+ '../npapi_pepper_test_plugin/main.cc',
+ '../npapi_pepper_test_plugin/pepper_3d_test.cc',
+ '../npapi_pepper_test_plugin/pepper_3d_test.h',
+ '../npapi_pepper_test_plugin/plugin.def',
+ '../npapi_pepper_test_plugin/plugin.rc',
+ '../npapi_pepper_test_plugin/test_factory.cc',
],
'xcode_settings': {
- 'INFOPLIST_FILE': '<(DEPTH)/webkit/tools/pepper_test_plugin/Info.plist',
+ 'INFOPLIST_FILE': '<(DEPTH)/webkit/tools/npapi_pepper_test_plugin/Info.plist',
},
},
],
generated by cgit v1.1 at 2025-02-02 11:56:36 +0000