diff options
| author | Patrick Scott <phanna@android.com> | 2010-03-22 10:09:16 -0400 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2010-03-23 15:52:45 -0400 |
| commit | 8216a0e796895ec6e736aebbeacee9567ae85515 (patch) | |
| tree | 4bbf764c32162e0aeff97c3a62b0bd1c0c8e0f0b /WebCore/page/Settings.cpp | |
| parent | bd150a788daef4180dc4d1afea9d7517b6721eff (diff) | |
| download | external_webkit-8216a0e796895ec6e736aebbeacee9567ae85515.zip external_webkit-8216a0e796895ec6e736aebbeacee9567ae85515.tar.gz external_webkit-8216a0e796895ec6e736aebbeacee9567ae85515.tar.bz2 | |
Add on-demand plugin support.
The Settings object now has an on-demand flag for plugins (this was to avoid
more edits to webkit code). If plugins are on-demand and a plugin is installed
that can handle the content, insert a placeholder widget. If the user clicks on
the placeholder, the plugin will be enabled.
The widget currently does not clip the context correctly. It only clips based on
the widget frame. This is due to a bug (already filed) where the scroll offset
is producing bad clip rectangles.
Requires a framework change.
Bug: 2411524
Change-Id: If3931da8da2339a2385ae78b609c49fa069892ab
Diffstat (limited to 'WebCore/page/Settings.cpp')
| -rw-r--r-- | WebCore/page/Settings.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp index 7b5da91..c495a23 100644 --- a/WebCore/page/Settings.cpp +++ b/WebCore/page/Settings.cpp @@ -136,6 +136,9 @@ Settings::Settings(Page* page) , m_webGLEnabled(false) , m_geolocationEnabled(true) , m_loadDeferringEnabled(true) +#ifdef ANDROID_PLUGINS + , m_pluginsOnDemand(false) +#endif { // A Frame may not have been created yet, so we initialize the AtomicString // hash before trying to use it. |