diff options
| author | Patrick Scott <phanna@android.com> | 2010-03-23 13:36:20 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-23 13:36:20 -0700 |
| commit | 4aa28f1f5940594c38e46f06d720f07852b17112 (patch) | |
| tree | 609bdadee80410507b6d601294ab90d1a23ab54e /WebCore/page/Settings.h | |
| parent | e34f81fbe92e8ec4045613ae8e3e0e2f3b7360e3 (diff) | |
| parent | 8216a0e796895ec6e736aebbeacee9567ae85515 (diff) | |
| download | external_webkit-4aa28f1f5940594c38e46f06d720f07852b17112.zip external_webkit-4aa28f1f5940594c38e46f06d720f07852b17112.tar.gz external_webkit-4aa28f1f5940594c38e46f06d720f07852b17112.tar.bz2 | |
Merge "Add on-demand plugin support."
Diffstat (limited to 'WebCore/page/Settings.h')
| -rw-r--r-- | WebCore/page/Settings.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/WebCore/page/Settings.h b/WebCore/page/Settings.h index fc99ac8..652c13d 100644 --- a/WebCore/page/Settings.h +++ b/WebCore/page/Settings.h @@ -147,6 +147,11 @@ namespace WebCore { void setPluginsEnabled(bool); bool arePluginsEnabled() const { return m_arePluginsEnabled; } +#ifdef ANDROID_PLUGINS + void setPluginsOnDemand(bool onDemand) { m_pluginsOnDemand = onDemand; } + bool arePluginsOnDemand() const { return m_pluginsOnDemand; } +#endif + void setDatabasesEnabled(bool); bool databasesEnabled() const { return m_databasesEnabled; } @@ -458,6 +463,9 @@ namespace WebCore { bool m_webGLEnabled : 1; bool m_geolocationEnabled : 1; bool m_loadDeferringEnabled : 1; +#ifdef ANDROID_PLUGINS + bool m_pluginsOnDemand : 1; +#endif #if USE(SAFARI_THEME) static bool gShouldPaintNativeControls; |