Changeset 92492 in webkit


Ignore:
Timestamp:
Aug 5, 2011 11:44:45 AM (13 years ago)
Author:
andersca@apple.com
Message:

Remove PluginHalter
​https://bugs.webkit.org/show_bug.cgi?id=65729

Reviewed by Darin Adler.

Source/WebCore:

Remove plug-in halter and associated classes.

  • CMakeLists.txt:
  • GNUmakefile.list.am:
  • WebCore.exp.in:
  • WebCore.pro:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • loader/EmptyClients.h:
  • page/HaltablePlugin.h: Removed.
  • page/Page.cpp:

(WebCore::Page::Page):

  • page/Page.h:
  • page/PluginHalter.cpp: Removed.
  • page/PluginHalter.h: Removed.
  • page/PluginHalterClient.h: Removed.
  • page/Settings.cpp:

(WebCore::Settings::Settings):

  • page/Settings.h:
  • plugins/PluginView.cpp:

(WebCore::PluginView::start):
(WebCore::PluginView::stop):
(WebCore::PluginView::PluginView):

  • plugins/PluginView.h:
  • plugins/PluginViewNone.cpp:
  • plugins/gtk/PluginViewGtk.cpp:
  • plugins/qt/PluginViewQt.cpp:
  • plugins/win/PluginViewWin.cpp:
  • rendering/RenderWidget.cpp:

(WebCore::RenderWidget::paint):

  • rendering/RenderWidget.h:

Source/WebKit:

Remove deleted files from Xcode project.

  • WebKit.xcodeproj/project.pbxproj:

Source/WebKit/mac:

Remove plug-in halter and associated classes.

  • Plugins/WebBaseNetscapePluginView.h:
  • Plugins/WebBaseNetscapePluginView.mm:

(-[WebBaseNetscapePluginView initWithFrame:pluginPackage:URL:baseURL:MIMEType:attributeKeys:attributeValues:loadManually:element:WebCore::]):
(-[WebBaseNetscapePluginView start]):
(-[WebBaseNetscapePluginView stop]):

  • WebCoreSupport/WebPluginHalterClient.h: Removed.
  • WebCoreSupport/WebPluginHalterClient.mm: Removed.
  • WebView/WebPreferenceKeysPrivate.h:
  • WebView/WebPreferences.mm:

(+[WebPreferences initialize]):

  • WebView/WebPreferencesPrivate.h:
  • WebView/WebView.mm:

(-[WebView _commonInitializationWithFrameName:groupName:usesDocumentViews:]):
(-[WebView _preferencesChanged:]):

  • WebView/WebViewPrivate.h:

Source/WebKit/win:

Remove plug-in halter and associated classes.

  • Interfaces/IWebPluginHalterDelegate.idl: Removed.
  • Interfaces/IWebPreferencesPrivate.idl:
  • Interfaces/IWebViewPrivate.idl:
  • Interfaces/WebKit.idl:
  • WebCoreSupport/WebPluginHalterClient.cpp: Removed.
  • WebCoreSupport/WebPluginHalterClient.h: Removed.
  • WebKit.vcproj/Interfaces.vcproj:
  • WebKit.vcproj/WebKit.vcproj:
  • WebPreferenceKeysPrivate.h:
  • WebPreferences.cpp:

(WebPreferences::initializeDefaultSettings):

  • WebPreferences.h:
  • WebView.cpp:

(WebView::close):
(WebView::initWithFrame):
(WebView::notifyPreferencesChanged):
(WebView::unused1):
(WebView::unused2):
(WebView::unused3):
(WebView::unused4):
(WebView::unused5):

  • WebView.h:

Source/WebKit/wx:

Don't include PluginHalterClient.h, it's been removed.

  • WebView.cpp:

Tools:

Remove call to set the allowed plug-in run time.

  • DumpRenderTree/mac/DumpRenderTree.mm:

(resetDefaultsToConsistentValues):

Location:
trunk
Files:
9 deleted
45 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeLists.txt

    r92457 r92492  
    993993    page/PerformanceNavigation.cpp
    994994    page/PerformanceTiming.cpp
    995     page/PluginHalter.cpp
    996995    page/PrintContext.cpp
    997996    page/Screen.cpp

  • trunk/Source/WebCore/ChangeLog

    r92487 r92492  
     12011-08-05  Anders Carlsson  <andersca@apple.com>
     2
     3        Remove PluginHalter
     4        https://bugs.webkit.org/show_bug.cgi?id=65729
     5
     6        Reviewed by Darin Adler.
     7
     8        Remove plug-in halter and associated classes.
     9
     10        * CMakeLists.txt:
     11        * GNUmakefile.list.am:
     12        * WebCore.exp.in:
     13        * WebCore.pro:
     14        * WebCore.vcproj/WebCore.vcproj:
     15        * WebCore.xcodeproj/project.pbxproj:
     16        * loader/EmptyClients.h:
     17        * page/HaltablePlugin.h: Removed.
     18        * page/Page.cpp:
     19        (WebCore::Page::Page):
     20        * page/Page.h:
     21        * page/PluginHalter.cpp: Removed.
     22        * page/PluginHalter.h: Removed.
     23        * page/PluginHalterClient.h: Removed.
     24        * page/Settings.cpp:
     25        (WebCore::Settings::Settings):
     26        * page/Settings.h:
     27        * plugins/PluginView.cpp:
     28        (WebCore::PluginView::start):
     29        (WebCore::PluginView::stop):
     30        (WebCore::PluginView::PluginView):
     31        * plugins/PluginView.h:
     32        * plugins/PluginViewNone.cpp:
     33        * plugins/gtk/PluginViewGtk.cpp:
     34        * plugins/qt/PluginViewQt.cpp:
     35        * plugins/win/PluginViewWin.cpp:
     36        * rendering/RenderWidget.cpp:
     37        (WebCore::RenderWidget::paint):
     38        * rendering/RenderWidget.h:
     39
    1402011-08-05  Jochen Eisinger  <jochen@chromium.org>
    241

  • trunk/Source/WebCore/GNUmakefile.list.am

    r92457 r92492  
    23112311        Source/WebCore/page/PerformanceTiming.cpp \
    23122312        Source/WebCore/page/PerformanceTiming.h \
    2313         Source/WebCore/page/PluginHalter.cpp \
    2314         Source/WebCore/page/PluginHalter.h \
    2315         Source/WebCore/page/PluginHalterClient.h \
    23162313        Source/WebCore/page/PositionCallback.h \
    23172314        Source/WebCore/page/PositionError.h \

  • trunk/Source/WebCore/WebCore.exp.in

    r92477 r92492  
    286286__ZN7WebCore12RenderObject16repaintRectangleERKNS_7IntRectEb
    287287__ZN7WebCore12RenderObject23absoluteBoundingBoxRectEb
    288 __ZN7WebCore12RenderWidget19showSubstituteImageEN3WTF10PassRefPtrINS_5ImageEEE
    289288__ZN7WebCore12RenderWidget28resumeWidgetHierarchyUpdatesEv
    290289__ZN7WebCore12RenderWidget29suspendWidgetHierarchyUpdatesEv
    … …  
    699698__ZN7WebCore4Page11PageClientsD1Ev
    700699__ZN7WebCore4Page12setGroupNameERKN3WTF6StringE
    701 __ZN7WebCore4Page13didStopPluginEPNS_14HaltablePluginE
    702 __ZN7WebCore4Page14didStartPluginEPNS_14HaltablePluginE
    703700__ZN7WebCore4Page14setMediaVolumeEf
    704701__ZN7WebCore4Page15addSchedulePairEN3WTF10PassRefPtrINS_12SchedulePairEEE
    … …  
    899896__ZN7WebCore8Settings23setNeedsTigerMailQuirksEb
    900897__ZN7WebCore8Settings23setPictographFontFamilyERKN3WTF12AtomicStringE11UScriptCode
    901 __ZN7WebCore8Settings23setPluginAllowedRunTimeEj
    902898__ZN7WebCore8Settings23setUsesEncodingDetectorEb
    903899__ZN7WebCore8Settings24setApplicationChromeModeEb

  • trunk/Source/WebCore/WebCore.pro

    r92457 r92492  
    942942    page/PerformanceNavigation.cpp \
    943943    page/PerformanceTiming.cpp \
    944     page/PluginHalter.cpp \
    945944    page/PrintContext.cpp \
    946945    page/Screen.cpp \

  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r92457 r92492  
    2573125731                        </File>
    2573225732                        <File
    25733                                 RelativePath="..\page\PluginHalter.cpp"
    25734                                 >
    25735                         </File>
    25736                         <File
    25737                                 RelativePath="..\page\PluginHalter.h"
    25738                                 >
    25739                         </File>
    25740                         <File
    25741                                 RelativePath="..\page\PluginHalterClient.h"
    25742                                 >
    25743                         </File>
    25744                         <File
    2574525733                                RelativePath="..\page\PositionCallback.h"
    2574625734                                >

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r92477 r92492  
    17311731                767F99BE11A1194A0080C51D /* WebSocketHandshakeResponse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 767F99BD11A1194A0080C51D /* WebSocketHandshakeResponse.cpp */; };
    17321732                767F99C011A119560080C51D /* WebSocketHandshakeResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 767F99BF11A119560080C51D /* WebSocketHandshakeResponse.h */; };
    1733                 7693BAD2106C2DCA007B0823 /* HaltablePlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 7693BACE106C2DCA007B0823 /* HaltablePlugin.h */; settings = {ATTRIBUTES = (Private, ); }; };
    1734                 7693BAD3106C2DCA007B0823 /* PluginHalter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7693BACF106C2DCA007B0823 /* PluginHalter.cpp */; };
    1735                 7693BAD4106C2DCA007B0823 /* PluginHalter.h in Headers */ = {isa = PBXBuildFile; fileRef = 7693BAD0106C2DCA007B0823 /* PluginHalter.h */; };
    1736                 7693BAD5106C2DCA007B0823 /* PluginHalterClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 7693BAD1106C2DCA007B0823 /* PluginHalterClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
    17371733                7694563C1214D97C0007CBAE /* JSDOMTokenList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7694563A1214D97C0007CBAE /* JSDOMTokenList.cpp */; };
    17381734                7694563D1214D97C0007CBAE /* JSDOMTokenList.h in Headers */ = {isa = PBXBuildFile; fileRef = 7694563B1214D97C0007CBAE /* JSDOMTokenList.h */; };
    … …  
    83678363                767F99BD11A1194A0080C51D /* WebSocketHandshakeResponse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSocketHandshakeResponse.cpp; sourceTree = "<group>"; };
    83688364                767F99BF11A119560080C51D /* WebSocketHandshakeResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketHandshakeResponse.h; sourceTree = "<group>"; };
    8369                 7693BACE106C2DCA007B0823 /* HaltablePlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HaltablePlugin.h; sourceTree = "<group>"; };
    8370                 7693BACF106C2DCA007B0823 /* PluginHalter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginHalter.cpp; sourceTree = "<group>"; };
    8371                 7693BAD0106C2DCA007B0823 /* PluginHalter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginHalter.h; sourceTree = "<group>"; };
    8372                 7693BAD1106C2DCA007B0823 /* PluginHalterClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginHalterClient.h; sourceTree = "<group>"; };
    83738365                7694563A1214D97C0007CBAE /* JSDOMTokenList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMTokenList.cpp; sourceTree = "<group>"; };
    83748366                7694563B1214D97C0007CBAE /* JSDOMTokenList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMTokenList.h; sourceTree = "<group>"; };
    … …  
    1461114603                                C50B561412119D23008B46E0 /* GroupSettings.cpp */,
    1461214604                                C50B561512119D23008B46E0 /* GroupSettings.h */,
    14613                                 7693BACE106C2DCA007B0823 /* HaltablePlugin.h */,
    1461414605                                BC94D1500C275C8B006BC617 /* History.cpp */,
    1461514606                                BC94D1510C275C8B006BC617 /* History.h */,
    … …  
    1466114652                                8AF4E55911DC5A63000ED3DE /* PerformanceTiming.h */,
    1466214653                                8AF4E55A11DC5A63000ED3DE /* PerformanceTiming.idl */,
    14663                                 7693BACF106C2DCA007B0823 /* PluginHalter.cpp */,
    14664                                 7693BAD0106C2DCA007B0823 /* PluginHalter.h */,
    14665                                 7693BAD1106C2DCA007B0823 /* PluginHalterClient.h */,
    1466614654                                FE80D7BD0E9C1F25000D6F75 /* PositionCallback.h */,
    1466714655                                593AB6971355CD9200FC8211 /* PositionCallback.idl */,
    … …  
    2151221500                                77A17A7B12F2890B004E02F6 /* GraphicsTypes3D.h in Headers */,
    2151321501                                C50B561712119D23008B46E0 /* GroupSettings.h in Headers */,
    21514                                 7693BAD2106C2DCA007B0823 /* HaltablePlugin.h in Headers */,
    2151521502                                8482B7461198C35400BFB005 /* HashChangeEvent.h in Headers */,
    2151621503                                A8748BE012CBF2DC001FBA41 /* HashTools.h in Headers */,
    … …  
    2250422491                                A9C6E4F40D745E48006442E9 /* PluginData.h in Headers */,
    2250522492                                97205ABC1239292700B17380 /* PluginDocument.h in Headers */,
    22506                                 7693BAD4106C2DCA007B0823 /* PluginHalter.h in Headers */,
    22507                                 7693BAD5106C2DCA007B0823 /* PluginHalterClient.h in Headers */,
    2250822493                                1ADA14110E1AE5D900023EE5 /* PluginMainThreadScheduler.h in Headers */,
    2250922494                                1AA8799011CBE846003C664F /* PluginStrategy.h in Headers */,
    … …  
    2548425469                                A9C6E4F30D745E48006442E9 /* PluginData.cpp in Sources */,
    2548525470                                97205ABB1239292700B17380 /* PluginDocument.cpp in Sources */,
    25486                                 7693BAD3106C2DCA007B0823 /* PluginHalter.cpp in Sources */,
    2548725471                                1ADA14100E1AE5D900023EE5 /* PluginMainThreadScheduler.cpp in Sources */,
    2548825472                                76FF17E311235673001D61B5 /* PluginViewNone.cpp in Sources */,

  • trunk/Source/WebCore/loader/EmptyClients.h

    r92477 r92492  
    4343#include "FrameNetworkingContext.h"
    4444#include "InspectorClient.h"
    45 #include "PluginHalterClient.h"
    4645#include "PopupMenu.h"
    4746#include "ResourceError.h"

  • trunk/Source/WebCore/page/Page.cpp

    r90872 r92492  
    5858#include "PageGroup.h"
    5959#include "PluginData.h"
    60 #include "PluginHalter.h"
    6160#include "PluginView.h"
    6261#include "PluginViewBase.h"
    … …  
    177176    allPages->add(this);
    178177
    179     if (pageClients.pluginHalterClient) {
    180         m_pluginHalter = adoptPtr(new PluginHalter(pageClients.pluginHalterClient.release()));
    181         m_pluginHalter->setPluginAllowedRunTime(m_settings->pluginAllowedRunTime());
    182     }
    183 
    184178#ifndef NDEBUG
    185179    pageCounter.increment();
    … …  
    887881}
    888882
    889 void Page::pluginAllowedRunTimeChanged()
    890 {
    891     if (m_pluginHalter)
    892         m_pluginHalter->setPluginAllowedRunTime(m_settings->pluginAllowedRunTime());
    893 }
    894 
    895 void Page::didStartPlugin(HaltablePlugin* obj)
    896 {
    897     if (m_pluginHalter)
    898         m_pluginHalter->didStartPlugin(obj);
    899 }
    900 
    901 void Page::didStopPlugin(HaltablePlugin* obj)
    902 {
    903     if (m_pluginHalter)
    904         m_pluginHalter->didStopPlugin(obj);
    905 }
    906 
    907883void Page::addScrollableArea(ScrollableArea* scrollableArea)
    908884{

  • trunk/Source/WebCore/page/Page.h

    r90872 r92492  
    7575    class PageGroup;
    7676    class PluginData;
    77     class PluginHalter;
    78     class PluginHalterClient;
    7977    class ProgressTracker;
    8078    class RenderTheme;
    … …  
    114112            DragClient* dragClient;
    115113            InspectorClient* inspectorClient;
    116             OwnPtr<PluginHalterClient> pluginHalterClient;
    117114            GeolocationClient* geolocationClient;
    118115            DeviceMotionClient* deviceMotionClient;
    … …  
    254251        void privateBrowsingStateChanged();
    255252
    256         void didStartPlugin(HaltablePlugin*);
    257         void didStopPlugin(HaltablePlugin*);
    258         void pluginAllowedRunTimeChanged();
    259 
    260253        static void setDebuggerForAllPages(JSC::Debugger*);
    261254        void setDebugger(JSC::Debugger*);
    … …  
    394387        bool m_canStartMedia;
    395388
    396         OwnPtr<PluginHalter> m_pluginHalter;
    397 
    398389#if ENABLE(DOM_STORAGE)
    399390        RefPtr<StorageNamespace> m_sessionStorage;

  • trunk/Source/WebCore/page/Settings.cpp

    r92375 r92492  
    119119    , m_sessionStorageQuota(StorageMap::noQuota)
    120120#endif
    121     , m_pluginAllowedRunTime(numeric_limits<unsigned>::max())
    122121    , m_editingBehaviorType(editingBehaviorTypeForPlatform())
    123122    , m_maximumHTMLParserDOMTreeDepth(defaultMaximumHTMLParserDOMTreeDepth)
    … …  
    749748}
    750749
    751 void Settings::setPluginAllowedRunTime(unsigned runTime)
    752 {
    753     m_pluginAllowedRunTime = runTime;
    754     m_page->pluginAllowedRunTimeChanged();
    755 }
    756 
    757750#if PLATFORM(WIN) || (OS(WINDOWS) && PLATFORM(WX))
    758751void Settings::setShouldUseHighResolutionTimers(bool shouldUseHighResolutionTimers)

  • trunk/Source/WebCore/page/Settings.h

    r91777 r92492  
    345345#endif
    346346
    347         void setPluginAllowedRunTime(unsigned);
    348         unsigned pluginAllowedRunTime() const { return m_pluginAllowedRunTime; }
    349 
    350347        void setWebAudioEnabled(bool);
    351348        bool webAudioEnabled() const { return m_webAudioEnabled; }
    … …  
    479476        unsigned m_sessionStorageQuota;
    480477#endif
    481         unsigned m_pluginAllowedRunTime;
    482478        unsigned m_editingBehaviorType;
    483479        unsigned m_maximumHTMLParserDOMTreeDepth;

  • trunk/Source/WebCore/plugins/PluginView.cpp

    r90338 r92492  
    272272        return false;
    273273
    274     if (parentFrame()->page())
    275         parentFrame()->page()->didStartPlugin(this);
    276 
    277274    return true;
    278275}
    … …  
    318315    if (!m_isStarted)
    319316        return;
    320 
    321     if (parentFrame()->page())
    322         parentFrame()->page()->didStopPlugin(this);
    323317
    324318    LOG(Plugins, "PluginView::stop(): Stopping plug-in '%s'", m_plugin->name().utf8().data());
    … …  
    881875    , m_manualStream(0)
    882876    , m_isJavaScriptPaused(false)
    883     , m_isHalted(false)
    884     , m_hasBeenHalted(false)
    885877    , m_haveCalledSetWindow(false)
    886878{
    … …  
    12901282#endif
    12911283
    1292 
    1293 Node* PluginView::node() const
    1294 {
    1295     return m_element;
    1296 }
    1297 
    1298 String PluginView::pluginName() const
    1299 {
    1300     return m_plugin->name();
    1301 }
    13021284
    13031285void PluginView::lifeSupportTimerFired(Timer<PluginView>*)

  • trunk/Source/WebCore/plugins/PluginView.h

    r88816 r92492  
    3030
    3131#include "FrameLoadRequest.h"
    32 #include "HaltablePlugin.h"
    3332#include "IntRect.h"
    3433#include "MediaCanStartListener.h"
    … …  
    142141#endif
    143142                     , public PluginManualLoader
    144                      , private HaltablePlugin
    145143                     , private MediaCanStartListener {
    146144    public:
    … …  
    244242        void didFinishLoading();
    245243        void didFail(const ResourceError&);
    246 
    247         // HaltablePlugin
    248         virtual void halt();
    249         virtual void restart();
    250         virtual Node* node() const;
    251         virtual bool isWindowed() const { return m_isWindowed; }
    252         virtual String pluginName() const;
    253 
    254         bool isHalted() const { return m_isHalted; }
    255         bool hasBeenHalted() const { return m_hasBeenHalted; }
    256244
    257245        static bool isCallingPlugin();
    … …  
    462450        bool m_isJavaScriptPaused;
    463451
    464         bool m_isHalted;
    465         bool m_hasBeenHalted;
    466 
    467452        bool m_haveCalledSetWindow;
    468453

  • trunk/Source/WebCore/plugins/PluginViewNone.cpp

    r81040 r92492  
    121121}
    122122
    123 void PluginView::halt()
    124 {
    125 }
    126 
    127 void PluginView::restart()
    128 {
    129 }
    130 
    131123#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
    132124void PluginView::handleFocusInEvent()

  • trunk/Source/WebCore/plugins/gtk/PluginViewGtk.cpp

    r89576 r92492  
    953953}
    954954
    955 void PluginView::halt()
    956 {
    957 }
    958 
    959 void PluginView::restart()
    960 {
    961 }
    962 
    963955} // namespace WebCore

  • trunk/Source/WebCore/plugins/qt/PluginViewQt.cpp

    r89576 r92492  
    10411041}
    10421042
    1043 void PluginView::halt()
    1044 {
    1045 }
    1046 
    1047 void PluginView::restart()
    1048 {
    1049 }
    1050  
    10511043#if USE(ACCELERATED_COMPOSITING)
    10521044PlatformLayer* PluginView::platformLayer() const

  • trunk/Source/WebCore/plugins/win/PluginViewWin.cpp

    r90742 r92492  
    10671067}
    10681068
    1069 void PluginView::halt()
    1070 {
    1071     ASSERT(!m_isHalted);
    1072     ASSERT(m_isStarted);
    1073 
    1074 #if !PLATFORM(QT)
    1075     // Show a screenshot of the plug-in.
    1076     toRenderWidget(m_element->renderer())->showSubstituteImage(snapshot());
    1077 #endif
    1078 
    1079     m_isHalted = true;
    1080     m_hasBeenHalted = true;
    1081 
    1082     stop();
    1083     platformDestroy();
    1084 }
    1085 
    1086 void PluginView::restart()
    1087 {
    1088     ASSERT(!m_isStarted);
    1089     ASSERT(m_isHalted);
    1090 
    1091     // Clear any substitute image.
    1092     toRenderWidget(m_element->renderer())->showSubstituteImage(0);
    1093 
    1094     m_isHalted = false;
    1095     m_haveUpdatedPluginWidget = false;
    1096     start();
    1097 }
    1098 
    10991069} // namespace WebCore

  • trunk/Source/WebCore/rendering/RenderWidget.cpp

    r90675 r92492  
    217217}
    218218
    219 void RenderWidget::showSubstituteImage(PassRefPtr<Image> prpImage)
    220 {
    221     m_substituteImage = prpImage;
    222     repaint();
    223 }
    224 
    225219void RenderWidget::notifyWidget(WidgetNotification notification)
    226220{
    … …  
    269263        // Tell the widget to paint now.  This is the only time the widget is allowed
    270264        // to paint itself.  That way it will composite properly with z-indexed layers.
    271         if (m_substituteImage)
    272             paintInfo.context->drawImage(m_substituteImage.get(), style()->colorSpace(), m_widget->frameRect());
    273         else {
    274             LayoutPoint widgetLocation = m_widget->frameRect().location();
    275             LayoutPoint paintLocation(adjustedPaintOffset.x() + borderLeft() + paddingLeft(), adjustedPaintOffset.y() + borderTop() + paddingTop());
    276             LayoutRect paintRect = paintInfo.rect;
    277 
    278             LayoutSize widgetPaintOffset = paintLocation - widgetLocation;
    279             // When painting widgets into compositing layers, tx and ty are relative to the enclosing compositing layer,
    280             // not the root. In this case, shift the CTM and adjust the paintRect to be root-relative to fix plug-in drawing.
    281             if (!widgetPaintOffset.isZero()) {
    282                 paintInfo.context->translate(widgetPaintOffset);
    283                 paintRect.move(-widgetPaintOffset);
    284             }
    285             m_widget->paint(paintInfo.context, paintRect);
    286 
    287             if (!widgetPaintOffset.isZero())
    288                 paintInfo.context->translate(-widgetPaintOffset);
     265        LayoutPoint widgetLocation = m_widget->frameRect().location();
     266        LayoutPoint paintLocation(adjustedPaintOffset.x() + borderLeft() + paddingLeft(), adjustedPaintOffset.y() + borderTop() + paddingTop());
     267        LayoutRect paintRect = paintInfo.rect;
     268
     269        LayoutSize widgetPaintOffset = paintLocation - widgetLocation;
     270        // When painting widgets into compositing layers, tx and ty are relative to the enclosing compositing layer,
     271        // not the root. In this case, shift the CTM and adjust the paintRect to be root-relative to fix plug-in drawing.
     272        if (!widgetPaintOffset.isZero()) {
     273            paintInfo.context->translate(widgetPaintOffset);
     274            paintRect.move(-widgetPaintOffset);
    289275        }
     276        m_widget->paint(paintInfo.context, paintRect);
     277
     278        if (!widgetPaintOffset.isZero())
     279            paintInfo.context->translate(-widgetPaintOffset);
    290280
    291281        if (m_widget->isFrameView()) {

  • trunk/Source/WebCore/rendering/RenderWidget.h

    r90675 r92492  
    4242    IntRect windowClipRect() const;
    4343
    44     void showSubstituteImage(PassRefPtr<Image>);
    45 
    4644    void notifyWidget(WidgetNotification);
    4745   
    … …  
    7573
    7674    RefPtr<Widget> m_widget;
    77     RefPtr<Image> m_substituteImage;
    7875    FrameView* m_frameView;
    7976    IntRect m_clipRect; // The rectangle needs to remain correct after scrolling, so it is stored in content view coordinates, and not clipped to window.

  • trunk/Source/WebKit/ChangeLog

    r91949 r92492  
     12011-08-05  Anders Carlsson  <andersca@apple.com>
     2
     3        Remove PluginHalter
     4        https://bugs.webkit.org/show_bug.cgi?id=65729
     5
     6        Reviewed by Darin Adler.
     7
     8        Remove deleted files from Xcode project.
     9
     10        * WebKit.xcodeproj/project.pbxproj:
     11
    1122011-07-28  Tony Chang  <tony@chromium.org>
    213

  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r89271 r92492  
    1212                06693DDC0BFBA85200216072 /* WebInspectorClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 06693DDA0BFBA85200216072 /* WebInspectorClient.h */; };
    1313                06693DDD0BFBA85200216072 /* WebInspectorClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 06693DDB0BFBA85200216072 /* WebInspectorClient.mm */; };
    14                 0A2D87FD107AF52B00CDDEE3 /* WebPluginHalterClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A2D87FB107AF52B00CDDEE3 /* WebPluginHalterClient.h */; };
    15                 0A2D87FE107AF52B00CDDEE3 /* WebPluginHalterClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0A2D87FC107AF52B00CDDEE3 /* WebPluginHalterClient.mm */; };
    1614                0AB752370FA2E4DB00D7CBB1 /* WebNetscapeContainerCheckContextInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 0AB752350FA2E4DB00D7CBB1 /* WebNetscapeContainerCheckContextInfo.h */; };
    1715                0AB752380FA2E4DB00D7CBB1 /* WebNetscapeContainerCheckContextInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0AB752360FA2E4DB00D7CBB1 /* WebNetscapeContainerCheckContextInfo.mm */; };
    … …  
    390388                06693DDA0BFBA85200216072 /* WebInspectorClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebInspectorClient.h; sourceTree = "<group>"; };
    391389                06693DDB0BFBA85200216072 /* WebInspectorClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebInspectorClient.mm; sourceTree = "<group>"; };
    392                 0A2D87FB107AF52B00CDDEE3 /* WebPluginHalterClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginHalterClient.h; sourceTree = "<group>"; };
    393                 0A2D87FC107AF52B00CDDEE3 /* WebPluginHalterClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPluginHalterClient.mm; sourceTree = "<group>"; };
    394390                0AB752350FA2E4DB00D7CBB1 /* WebNetscapeContainerCheckContextInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNetscapeContainerCheckContextInfo.h; sourceTree = "<group>"; };
    395391                0AB752360FA2E4DB00D7CBB1 /* WebNetscapeContainerCheckContextInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebNetscapeContainerCheckContextInfo.mm; sourceTree = "<group>"; };
    … …  
    13231319                                1AA879B411CBE9BF003C664F /* WebPlatformStrategies.h */,
    13241320                                1AA879B511CBE9BF003C664F /* WebPlatformStrategies.mm */,
    1325                                 0A2D87FB107AF52B00CDDEE3 /* WebPluginHalterClient.h */,
    1326                                 0A2D87FC107AF52B00CDDEE3 /* WebPluginHalterClient.mm */,
    13271321                                A5DEFC0711D5331C00885273 /* WebSecurityOrigin.mm */,
    13281322                                A5DEFC0811D5331C00885273 /* WebSecurityOriginInternal.h */,
    … …  
    15761570                                939810370824BF01008DF038 /* WebPluginController.h in Headers */,
    15771571                                939810380824BF01008DF038 /* WebPluginDatabase.h in Headers */,
    1578                                 0A2D87FD107AF52B00CDDEE3 /* WebPluginHalterClient.h in Headers */,
    15791572                                939810390824BF01008DF038 /* WebPluginPackage.h in Headers */,
    15801573                                225F881509F97E8A00423A40 /* WebPluginPrivate.h in Headers */,
    … …  
    19681961                                939810DA0824BF01008DF038 /* WebPluginController.mm in Sources */,
    19691962                                939810DB0824BF01008DF038 /* WebPluginDatabase.mm in Sources */,
    1970                                 0A2D87FE107AF52B00CDDEE3 /* WebPluginHalterClient.mm in Sources */,
    19711963                                939810DC0824BF01008DF038 /* WebPluginPackage.mm in Sources */,
    19721964                                1A77B02F0EE7730500C8A1F9 /* WebPluginRequest.m in Sources */,

  • trunk/Source/WebKit/mac/ChangeLog

    r92432 r92492  
     12011-08-05  Anders Carlsson  <andersca@apple.com>
     2
     3        Remove PluginHalter
     4        https://bugs.webkit.org/show_bug.cgi?id=65729
     5
     6        Reviewed by Darin Adler.
     7
     8        Remove plug-in halter and associated classes.
     9
     10        * Plugins/WebBaseNetscapePluginView.h:
     11        * Plugins/WebBaseNetscapePluginView.mm:
     12        (-[WebBaseNetscapePluginView initWithFrame:pluginPackage:URL:baseURL:MIMEType:attributeKeys:attributeValues:loadManually:element:WebCore::]):
     13        (-[WebBaseNetscapePluginView start]):
     14        (-[WebBaseNetscapePluginView stop]):
     15        * WebCoreSupport/WebPluginHalterClient.h: Removed.
     16        * WebCoreSupport/WebPluginHalterClient.mm: Removed.
     17        * WebView/WebPreferenceKeysPrivate.h:
     18        * WebView/WebPreferences.mm:
     19        (+[WebPreferences initialize]):
     20        * WebView/WebPreferencesPrivate.h:
     21        * WebView/WebView.mm:
     22        (-[WebView _commonInitializationWithFrameName:groupName:usesDocumentViews:]):
     23        (-[WebView _preferencesChanged:]):
     24        * WebView/WebViewPrivate.h:
     25
    1262011-08-04  Mark Rowe  <mrowe@apple.com>
    227

  • trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.h

    r90707 r92492  
    4747}
    4848
    49 class WebHaltablePlugin;
    50 
    5149// Also declared in WebCore/WidgetMac.mm
    5250@interface NSView (Widget)
    … …  
    6967    BOOL _isCompletelyObscured;
    7068    BOOL _isPrivateBrowsingEnabled;
    71     BOOL _isHalted;
    72     BOOL _hasBeenHalted;
    7369    BOOL _snapshotting;
    7470   
    … …  
    7874    RetainPtr<NSURL> _sourceURL;
    7975    RetainPtr<NSImage> _cachedSnapshot;
    80    
    81     OwnPtr<WebHaltablePlugin> _haltable;
    8276   
    8377    NSTrackingRectTag _trackingTag;
    … …  
    123117- (void)stop;
    124118
    125 - (void)halt;
    126 - (void)resumeFromHalt;
    127 - (BOOL)isHalted;
    128 - (BOOL)hasBeenHalted;
    129 
    130119- (void)addWindowObservers;
    131120- (void)removeWindowObservers;

  • trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm

    r92068 r92492  
    5252#import <WebCore/FrameLoader.h>
    5353#import <WebCore/HTMLPlugInElement.h>
    54 #import <WebCore/HaltablePlugin.h>
    5554#import <WebCore/Page.h>
    5655#import <WebCore/ProtectionSpace.h>
    … …  
    7271using namespace WebCore;
    7372
    74 class WebHaltablePlugin : public HaltablePlugin {
    75 public:
    76     WebHaltablePlugin(WebBaseNetscapePluginView* view)
    77         : m_view(view)
    78     {
    79     }
    80    
    81 private:
    82     virtual void halt();
    83     virtual void restart();
    84     virtual Node* node() const;
    85     virtual bool isWindowed() const;
    86     virtual String pluginName() const;
    87 
    88     WebBaseNetscapePluginView* m_view;
    89 };
    90 
    91 void WebHaltablePlugin::halt()
    92 {
    93     [m_view halt];
    94 }
    95 
    96 void WebHaltablePlugin::restart()
    97 {
    98     [m_view resumeFromHalt];
    99 }
    100    
    101 Node* WebHaltablePlugin::node() const
    102 {
    103     return [m_view element];
    104 }
    105 
    106 bool WebHaltablePlugin::isWindowed() const
    107 {
    108     return false;
    109 }
    110 
    111 String WebHaltablePlugin::pluginName() const
    112 {
    113     return [[m_view pluginPackage] pluginInfo].name;
    114 }
    115 
    11673@implementation WebBaseNetscapePluginView
    11774
    … …  
    164121   
    165122    _loadManually = loadManually;
    166     _haltable = adoptPtr(new WebHaltablePlugin(self));
    167123    return self;
    168124}
    … …  
    455411   
    456412    _isStarted = YES;
    457     page->didStartPlugin(_haltable.get());
    458413
    459414    [[self webView] addPluginInstanceView:self];
    … …  
    485440        return;
    486441
    487     if (Frame* frame = core([self webFrame])) {
    488         if (Page* page = frame->page())
    489             page->didStopPlugin(_haltable.get());
    490     }
    491    
    492442    _isStarted = NO;
    493443   
    … …  
    501451   
    502452    [self destroyPlugin];
    503 }
    504 
    505 - (void)halt
    506 {
    507     ASSERT(!_isHalted);
    508     ASSERT(_isStarted);
    509     Element *element = [self element];
    510 #ifndef BUILDING_ON_LEOPARD
    511     CGImageRef cgImage = CGImageRetain([core([self webFrame])->nodeImage(element).get() CGImageForProposedRect:nil context:nil hints:nil]);
    512 #else
    513     RetainPtr<CGImageSourceRef> imageRef(AdoptCF, CGImageSourceCreateWithData((CFDataRef)[core([self webFrame])->nodeImage(element).get() TIFFRepresentation], 0));
    514     CGImageRef cgImage = CGImageSourceCreateImageAtIndex(imageRef.get(), 0, 0);
    515 #endif
    516     ASSERT(cgImage);
    517    
    518     // BitmapImage will release the passed in CGImage on destruction.
    519     RefPtr<Image> nodeImage = BitmapImage::create(cgImage);
    520     ASSERT(element->renderer());
    521     toRenderWidget(element->renderer())->showSubstituteImage(nodeImage);
    522     [self stop];
    523     _isHalted = YES; 
    524     _hasBeenHalted = YES;
    525 }
    526 
    527 - (void)_clearSubstituteImage
    528 {
    529     Element* element = [self element];
    530     if (!element)
    531         return;
    532    
    533     RenderObject* renderer = element->renderer();
    534     if (!renderer)
    535         return;
    536    
    537     toRenderWidget(renderer)->showSubstituteImage(0);
    538 }
    539 
    540 - (void)resumeFromHalt
    541 {
    542     ASSERT(_isHalted);
    543     ASSERT(!_isStarted);
    544     [self start];
    545    
    546     if (_isStarted)
    547         _isHalted = NO;
    548    
    549     ASSERT([self element]->renderer());
    550     // FIXME 7417484: This is a workaround for plug-ins not drawing immediately. We'd like to detect when the
    551     // plug-in actually draws instead of just assuming it will do so within 0.5 seconds of being restarted.
    552     [self performSelector:@selector(_clearSubstituteImage) withObject:nil afterDelay:ClearSubstituteImageDelay];
    553 }
    554 
    555 - (BOOL)isHalted
    556 {
    557     return _isHalted;
    558453}
    559454
    … …  
    595490{
    596491    _cachedSnapshot.clear();
    597 }
    598 
    599 - (BOOL)hasBeenHalted
    600 {
    601     return _hasBeenHalted;
    602492}
    603493

  • trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h

    r91777 r92492  
    9999#define WebKitWebGLEnabledPreferenceKey @"WebKitWebGLEnabled"
    100100#define WebKitAccelerated2dCanvasEnabledPreferenceKey @"WebKitAccelerated2dCanvasEnabled"
    101 #define WebKitPluginAllowedRunTimePreferenceKey @"WebKitPluginAllowedRunTime"
    102101#define WebKitFrameFlatteningEnabledPreferenceKey @"WebKitFrameFlatteningEnabled"
    103102#define WebKitSpatialNavigationEnabledPreferenceKey @"WebKitSpatialNavigationEnabled"

  • trunk/Source/WebKit/mac/WebView/WebPreferences.mm

    r91777 r92492  
    368368        [NSNumber numberWithBool:NO],   WebKitWebGLEnabledPreferenceKey,
    369369        [NSNumber numberWithBool:NO],   WebKitAccelerated2dCanvasEnabledPreferenceKey,
    370         [NSNumber numberWithUnsignedInt:4], WebKitPluginAllowedRunTimePreferenceKey,
    371370        [NSNumber numberWithBool:NO],   WebKitFrameFlatteningEnabledPreferenceKey,
    372371        [NSNumber numberWithBool:NO],   WebKitSpatialNavigationEnabledPreferenceKey,
    … …  
    13341333}
    13351334
    1336 - (unsigned)pluginAllowedRunTime
    1337 {
    1338     return [self _integerValueForKey:WebKitPluginAllowedRunTimePreferenceKey];
    1339 }
    1340 
    1341 - (void)setPluginAllowedRunTime:(unsigned)allowedRunTime
    1342 {
    1343     return [self _setIntegerValue:allowedRunTime forKey:WebKitPluginAllowedRunTimePreferenceKey];
    1344 }
    1345 
    13461335- (BOOL)isFrameFlatteningEnabled
    13471336{

  • trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h

    r91777 r92492  
    127127- (void)setExperimentalNotificationsEnabled:(BOOL)notificationsEnabled;
    128128
    129 - (unsigned)pluginAllowedRunTime;
    130 - (void)setPluginAllowedRunTime:(unsigned)allowedRunTime;
    131 
    132129- (BOOL)isFrameFlatteningEnabled;
    133130- (void)setFrameFlatteningEnabled:(BOOL)flag;

  • trunk/Source/WebKit/mac/WebView/WebView.mm

    r92068 r92492  
    9292#import "WebPlatformStrategies.h"
    9393#import "WebPluginDatabase.h"
    94 #import "WebPluginHalterClient.h"
    9594#import "WebPolicyDelegate.h"
    9695#import "WebPreferenceKeysPrivate.h"
    … …  
    745744    pageClients.dragClient = new WebDragClient(self);
    746745    pageClients.inspectorClient = new WebInspectorClient(self);
    747     pageClients.pluginHalterClient = adoptPtr(new WebPluginHalterClient(self));
    748746#if ENABLE(CLIENT_BASED_GEOLOCATION)
    749747    pageClients.geolocationClient = new WebGeolocationClient(self);
    … …  
    15641562    settings->setShowDebugBorders([preferences showDebugBorders]);
    15651563    settings->setShowRepaintCounter([preferences showRepaintCounter]);
    1566     settings->setPluginAllowedRunTime([preferences pluginAllowedRunTime]);
    15671564    settings->setWebAudioEnabled([preferences webAudioEnabled]);
    15681565    settings->setWebGLEnabled([preferences webGLEnabled]);
    … …  
    25382535{
    25392536    return _private->includesFlattenedCompositingLayersWhenDrawingToBitmap;
    2540 }
    2541 
    2542 #if ENABLE(NETSCAPE_PLUGIN_API)
    2543 static WebBaseNetscapePluginView *_pluginViewForNode(DOMNode *node)
    2544 {
    2545     if (!node)
    2546         return nil;
    2547    
    2548     Node* coreNode = core(node);
    2549     if (!coreNode)
    2550         return nil;
    2551    
    2552     RenderObject* renderer = coreNode->renderer();
    2553     if (!renderer || !renderer->isWidget())
    2554         return nil;
    2555    
    2556     Widget* widget = toRenderWidget(renderer)->widget();
    2557     if (!widget || !widget->platformWidget())
    2558         return nil;
    2559    
    2560     NSView *view = widget->platformWidget();
    2561     if (![view isKindOfClass:[WebBaseNetscapePluginView class]])
    2562         return nil;
    2563    
    2564     return (WebBaseNetscapePluginView *)view;
    2565 }
    2566 #endif // ENABLE(NETSCAPE_PLUGIN_API)
    2567 
    2568 + (BOOL)_isNodeHaltedPlugin:(DOMNode *)node
    2569 {
    2570 #if ENABLE(NETSCAPE_PLUGIN_API)
    2571     return [_pluginViewForNode(node) isHalted];
    2572 #else
    2573     return YES;
    2574 #endif
    2575 }
    2576 
    2577 + (BOOL)_hasPluginForNodeBeenHalted:(DOMNode *)node
    2578 {
    2579 #if ENABLE(NETSCAPE_PLUGIN_API)
    2580     return [_pluginViewForNode(node) hasBeenHalted];
    2581 #else
    2582     return YES;
    2583 #endif
    2584 }
    2585 + (void)_restartHaltedPluginForNode:(DOMNode *)node
    2586 {
    2587 #if ENABLE(NETSCAPE_PLUGIN_API)
    2588     if (!node)
    2589         return;
    2590    
    2591     [_pluginViewForNode(node) resumeFromHalt];
    2592 #endif
    25932537}
    25942538

  • trunk/Source/WebKit/mac/WebView/WebViewPrivate.h

    r90129 r92492  
    504504- (BOOL)_includesFlattenedCompositingLayersWhenDrawingToBitmap;
    505505
    506 // SPI for PluginHalter
    507 + (BOOL)_isNodeHaltedPlugin:(DOMNode *)node;
    508 + (BOOL)_hasPluginForNodeBeenHalted:(DOMNode *)node;
    509 + (void)_restartHaltedPluginForNode:(DOMNode *)node;
    510 
    511506// Which pasteboard text is coming from in editing delegate methods such as shouldInsertNode.
    512507- (NSPasteboard *)_insertionPasteboard;

  • trunk/Source/WebKit/win/ChangeLog

    r92414 r92492  
     12011-08-05  Anders Carlsson  <andersca@apple.com>
     2
     3        Remove PluginHalter
     4        https://bugs.webkit.org/show_bug.cgi?id=65729
     5
     6        Reviewed by Darin Adler.
     7
     8        Remove plug-in halter and associated classes.
     9
     10        * Interfaces/IWebPluginHalterDelegate.idl: Removed.
     11        * Interfaces/IWebPreferencesPrivate.idl:
     12        * Interfaces/IWebViewPrivate.idl:
     13        * Interfaces/WebKit.idl:
     14        * WebCoreSupport/WebPluginHalterClient.cpp: Removed.
     15        * WebCoreSupport/WebPluginHalterClient.h: Removed.
     16        * WebKit.vcproj/Interfaces.vcproj:
     17        * WebKit.vcproj/WebKit.vcproj:
     18        * WebPreferenceKeysPrivate.h:
     19        * WebPreferences.cpp:
     20        (WebPreferences::initializeDefaultSettings):
     21        * WebPreferences.h:
     22        * WebView.cpp:
     23        (WebView::close):
     24        (WebView::initWithFrame):
     25        (WebView::notifyPreferencesChanged):
     26        (WebView::unused1):
     27        (WebView::unused2):
     28        (WebView::unused3):
     29        (WebView::unused4):
     30        (WebView::unused5):
     31        * WebView.h:
     32
    1332011-08-04  Jeff Miller  <jeffm@apple.com>
    234

  • trunk/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl

    r91232 r92492  
    9393    HRESULT setPreferenceForTest([in] BSTR key, [in] BSTR value);
    9494
    95     HRESULT setPluginAllowedRunTime([in] UINT allowedRunTime);
    96     HRESULT pluginAllowedRunTime([out, retval] UINT* allowedRunTime);
     95    HRESULT unused1();
     96    HRESULT unused2();
    9797
    9898    HRESULT setAcceleratedCompositingEnabled([in] BOOL);

  • trunk/Source/WebKit/win/Interfaces/IWebViewPrivate.idl

    r85691 r92492  
    4343interface IWebInspector;
    4444interface IWebInspectorPrivate;
    45 interface IWebPluginHalterDelegate;
    4645interface IWebURLRequest;
    4746interface IWebView;
    … …  
    198197    HRESULT removeAllUserContentFromGroup([in] BSTR groupName);
    199198
    200     HRESULT setPluginHalterDelegate([in] IWebPluginHalterDelegate* d);
    201     HRESULT pluginHalterDelegate([retval, out] IWebPluginHalterDelegate** d);
     199    HRESULT unused1();
     200    HRESULT unused2();
    202201
    203202    // If rect is 0, the entire backing store will be invalidated.
    … …  
    220219    HRESULT addVisitedLinks([in] BSTR* visitedURLs, [in] unsigned visitedURLCount);
    221220
    222     HRESULT isNodeHaltedPlugin([in] IDOMNode*, [retval, out] BOOL*);
    223     HRESULT restartHaltedPluginForNode([in] IDOMNode*);
    224     HRESULT hasPluginForNodeBeenHalted([in] IDOMNode*, [retval, out] BOOL*);
     221    HRESULT unused3();
     222    HRESULT unused4();
     223    HRESULT unused5();
    225224
    226225    HRESULT setGeolocationProvider([in] IWebGeolocationProvider* locationProvider);

  • trunk/Source/WebKit/win/Interfaces/WebKit.idl

    r85947 r92492  
    110110#include "IWebNotificationCenter.idl"
    111111#include "IWebNotificationObserver.idl"
    112 #include "IWebPluginHalterDelegate.idl"
    113112#include "IWebPolicyDelegate.idl"
    114113#include "IWebPolicyDelegatePrivate.idl"

  • trunk/Source/WebKit/win/WebKit.vcproj/Interfaces.vcproj

    r82477 r92492  
    30663066                </File>
    30673067                <File
    3068                         RelativePath="..\Interfaces\IWebPluginHalterDelegate.idl"
    3069                         >
    3070                         <FileConfiguration
    3071                                 Name="Debug|Win32"
    3072                                 ExcludedFromBuild="true"
    3073                                 >
    3074                                 <Tool
    3075                                         Name="VCMIDLTool"
    3076                                 />
    3077                         </FileConfiguration>
    3078                         <FileConfiguration
    3079                                 Name="Release|Win32"
    3080                                 ExcludedFromBuild="true"
    3081                                 >
    3082                                 <Tool
    3083                                         Name="VCMIDLTool"
    3084                                 />
    3085                         </FileConfiguration>
    3086                         <FileConfiguration
    3087                                 Name="Production|Win32"
    3088                                 ExcludedFromBuild="true"
    3089                                 >
    3090                                 <Tool
    3091                                         Name="VCMIDLTool"
    3092                                 />
    3093                         </FileConfiguration>
    3094                         <FileConfiguration
    3095                                 Name="Debug_All|Win32"
    3096                                 ExcludedFromBuild="true"
    3097                                 >
    3098                                 <Tool
    3099                                         Name="VCMIDLTool"
    3100                                 />
    3101                         </FileConfiguration>
    3102                         <FileConfiguration
    3103                                 Name="Release_Cairo_CFLite|Win32"
    3104                                 ExcludedFromBuild="true"
    3105                                 >
    3106                                 <Tool
    3107                                         Name="VCMIDLTool"
    3108                                 />
    3109                         </FileConfiguration>
    3110                         <FileConfiguration
    3111                                 Name="Debug_Cairo_CFLite|Win32"
    3112                                 ExcludedFromBuild="true"
    3113                                 >
    3114                                 <Tool
    3115                                         Name="VCMIDLTool"
    3116                                 />
    3117                         </FileConfiguration>
    3118                 </File>
    3119                 <File
    31203068                        RelativePath="..\Interfaces\IWebPolicyDelegate.idl"
    31213069                        >

  • trunk/Source/WebKit/win/WebKit.vcproj/WebKit.vcproj

    r85699 r92492  
    12441244                                >
    12451245                        </File>
    1246                         <File
    1247                                 RelativePath="..\WebCoreSupport\WebPluginHalterClient.cpp"
    1248                                 >
    1249                         </File>
    1250                         <File
    1251                                 RelativePath="..\WebCoreSupport\WebPluginHalterClient.h"
    1252                                 >
    1253                         </File>
    12541246                </Filter>
    12551247                <File

  • trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h

    r92414 r92492  
    137137#define WebKitUseHighResolutionTimersPreferenceKey "WebKitUseHighResolutionTimers"
    138138
    139 #define WebKitPluginAllowedRunTimePreferenceKey "WebKitPluginAllowedRunTime"
    140 
    141139#define WebKitFrameFlatteningEnabledPreferenceKey "WebKitFrameFlatteningEnabled"
    142140

  • trunk/Source/WebKit/win/WebPreferences.cpp

    r92414 r92492  
    257257    CFDictionaryAddValue(defaults, CFSTR(WebKitUseHighResolutionTimersPreferenceKey), kCFBooleanTrue);
    258258
    259     RetainPtr<CFStringRef> pluginAllowedRunTime(AdoptCF, CFStringCreateWithFormat(0, 0, CFSTR("%u"), numeric_limits<unsigned>::max()));
    260     CFDictionaryAddValue(defaults, CFSTR(WebKitPluginAllowedRunTimePreferenceKey), pluginAllowedRunTime.get());
    261 
    262259    CFDictionaryAddValue(defaults, CFSTR(WebKitAcceleratedCompositingEnabledPreferenceKey), kCFBooleanFalse);
    263260   
    … …  
    14911488}
    14921489
    1493 HRESULT WebPreferences::setPluginAllowedRunTime(UINT allowedRunTime)
    1494 {
    1495     setIntegerValue(CFSTR(WebKitPluginAllowedRunTimePreferenceKey), allowedRunTime);
    1496     return S_OK;
    1497 }
    1498 
    1499 HRESULT WebPreferences::pluginAllowedRunTime(UINT* allowedRunTime)
    1500 {
    1501     *allowedRunTime = integerValueForKey(CFSTR(WebKitPluginAllowedRunTimePreferenceKey));
    1502     return S_OK;
    1503 }
    1504 
    15051490HRESULT WebPreferences::setPreferenceForTest(BSTR key, BSTR value)
    15061491{

  • trunk/Source/WebKit/win/WebPreferences.h

    r92414 r92492  
    405405    /* [retval][out] */ BOOL* useHighResolutionTimers);
    406406
    407     virtual HRESULT STDMETHODCALLTYPE setPluginAllowedRunTime(
    408     /* [in] */ UINT allowedRunTime);
    409 
    410     virtual HRESULT STDMETHODCALLTYPE pluginAllowedRunTime(
    411     /* [retval][out] */ UINT* allowedRunTime);
    412 
    413407    virtual HRESULT STDMETHODCALLTYPE isFrameFlatteningEnabled(
    414408    /* [retval][out] */ BOOL* enabled);

  • trunk/Source/WebKit/win/WebView.cpp

    r92414 r92492  
    5858#include "WebNotificationCenter.h"
    5959#include "WebPlatformStrategies.h"
    60 #include "WebPluginHalterClient.h"
    6160#include "WebPreferences.h"
    6261#include "WebScriptWorld.h"
    … …  
    709708    setUIDelegate(0);
    710709    setFormDelegate(0);
    711     setPluginHalterDelegate(0);
    712710
    713711    if (m_webInspector)
    … …  
    26442642    pageClients.dragClient = new WebDragClient(this);
    26452643    pageClients.inspectorClient = new WebInspectorClient(this);
    2646     pageClients.pluginHalterClient = adoptPtr(new WebPluginHalterClient(this));
    26472644#if ENABLE(CLIENT_BASED_GEOLOCATION)
    26482645    pageClients.geolocationClient = new WebGeolocationClient(this);
    … …  
    48064803        return hr;
    48074804    settings->setShouldUseHighResolutionTimers(enabled);
    4808 
    4809     UINT runTime;
    4810     hr = prefsPrivate->pluginAllowedRunTime(&runTime);
    4811     if (FAILED(hr))
    4812         return hr;
    4813     settings->setPluginAllowedRunTime(runTime);
    48144805
    48154806    hr = prefsPrivate->isFrameFlatteningEnabled(&enabled);
    … …  
    64686459#endif
    64696460
    6470 HRESULT STDMETHODCALLTYPE WebView::setPluginHalterDelegate(IWebPluginHalterDelegate* d)
    6471 {
    6472     m_pluginHalterDelegate = d;
    6473     return S_OK;
    6474 }
    6475 
    6476 HRESULT STDMETHODCALLTYPE WebView::pluginHalterDelegate(IWebPluginHalterDelegate** d)
    6477 {
    6478     if (!d)
    6479         return E_POINTER;
    6480 
    6481     if (!m_pluginHalterDelegate)
    6482         return E_FAIL;
    6483 
    6484     return m_pluginHalterDelegate.copyRefTo(d);
    6485 }
    6486 
    6487 static PluginView* pluginViewForNode(IDOMNode* domNode)
    6488 {
    6489     COMPtr<DOMNode> webKitDOMNode(Query, domNode);
    6490     if (!webKitDOMNode)
    6491         return 0;
    6492 
    6493     Node* node = webKitDOMNode->node();
    6494     if (!node)
    6495         return 0;
    6496 
    6497     RenderObject* renderer = node->renderer();
    6498     if (!renderer || !renderer->isWidget())
    6499         return 0;
    6500 
    6501     Widget* widget = toRenderWidget(renderer)->widget();
    6502     if (!widget || !widget->isPluginView())
    6503         return 0;
    6504 
    6505     return static_cast<PluginView*>(widget);
    6506 }
    6507 
    6508 HRESULT WebView::isNodeHaltedPlugin(IDOMNode* domNode, BOOL* result)
    6509 {
    6510     if (!domNode || !result)
    6511         return E_POINTER;
    6512 
    6513     *result = FALSE;
    6514 
    6515     PluginView* view = pluginViewForNode(domNode);
    6516     if (!view)
    6517         return E_FAIL;
    6518 
    6519     *result = view->isHalted();
    6520     return S_OK;
    6521 }
    6522 
    6523 HRESULT WebView::restartHaltedPluginForNode(IDOMNode* domNode)
    6524 {
    6525     if (!domNode)
    6526         return E_POINTER;
    6527 
    6528     PluginView* view = pluginViewForNode(domNode);
    6529     if (!view)
    6530         return E_FAIL;
    6531 
    6532     view->restart();
    6533     return S_OK;
    6534 }
    6535 
    6536 HRESULT WebView::hasPluginForNodeBeenHalted(IDOMNode* domNode, BOOL* result)
    6537 {
    6538     if (!domNode || !result)
    6539         return E_POINTER;
    6540 
    6541     *result = FALSE;
    6542 
    6543     PluginView* view = pluginViewForNode(domNode);
    6544     if (!view)
    6545         return E_FAIL;
    6546 
    6547     *result = view->hasBeenHalted();
    6548     return S_OK;
     6461HRESULT WebView::unused1()
     6462{
     6463    ASSERT_NOT_REACHED();
     6464    return E_FAIL;
     6465}
     6466
     6467HRESULT WebView::unused2()
     6468{
     6469    ASSERT_NOT_REACHED();
     6470    return E_FAIL;
     6471}
     6472
     6473HRESULT WebView::unused3()
     6474{
     6475    ASSERT_NOT_REACHED();
     6476    return E_FAIL;
     6477}
     6478
     6479HRESULT WebView::unused4()
     6480{
     6481    ASSERT_NOT_REACHED();
     6482    return E_FAIL;
     6483}
     6484
     6485HRESULT WebView::unused5()
     6486{
     6487    ASSERT_NOT_REACHED();
     6488    return E_FAIL;
    65496489}
    65506490

  • trunk/Source/WebKit/win/WebView.h

    r91161 r92492  
    803803    virtual HRESULT STDMETHODCALLTYPE removeAllUserContentFromGroup(BSTR groupName);
    804804
    805     virtual HRESULT STDMETHODCALLTYPE setPluginHalterDelegate(IWebPluginHalterDelegate*);
    806     virtual HRESULT STDMETHODCALLTYPE pluginHalterDelegate(IWebPluginHalterDelegate**);
     805    virtual HRESULT STDMETHODCALLTYPE unused1();
     806    virtual HRESULT STDMETHODCALLTYPE unused2();
    807807
    808808    virtual HRESULT STDMETHODCALLTYPE invalidateBackingStore(const RECT*);
    … …  
    816816    virtual HRESULT STDMETHODCALLTYPE addVisitedLinks(BSTR* visitedURLs, unsigned visitedURLCount);
    817817
    818     virtual HRESULT STDMETHODCALLTYPE isNodeHaltedPlugin(IDOMNode*, BOOL*);
    819     virtual HRESULT STDMETHODCALLTYPE restartHaltedPluginForNode(IDOMNode*);
    820     virtual HRESULT STDMETHODCALLTYPE hasPluginForNodeBeenHalted(IDOMNode*, BOOL*);
     818    virtual HRESULT STDMETHODCALLTYPE unused3();
     819    virtual HRESULT STDMETHODCALLTYPE unused4();
     820    virtual HRESULT STDMETHODCALLTYPE unused5();
    821821
    822822    virtual HRESULT STDMETHODCALLTYPE setGeolocationProvider(IWebGeolocationProvider* locationProvider);
    … …  
    10601060    COMPtr<WebPreferences> m_preferences;
    10611061    COMPtr<WebInspector> m_webInspector;
    1062     COMPtr<IWebPluginHalterDelegate> m_pluginHalterDelegate;
    10631062    COMPtr<IWebGeolocationProvider> m_geolocationProvider;
    10641063

  • trunk/Source/WebKit/wx/ChangeLog

    r92265 r92492  
     12011-08-05  Anders Carlsson  <andersca@apple.com>
     2
     3        Remove PluginHalter
     4        https://bugs.webkit.org/show_bug.cgi?id=65729
     5
     6        Reviewed by Darin Adler.
     7
     8        Don't include PluginHalterClient.h, it's been removed.
     9
     10        * WebView.cpp:
     11
    1122011-08-03  Pavel Feldman  <pfeldman@chromium.org>
    213

  • trunk/Source/WebKit/wx/WebView.cpp

    r92068 r92492  
    5050#include "PlatformString.h"
    5151#include "PlatformWheelEvent.h"
    52 #include "PluginHalterClient.h"
    5352#include "RenderObject.h"
    5453#include "RenderView.h"

  • trunk/Tools/ChangeLog

    r92481 r92492  
     12011-08-05  Anders Carlsson  <andersca@apple.com>
     2
     3        Remove PluginHalter
     4        https://bugs.webkit.org/show_bug.cgi?id=65729
     5
     6        Reviewed by Darin Adler.
     7
     8        Remove call to set the allowed plug-in run time.
     9
     10        * DumpRenderTree/mac/DumpRenderTree.mm:
     11        (resetDefaultsToConsistentValues):
     12
    1132011-08-05  Ademar de Souza Reis Jr.  <ademar.reis@openbossa.org>
    214

  • trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

    r91794 r92492  
    448448    [preferences setXSSAuditorEnabled:NO];
    449449    [preferences setExperimentalNotificationsEnabled:NO];
    450     [preferences setPluginAllowedRunTime:1];
    451450    [preferences setPlugInsEnabled:YES];
    452451
Note: See TracChangeset for help on using the changeset viewer.