diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-20 21:38:29 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-20 21:38:29 +0000 |
| commit | 76c3b3196acf73961327fcabe139ab608f96dc37 (patch) | |
| tree | abdbd988b89c30cee3abb36fbe9c8eda0ed777ba /webkit/glue | |
| parent | eea56c6215e2211fa72f5f017c7c21d2b0faf139 (diff) | |
| download | chromium_src-76c3b3196acf73961327fcabe139ab608f96dc37.zip chromium_src-76c3b3196acf73961327fcabe139ab608f96dc37.tar.gz chromium_src-76c3b3196acf73961327fcabe139ab608f96dc37.tar.bz2 | |
Reland Mac: First steps for default plugin
BUG=17392
TEST=Go to http://www.adobe.com/shockwave/welcome/. The task manager should show that the default plugin is running, and the "Missing Plug-in" text should look slightly different than it did before. (this test depends on a small webkit patch)
Requires commenting out
if (objectContentType(url, mimeType) != ObjectContentNetscapePlugin)
return 0;
in WebKit/WebKit/chromium/src/FrameLoaderClientImpl.cpp's createPlugin() as well, else the default plugin won't load.
<style type="text/css">
#glass {
position: absolute; width: 128px; height: 128px;
border: 1px solid rgba(0, 0, 0, 0.8);
-webkit-border-radius: 64px;
-webkit-transition-property: background-color, -webkit-box-shadow;
-webkit-transition-duration: 0.25s, 0.25s;
background-image: -webkit-gradient(radial,
50% 8%, 0, 50% -40%, 192, from(rgba(255, 255, 255, 0.4)),
color-stop(50%, rgba(255, 255, 255, 0.07)),
color-stop(51%, rgba(255, 255, 255, 0)),
color-stop(52%, rgba(0, 0, 0, 0.2)), color-stop(70%, rgba(0, 0, 0, 0.1)),
color-stop(99%, rgba(0, 0, 0, 0)), to(rgba(255, 255, 255, 0)));
background-color: #335;
-webkit-box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.5);
color: white;
font-family: Helvetica, Arial, sans-serif;
font-size: 30px; font-weight: bold; line-height: 128px; text-align: center;
text-shadow: 0px -1px 2px rgba(0, 0, 0, 0.5);
}
#glass:hover {
background-color: #448;
-webkit-box-shadow: 0px 0px 50px rgba(0, 0, 255, 0.5);
}
</style>
<div id="glass">zomfg</div>
Review URL: http://codereview.chromium.org/2075006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47849 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/plugins/plugin_list.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/webkit_glue.gypi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/webkit/glue/plugins/plugin_list.cc b/webkit/glue/plugins/plugin_list.cc index 7640b0c63..d0a628d 100644 --- a/webkit/glue/plugins/plugin_list.cc +++ b/webkit/glue/plugins/plugin_list.cc @@ -141,7 +141,7 @@ PluginList::PluginList() : plugins_loaded_(false), plugins_need_refresh_(false) { PlatformInit(); -#if defined(OS_WIN) +#if defined(OS_WIN) || defined(OS_MACOSX) const PluginVersionInfo default_plugin = { FilePath(kDefaultPluginLibraryName), L"Default Plug-in", diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index f357109..3c42c6b 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -366,7 +366,7 @@ 'plugins/plugin_stubs.cc', ], }], - ['inside_chromium_build==1 and OS=="win"', { + ['inside_chromium_build==1 and (OS=="mac" or OS=="win")', { 'dependencies': [ '<(DEPTH)/webkit/default_plugin/default_plugin.gyp:default_plugin', ], |