Changeset 61587 in webkit


Ignore:
Timestamp:
Jun 21, 2010 4:00:13 PM (14 years ago)
Author:
andersca@apple.com
Message:

2010-06-21 Anders Carlsson <​andersca@apple.com>

Reviewed by Sam Weinig.

Add PluginInfoStore class
​https://bugs.webkit.org/show_bug.cgi?id=40949

  • Shared/WebPreferencesStore.cpp: (WebKit::WebPreferencesStore::WebPreferencesStore):
  • Shared/WebPreferencesStore.h: (WebKit::WebPreferencesStore::encode): (WebKit::WebPreferencesStore::decode): Add plugInsEnabled to the preferences store.
  • UIProcess/Plugins: Added.
  • UIProcess/Plugins/PluginInfoStore.cpp: Added. (WebKit::PluginInfoStore::shared): (WebKit::PluginInfoStore::PluginInfoStore): (WebKit::PluginInfoStore::refresh): (WebKit::PluginInfoStore::getPlugins):
  • UIProcess/Plugins/PluginInfoStore.h: Added.
  • UIProcess/Plugins/mac: Added.
  • WebKit2.xcodeproj/project.pbxproj:
  • WebProcess/WebCoreSupport/WebPlatformStrategies.cpp: (WebKit::WebPlatformStrategies::refreshPlugins): (WebKit::WebPlatformStrategies::getPluginInfo):
  • WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::WebPage):
Location:
trunk/WebKit2
Files:
4 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit2/ChangeLog

    r61583 r61587  
     12010-06-21  Anders Carlsson  <andersca@apple.com>
     2
     3        Reviewed by Sam Weinig.
     4
     5        Add PluginInfoStore class
     6        https://bugs.webkit.org/show_bug.cgi?id=40949
     7
     8        * Shared/WebPreferencesStore.cpp:
     9        (WebKit::WebPreferencesStore::WebPreferencesStore):
     10        * Shared/WebPreferencesStore.h:
     11        (WebKit::WebPreferencesStore::encode):
     12        (WebKit::WebPreferencesStore::decode):
     13        Add plugInsEnabled to the preferences store.
     14
     15        * UIProcess/Plugins: Added.
     16        * UIProcess/Plugins/PluginInfoStore.cpp: Added.
     17        (WebKit::PluginInfoStore::shared):
     18        (WebKit::PluginInfoStore::PluginInfoStore):
     19        (WebKit::PluginInfoStore::refresh):
     20        (WebKit::PluginInfoStore::getPlugins):
     21        * UIProcess/Plugins/PluginInfoStore.h: Added.
     22        * UIProcess/Plugins/mac: Added.
     23        * WebKit2.xcodeproj/project.pbxproj:
     24        * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
     25        (WebKit::WebPlatformStrategies::refreshPlugins):
     26        (WebKit::WebPlatformStrategies::getPluginInfo):
     27        * WebProcess/WebPage/WebPage.cpp:
     28        (WebKit::WebPage::WebPage):
     29
    1302010-06-21  Simon Fraser  <simon.fraser@apple.com>
    231

  • trunk/WebKit2/Shared/WebPreferencesStore.cpp

    r57308 r61587  
    3131    : javaScriptEnabled(true)
    3232    , loadsImagesAutomatically(true)
     33    , pluginsEnabled(true)
    3334    , minimumFontSize(9)
    3435    , minimumLogicalFontSize(9)

  • trunk/WebKit2/Shared/WebPreferencesStore.h

    r57308 r61587  
    4444        encoder.encode(javaScriptEnabled);
    4545        encoder.encode(loadsImagesAutomatically);
     46        encoder.encode(pluginsEnabled);
    4647        encoder.encode(minimumFontSize);
    4748        encoder.encode(minimumLogicalFontSize);
    … …  
    6162            return false;
    6263        if (!decoder.decode(s.loadsImagesAutomatically))
     64            return false;
     65        if (!decoder.decode(s.pluginsEnabled))
    6366            return false;
    6467        if (!decoder.decode(s.minimumFontSize))
    … …  
    8790    bool javaScriptEnabled;
    8891    bool loadsImagesAutomatically;
     92    bool pluginsEnabled;
     93   
    8994    uint32_t minimumFontSize;
    9095    uint32_t minimumLogicalFontSize;

  • trunk/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r61583 r61587  
    3838                1AA1CD07100FA1BA0078DEBC /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1CD06100FA1BA0078DEBC /* Carbon.framework */; };
    3939                1AADE6FF10D855FC00D3D63D /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AADE6FE10D855FC00D3D63D /* ApplicationServices.framework */; };
     40                1AEFCC1211D01F96008219D3 /* PluginInfoStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AEFCC1011D01F96008219D3 /* PluginInfoStore.h */; };
     41                1AEFCC1311D01F96008219D3 /* PluginInfoStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AEFCC1111D01F96008219D3 /* PluginInfoStore.cpp */; };
    4042                1AF3060A111B599E00F96436 /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit2.framework */; };
    4143                5DAD729C116FF86200EE5396 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; };
    … …  
    254256                1AA1CD06100FA1BA0078DEBC /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
    255257                1AADE6FE10D855FC00D3D63D /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; };
     258                1AEFCC1011D01F96008219D3 /* PluginInfoStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginInfoStore.h; sourceTree = "<group>"; };
     259                1AEFCC1111D01F96008219D3 /* PluginInfoStore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginInfoStore.cpp; sourceTree = "<group>"; };
    256260                32DBCF5E0370ADEE00C91783 /* WebKit2Prefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit2Prefix.h; sourceTree = "<group>"; };
    257261                5DAD7294116FF70B00EE5396 /* WebProcess.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebProcess.xcconfig; sourceTree = "<group>"; };
    … …  
    572576                        sourceTree = "<group>";
    573577                };
     578                1AEFCC0511D01F34008219D3 /* Plugins */ = {
     579                        isa = PBXGroup;
     580                        children = (
     581                                1AEFCC0D11D01F41008219D3 /* mac */,
     582                                1AEFCC1011D01F96008219D3 /* PluginInfoStore.h */,
     583                                1AEFCC1111D01F96008219D3 /* PluginInfoStore.cpp */,
     584                        );
     585                        path = Plugins;
     586                        sourceTree = "<group>";
     587                };
     588                1AEFCC0D11D01F41008219D3 /* mac */ = {
     589                        isa = PBXGroup;
     590                        children = (
     591                        );
     592                        path = mac;
     593                        sourceTree = "<group>";
     594                };
    574595                32C88DFF0371C24200C91783 /* Other Sources */ = {
    575596                        isa = PBXGroup;
    … …  
    637658                                BC032DC410F4387C0058C15A /* API */,
    638659                                BC111B18112F5FB400337BAB /* Launcher */,
     660                                1AEFCC0511D01F34008219D3 /* Plugins */,
    639661                                BCCF085C113F3B7500C650C5 /* mac */,
    640662                                BC2652121182608100243E12 /* DrawingAreaProxy.cpp */,
    … …  
    10111033                                BC20528811C943A5008F3375 /* InjectedBundlePageClient.h in Headers */,
    10121034                                1A3E736111CC2659007BD539 /* WebPlatformStrategies.h in Headers */,
     1035                                1AEFCC1211D01F96008219D3 /* PluginInfoStore.h in Headers */,
    10131036                                BCDE059B11CDA8AE00E41AF1 /* WebContextInjectedBundleClient.h in Headers */,
    10141037                                BCB7346E11CEE3FF00EC5002 /* WebProcessProxyMessageKinds.h in Headers */,
    … …  
    11721195                                BC20528911C943A5008F3375 /* InjectedBundlePageClient.cpp in Sources */,
    11731196                                1A3E736211CC2659007BD539 /* WebPlatformStrategies.cpp in Sources */,
     1197                                1AEFCC1311D01F96008219D3 /* PluginInfoStore.cpp in Sources */,
    11741198                                BCDE059C11CDA8AE00E41AF1 /* WebContextInjectedBundleClient.cpp in Sources */,
    11751199                        );

  • trunk/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp

    r61516 r61587  
    2828#if USE(PLATFORM_STRATEGIES)
    2929
     30#include "PluginInfoStore.h"
     31
    3032using namespace WebCore;
    3133
    … …  
    5153void WebPlatformStrategies::refreshPlugins()
    5254{
    53     // FIXME: Implement.
     55    // FIXME: This should call out to the UI process.
     56    PluginInfoStore::shared().refresh();
    5457}
    5558
    5659void WebPlatformStrategies::getPluginInfo(Vector<WebCore::PluginInfo>& plugins)
    5760{
    58     // FIXME: Implement.
     61    // FIXME: This should call out to the UI process.
     62    PluginInfoStore::shared().getPlugins(plugins);
    5963}
    6064

  • trunk/WebKit2/WebProcess/WebPage/WebPage.cpp

    r61443 r61587  
    8888    m_page->settings()->setJavaScriptEnabled(store.javaScriptEnabled);
    8989    m_page->settings()->setLoadsImagesAutomatically(store.loadsImagesAutomatically);
     90    m_page->settings()->setPluginsEnabled(store.pluginsEnabled);
    9091    m_page->settings()->setMinimumFontSize(store.minimumFontSize);
    9192    m_page->settings()->setMinimumLogicalFontSize(store.minimumLogicalFontSize);
Note: See TracChangeset for help on using the changeset viewer.