Remove PluginHalter
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 5 Aug 2011 18:44:45 +0000 (18:44 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 5 Aug 2011 18:44:45 +0000 (18:44 +0000)
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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@92492 268f45cc-cd09-0410-ab3c-d52691b4dbfc

54 files changed:
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.list.am
Source/WebCore/WebCore.exp.in
Source/WebCore/WebCore.pro
Source/WebCore/WebCore.vcproj/WebCore.vcproj
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/loader/EmptyClients.h
Source/WebCore/page/HaltablePlugin.h [deleted file]
Source/WebCore/page/Page.cpp
Source/WebCore/page/Page.h
Source/WebCore/page/PluginHalter.cpp [deleted file]
Source/WebCore/page/PluginHalter.h [deleted file]
Source/WebCore/page/PluginHalterClient.h [deleted file]
Source/WebCore/page/Settings.cpp
Source/WebCore/page/Settings.h
Source/WebCore/plugins/PluginView.cpp
Source/WebCore/plugins/PluginView.h
Source/WebCore/plugins/PluginViewNone.cpp
Source/WebCore/plugins/gtk/PluginViewGtk.cpp
Source/WebCore/plugins/qt/PluginViewQt.cpp
Source/WebCore/plugins/win/PluginViewWin.cpp
Source/WebCore/rendering/RenderWidget.cpp
Source/WebCore/rendering/RenderWidget.h
Source/WebKit/ChangeLog
Source/WebKit/WebKit.xcodeproj/project.pbxproj
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.h
Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
Source/WebKit/mac/WebCoreSupport/WebPluginHalterClient.h [deleted file]
Source/WebKit/mac/WebCoreSupport/WebPluginHalterClient.mm [deleted file]
Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h
Source/WebKit/mac/WebView/WebPreferences.mm
Source/WebKit/mac/WebView/WebPreferencesPrivate.h
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit/mac/WebView/WebViewPrivate.h
Source/WebKit/win/ChangeLog
Source/WebKit/win/Interfaces/IWebPluginHalterDelegate.idl [deleted file]
Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl
Source/WebKit/win/Interfaces/IWebViewPrivate.idl
Source/WebKit/win/Interfaces/WebKit.idl
Source/WebKit/win/WebCoreSupport/WebPluginHalterClient.cpp [deleted file]
Source/WebKit/win/WebCoreSupport/WebPluginHalterClient.h [deleted file]
Source/WebKit/win/WebKit.vcproj/Interfaces.vcproj
Source/WebKit/win/WebKit.vcproj/WebKit.vcproj
Source/WebKit/win/WebPreferenceKeysPrivate.h
Source/WebKit/win/WebPreferences.cpp
Source/WebKit/win/WebPreferences.h
Source/WebKit/win/WebView.cpp
Source/WebKit/win/WebView.h
Source/WebKit/wx/ChangeLog
Source/WebKit/wx/WebView.cpp
Tools/ChangeLog
Tools/DumpRenderTree/mac/DumpRenderTree.mm

index 75e45c8..9a4c273 100644 (file)
@@ -992,7 +992,6 @@ SET(WebCore_SOURCES
     page/Performance.cpp
     page/PerformanceNavigation.cpp
     page/PerformanceTiming.cpp
-    page/PluginHalter.cpp
     page/PrintContext.cpp
     page/Screen.cpp
     page/SecurityOrigin.cpp
index 83e1299..11d66bb 100644 (file)
@@ -1,3 +1,42 @@
+2011-08-05  Anders Carlsson  <andersca@apple.com>
+
+        Remove PluginHalter
+        https://bugs.webkit.org/show_bug.cgi?id=65729
+
+        Reviewed by Darin Adler.
+
+        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:
+
 2011-08-05  Jochen Eisinger  <jochen@chromium.org>
 
         Introduce a new ResourceRequest::TargetType for XHRs
index 5638bbc..8bd5555 100644 (file)
@@ -2310,9 +2310,6 @@ webcore_sources += \
        Source/WebCore/page/PerformanceNavigation.h \
        Source/WebCore/page/PerformanceTiming.cpp \
        Source/WebCore/page/PerformanceTiming.h \
-       Source/WebCore/page/PluginHalter.cpp \
-       Source/WebCore/page/PluginHalter.h \
-       Source/WebCore/page/PluginHalterClient.h \
        Source/WebCore/page/PositionCallback.h \
        Source/WebCore/page/PositionError.h \
        Source/WebCore/page/PositionErrorCallback.h \
index 1c7fe44..5b44acd 100644 (file)
@@ -285,7 +285,6 @@ __ZN7WebCore12PrintContextC1EPNS_5FrameE
 __ZN7WebCore12PrintContextD1Ev
 __ZN7WebCore12RenderObject16repaintRectangleERKNS_7IntRectEb
 __ZN7WebCore12RenderObject23absoluteBoundingBoxRectEb
-__ZN7WebCore12RenderWidget19showSubstituteImageEN3WTF10PassRefPtrINS_5ImageEEE
 __ZN7WebCore12RenderWidget28resumeWidgetHierarchyUpdatesEv
 __ZN7WebCore12RenderWidget29suspendWidgetHierarchyUpdatesEv
 __ZN7WebCore12SharedBuffer10wrapNSDataEP6NSData
@@ -698,8 +697,6 @@ __ZN7WebCore4Page10findStringERKN3WTF6StringEj
 __ZN7WebCore4Page11PageClientsC1Ev
 __ZN7WebCore4Page11PageClientsD1Ev
 __ZN7WebCore4Page12setGroupNameERKN3WTF6StringE
-__ZN7WebCore4Page13didStopPluginEPNS_14HaltablePluginE
-__ZN7WebCore4Page14didStartPluginEPNS_14HaltablePluginE
 __ZN7WebCore4Page14setMediaVolumeEf
 __ZN7WebCore4Page15addSchedulePairEN3WTF10PassRefPtrINS_12SchedulePairEEE
 __ZN7WebCore4Page15didMoveOnscreenEv
@@ -898,7 +895,6 @@ __ZN7WebCore8Settings23setEditableLinkBehaviorENS_20EditableLinkBehaviorE
 __ZN7WebCore8Settings23setLoadDeferringEnabledEb
 __ZN7WebCore8Settings23setNeedsTigerMailQuirksEb
 __ZN7WebCore8Settings23setPictographFontFamilyERKN3WTF12AtomicStringE11UScriptCode
-__ZN7WebCore8Settings23setPluginAllowedRunTimeEj
 __ZN7WebCore8Settings23setUsesEncodingDetectorEb
 __ZN7WebCore8Settings24setApplicationChromeModeEb
 __ZN7WebCore8Settings24setDNSPrefetchingEnabledEb
index 7008c21..b7d002b 100644 (file)
@@ -941,7 +941,6 @@ SOURCES += \
     page/Performance.cpp \
     page/PerformanceNavigation.cpp \
     page/PerformanceTiming.cpp \
-    page/PluginHalter.cpp \
     page/PrintContext.cpp \
     page/Screen.cpp \
     page/SecurityOrigin.cpp \
index 391b2fd..13db397 100755 (executable)
                                >
                        </File>
                        <File
-                               RelativePath="..\page\PluginHalter.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\page\PluginHalter.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\page\PluginHalterClient.h"
-                               >
-                       </File>
-                       <File
                                RelativePath="..\page\PositionCallback.h"
                                >
                        </File>
index 2164073..3020267 100644 (file)
                7637C543112E7B7E003D6CDC /* WebSocketHandshakeRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 7637C542112E7B7E003D6CDC /* WebSocketHandshakeRequest.h */; };
                767F99BE11A1194A0080C51D /* WebSocketHandshakeResponse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 767F99BD11A1194A0080C51D /* WebSocketHandshakeResponse.cpp */; };
                767F99C011A119560080C51D /* WebSocketHandshakeResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 767F99BF11A119560080C51D /* WebSocketHandshakeResponse.h */; };
-               7693BAD2106C2DCA007B0823 /* HaltablePlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 7693BACE106C2DCA007B0823 /* HaltablePlugin.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               7693BAD3106C2DCA007B0823 /* PluginHalter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7693BACF106C2DCA007B0823 /* PluginHalter.cpp */; };
-               7693BAD4106C2DCA007B0823 /* PluginHalter.h in Headers */ = {isa = PBXBuildFile; fileRef = 7693BAD0106C2DCA007B0823 /* PluginHalter.h */; };
-               7693BAD5106C2DCA007B0823 /* PluginHalterClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 7693BAD1106C2DCA007B0823 /* PluginHalterClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
                7694563C1214D97C0007CBAE /* JSDOMTokenList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7694563A1214D97C0007CBAE /* JSDOMTokenList.cpp */; };
                7694563D1214D97C0007CBAE /* JSDOMTokenList.h in Headers */ = {isa = PBXBuildFile; fileRef = 7694563B1214D97C0007CBAE /* JSDOMTokenList.h */; };
                7694565B1214DB630007CBAE /* DOMDOMTokenList.h in Headers */ = {isa = PBXBuildFile; fileRef = 769456591214DB630007CBAE /* DOMDOMTokenList.h */; };
                7637C542112E7B7E003D6CDC /* WebSocketHandshakeRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketHandshakeRequest.h; sourceTree = "<group>"; };
                767F99BD11A1194A0080C51D /* WebSocketHandshakeResponse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSocketHandshakeResponse.cpp; sourceTree = "<group>"; };
                767F99BF11A119560080C51D /* WebSocketHandshakeResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketHandshakeResponse.h; sourceTree = "<group>"; };
-               7693BACE106C2DCA007B0823 /* HaltablePlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HaltablePlugin.h; sourceTree = "<group>"; };
-               7693BACF106C2DCA007B0823 /* PluginHalter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginHalter.cpp; sourceTree = "<group>"; };
-               7693BAD0106C2DCA007B0823 /* PluginHalter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginHalter.h; sourceTree = "<group>"; };
-               7693BAD1106C2DCA007B0823 /* PluginHalterClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginHalterClient.h; sourceTree = "<group>"; };
                7694563A1214D97C0007CBAE /* JSDOMTokenList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMTokenList.cpp; sourceTree = "<group>"; };
                7694563B1214D97C0007CBAE /* JSDOMTokenList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMTokenList.h; sourceTree = "<group>"; };
                769456591214DB630007CBAE /* DOMDOMTokenList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMDOMTokenList.h; sourceTree = "<group>"; };
                                FE80D7BC0E9C1F25000D6F75 /* Geoposition.idl */,
                                C50B561412119D23008B46E0 /* GroupSettings.cpp */,
                                C50B561512119D23008B46E0 /* GroupSettings.h */,
-                               7693BACE106C2DCA007B0823 /* HaltablePlugin.h */,
                                BC94D1500C275C8B006BC617 /* History.cpp */,
                                BC94D1510C275C8B006BC617 /* History.h */,
                                BC94D1520C275C8B006BC617 /* History.idl */,
                                8AF4E55811DC5A63000ED3DE /* PerformanceTiming.cpp */,
                                8AF4E55911DC5A63000ED3DE /* PerformanceTiming.h */,
                                8AF4E55A11DC5A63000ED3DE /* PerformanceTiming.idl */,
-                               7693BACF106C2DCA007B0823 /* PluginHalter.cpp */,
-                               7693BAD0106C2DCA007B0823 /* PluginHalter.h */,
-                               7693BAD1106C2DCA007B0823 /* PluginHalterClient.h */,
                                FE80D7BD0E9C1F25000D6F75 /* PositionCallback.h */,
                                593AB6971355CD9200FC8211 /* PositionCallback.idl */,
                                FE80D7BF0E9C1F25000D6F75 /* PositionError.h */,
                                B2A015AB0AF6CD53006BCE0E /* GraphicsTypes.h in Headers */,
                                77A17A7B12F2890B004E02F6 /* GraphicsTypes3D.h in Headers */,
                                C50B561712119D23008B46E0 /* GroupSettings.h in Headers */,
-                               7693BAD2106C2DCA007B0823 /* HaltablePlugin.h in Headers */,
                                8482B7461198C35400BFB005 /* HashChangeEvent.h in Headers */,
                                A8748BE012CBF2DC001FBA41 /* HashTools.h in Headers */,
                                F55B3DC01251F12D003EF269 /* HiddenInputType.h in Headers */,
                                935C476B09AC4D4F00A6AAB4 /* PlatformWheelEvent.h in Headers */,
                                A9C6E4F40D745E48006442E9 /* PluginData.h in Headers */,
                                97205ABC1239292700B17380 /* PluginDocument.h in Headers */,
-                               7693BAD4106C2DCA007B0823 /* PluginHalter.h in Headers */,
-                               7693BAD5106C2DCA007B0823 /* PluginHalterClient.h in Headers */,
                                1ADA14110E1AE5D900023EE5 /* PluginMainThreadScheduler.h in Headers */,
                                1AA8799011CBE846003C664F /* PluginStrategy.h in Headers */,
                                0AFDAC3D10F5448C00E1F3D2 /* PluginViewBase.h in Headers */,
                                1AD8F81C11CAB9E900E93E54 /* PlatformStrategies.cpp in Sources */,
                                A9C6E4F30D745E48006442E9 /* PluginData.cpp in Sources */,
                                97205ABB1239292700B17380 /* PluginDocument.cpp in Sources */,
-                               7693BAD3106C2DCA007B0823 /* PluginHalter.cpp in Sources */,
                                1ADA14100E1AE5D900023EE5 /* PluginMainThreadScheduler.cpp in Sources */,
                                76FF17E311235673001D61B5 /* PluginViewNone.cpp in Sources */,
                                B2B1F7160D00CAA8004AEA64 /* PointerEventsHitRules.cpp in Sources */,
index 8c7fc53..ac430a5 100644 (file)
@@ -42,7 +42,6 @@
 #include "FrameLoaderClient.h"
 #include "FrameNetworkingContext.h"
 #include "InspectorClient.h"
-#include "PluginHalterClient.h"
 #include "PopupMenu.h"
 #include "ResourceError.h"
 #include "SearchPopupMenu.h"
diff --git a/Source/WebCore/page/HaltablePlugin.h b/Source/WebCore/page/HaltablePlugin.h
deleted file mode 100644 (file)
index 0f4aa41..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2009 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef HaltablePlugin_h
-#define HaltablePlugin_h
-
-namespace WebCore {
-
-class Node;
-
-class HaltablePlugin {
-public:
-    virtual ~HaltablePlugin() { }
-
-    virtual void halt() = 0;
-    virtual void restart() = 0;
-    virtual Node* node() const = 0;
-    virtual bool isWindowed() const = 0;
-    virtual String pluginName() const = 0;
-};
-
-} // namespace WebCore
-
-#endif // HaltablePlugin_h
index 32419a0..785a518 100644 (file)
@@ -57,7 +57,6 @@
 #include "NetworkStateNotifier.h"
 #include "PageGroup.h"
 #include "PluginData.h"
-#include "PluginHalter.h"
 #include "PluginView.h"
 #include "PluginViewBase.h"
 #include "ProgressTracker.h"
@@ -176,11 +175,6 @@ Page::Page(PageClients& pageClients)
     ASSERT(!allPages->contains(this));
     allPages->add(this);
 
-    if (pageClients.pluginHalterClient) {
-        m_pluginHalter = adoptPtr(new PluginHalter(pageClients.pluginHalterClient.release()));
-        m_pluginHalter->setPluginAllowedRunTime(m_settings->pluginAllowedRunTime());
-    }
-
 #ifndef NDEBUG
     pageCounter.increment();
 #endif
@@ -886,24 +880,6 @@ void Page::privateBrowsingStateChanged()
         pluginViewBases[i]->privateBrowsingStateChanged(privateBrowsingEnabled);
 }
 
-void Page::pluginAllowedRunTimeChanged()
-{
-    if (m_pluginHalter)
-        m_pluginHalter->setPluginAllowedRunTime(m_settings->pluginAllowedRunTime());
-}
-
-void Page::didStartPlugin(HaltablePlugin* obj)
-{
-    if (m_pluginHalter)
-        m_pluginHalter->didStartPlugin(obj);
-}
-
-void Page::didStopPlugin(HaltablePlugin* obj)
-{
-    if (m_pluginHalter)
-        m_pluginHalter->didStopPlugin(obj);
-}
-
 void Page::addScrollableArea(ScrollableArea* scrollableArea)
 {
     if (!m_scrollableAreaSet)
index 1e03aad..d6b0abd 100644 (file)
@@ -74,8 +74,6 @@ namespace WebCore {
     class Node;
     class PageGroup;
     class PluginData;
-    class PluginHalter;
-    class PluginHalterClient;
     class ProgressTracker;
     class RenderTheme;
     class VisibleSelection;
@@ -113,7 +111,6 @@ namespace WebCore {
             EditorClient* editorClient;
             DragClient* dragClient;
             InspectorClient* inspectorClient;
-            OwnPtr<PluginHalterClient> pluginHalterClient;
             GeolocationClient* geolocationClient;
             DeviceMotionClient* deviceMotionClient;
             DeviceOrientationClient* deviceOrientationClient;
@@ -253,10 +250,6 @@ namespace WebCore {
         void dnsPrefetchingStateChanged();
         void privateBrowsingStateChanged();
 
-        void didStartPlugin(HaltablePlugin*);
-        void didStopPlugin(HaltablePlugin*);
-        void pluginAllowedRunTimeChanged();
-
         static void setDebuggerForAllPages(JSC::Debugger*);
         void setDebugger(JSC::Debugger*);
         JSC::Debugger* debugger() const { return m_debugger; }
@@ -393,8 +386,6 @@ namespace WebCore {
 
         bool m_canStartMedia;
 
-        OwnPtr<PluginHalter> m_pluginHalter;
-
 #if ENABLE(DOM_STORAGE)
         RefPtr<StorageNamespace> m_sessionStorage;
 #endif
diff --git a/Source/WebCore/page/PluginHalter.cpp b/Source/WebCore/page/PluginHalter.cpp
deleted file mode 100644 (file)
index d3cfe17..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2009 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#include "config.h"
-#include "PluginHalter.h"
-
-#include "HaltablePlugin.h"
-#include "PlatformString.h"
-#include <wtf/CurrentTime.h>
-#include <wtf/PassOwnPtr.h>
-#include <wtf/Vector.h>
-
-using namespace std;
-
-namespace WebCore {
-
-PluginHalter::PluginHalter(PassOwnPtr<PluginHalterClient> client)
-    : m_client(client)
-    , m_timer(this, &PluginHalter::timerFired)
-    , m_pluginAllowedRunTime(numeric_limits<unsigned>::max())
-{
-    ASSERT_ARG(m_client, m_client);
-}
-
-void PluginHalter::didStartPlugin(HaltablePlugin* obj)
-{
-    ASSERT_ARG(obj, obj);
-    ASSERT_ARG(obj, !m_plugins.contains(obj));
-
-    if (!m_client->enabled())
-        return;
-
-    double currentTime = WTF::currentTime();
-
-    m_plugins.add(obj, currentTime);
-
-    if (m_plugins.size() == 1)
-        m_oldestStartTime = currentTime;
-
-    startTimerIfNecessary();
-}
-
-void PluginHalter::didStopPlugin(HaltablePlugin* obj)
-{
-    if (!m_client->enabled())
-        return;
-
-    m_plugins.remove(obj);
-}
-
-void PluginHalter::timerFired(Timer<PluginHalter>*)
-{
-    if (m_plugins.isEmpty())
-        return;
-
-    Vector<HaltablePlugin*> plugins;
-    copyKeysToVector(m_plugins, plugins);
-
-    // Plug-ins older than this are candidates to be halted.
-    double pluginCutOffTime = WTF::currentTime() - m_pluginAllowedRunTime;
-
-    m_oldestStartTime = numeric_limits<double>::max();
-
-    for (size_t i = 0; i < plugins.size(); ++i) {
-        double thisStartTime = m_plugins.get(plugins[i]);
-        if (thisStartTime > pluginCutOffTime) {
-            // This plug-in is too young to be halted. We find the oldest
-            // plug-in that is not old enough to be halted and use it to set
-            // the timer's next fire time.
-            if (thisStartTime < m_oldestStartTime)
-                m_oldestStartTime = thisStartTime;
-            continue;
-        }
-
-        if (m_client->shouldHaltPlugin(plugins[i]->node(), plugins[i]->isWindowed(), plugins[i]->pluginName()))
-            plugins[i]->halt();
-
-        m_plugins.remove(plugins[i]);
-    }
-
-    startTimerIfNecessary();
-}
-
-void PluginHalter::startTimerIfNecessary()
-{
-    if (m_timer.isActive())
-        return;
-
-    if (m_plugins.isEmpty())
-        return;
-
-    double nextFireInterval = static_cast<double>(m_pluginAllowedRunTime) - (currentTime() - m_oldestStartTime);
-    m_timer.startOneShot(nextFireInterval < 0 ? 0 : nextFireInterval);
-}
-
-} // namespace WebCore
diff --git a/Source/WebCore/page/PluginHalter.h b/Source/WebCore/page/PluginHalter.h
deleted file mode 100644 (file)
index 5cc3c72..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2009 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef PluginHalter_h
-#define PluginHalter_h
-
-#include "PluginHalterClient.h"
-#include "Timer.h"
-#include <wtf/HashMap.h>
-#include <wtf/OwnPtr.h>
-
-namespace WebCore {
-
-class HaltablePlugin;
-
-class PluginHalter {
-    WTF_MAKE_NONCOPYABLE(PluginHalter); WTF_MAKE_FAST_ALLOCATED;
-public:
-    PluginHalter(PassOwnPtr<PluginHalterClient>);
-
-    void didStartPlugin(HaltablePlugin*);
-    void didStopPlugin(HaltablePlugin*);
-
-    void setPluginAllowedRunTime(unsigned runTime) { m_pluginAllowedRunTime = runTime; }
-
-private:
-    void timerFired(Timer<PluginHalter>*);
-    void startTimerIfNecessary();
-
-    OwnPtr<PluginHalterClient> m_client;
-    Timer<PluginHalter> m_timer;
-    unsigned m_pluginAllowedRunTime;
-    double m_oldestStartTime;
-    HashMap<HaltablePlugin*, double> m_plugins;
-};
-
-} // namespace WebCore
-
-#endif // PluginHalter_h
diff --git a/Source/WebCore/page/PluginHalterClient.h b/Source/WebCore/page/PluginHalterClient.h
deleted file mode 100644 (file)
index 12d37cc..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2009 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef PluginHalterClient_h
-#define PluginHalterClient_h
-
-#include <wtf/Forward.h>
-
-namespace WebCore {
-
-class Node;
-
-class PluginHalterClient {
-public:
-    virtual ~PluginHalterClient() { }
-
-    virtual bool shouldHaltPlugin(Node*, bool isWindowed, const String& pluginName) const = 0;
-    virtual bool enabled() const = 0;
-};
-
-} // namespace WebCore
-
-#endif // PluginHalterClient_h
index e3f0359..697ec39 100644 (file)
@@ -118,7 +118,6 @@ Settings::Settings(Page* page)
 #if ENABLE(DOM_STORAGE)
     , m_sessionStorageQuota(StorageMap::noQuota)
 #endif
-    , m_pluginAllowedRunTime(numeric_limits<unsigned>::max())
     , m_editingBehaviorType(editingBehaviorTypeForPlatform())
     , m_maximumHTMLParserDOMTreeDepth(defaultMaximumHTMLParserDOMTreeDepth)
     , m_isSpatialNavigationEnabled(false)
@@ -748,12 +747,6 @@ void Settings::setExperimentalNotificationsEnabled(bool enabled)
     m_experimentalNotificationsEnabled = enabled;
 }
 
-void Settings::setPluginAllowedRunTime(unsigned runTime)
-{
-    m_pluginAllowedRunTime = runTime;
-    m_page->pluginAllowedRunTimeChanged();
-}
-
 #if PLATFORM(WIN) || (OS(WINDOWS) && PLATFORM(WX))
 void Settings::setShouldUseHighResolutionTimers(bool shouldUseHighResolutionTimers)
 {
index b5a06c5..4a3fdaa 100644 (file)
@@ -344,9 +344,6 @@ namespace WebCore {
         static bool shouldUseHighResolutionTimers() { return gShouldUseHighResolutionTimers; }
 #endif
 
-        void setPluginAllowedRunTime(unsigned);
-        unsigned pluginAllowedRunTime() const { return m_pluginAllowedRunTime; }
-
         void setWebAudioEnabled(bool);
         bool webAudioEnabled() const { return m_webAudioEnabled; }
 
@@ -478,7 +475,6 @@ namespace WebCore {
 #if ENABLE(DOM_STORAGE)
         unsigned m_sessionStorageQuota;
 #endif
-        unsigned m_pluginAllowedRunTime;
         unsigned m_editingBehaviorType;
         unsigned m_maximumHTMLParserDOMTreeDepth;
         bool m_isSpatialNavigationEnabled : 1;
index 7e9596e..f316d6b 100644 (file)
@@ -271,9 +271,6 @@ bool PluginView::start()
     if (m_status != PluginStatusLoadedSuccessfully)
         return false;
 
-    if (parentFrame()->page())
-        parentFrame()->page()->didStartPlugin(this);
-
     return true;
 }
 
@@ -318,9 +315,6 @@ void PluginView::stop()
     if (!m_isStarted)
         return;
 
-    if (parentFrame()->page())
-        parentFrame()->page()->didStopPlugin(this);
-
     LOG(Plugins, "PluginView::stop(): Stopping plug-in '%s'", m_plugin->name().utf8().data());
 
     HashSet<RefPtr<PluginStream> > streams = m_streams;
@@ -880,8 +874,6 @@ PluginView::PluginView(Frame* parentFrame, const IntSize& size, PluginPackage* p
     , m_loadManually(loadManually)
     , m_manualStream(0)
     , m_isJavaScriptPaused(false)
-    , m_isHalted(false)
-    , m_hasBeenHalted(false)
     , m_haveCalledSetWindow(false)
 {
     if (!m_plugin) {
@@ -1290,16 +1282,6 @@ const char* PluginView::userAgentStatic()
 #endif
 
 
-Node* PluginView::node() const
-{
-    return m_element;
-}
-
-String PluginView::pluginName() const
-{
-    return m_plugin->name();
-}
-
 void PluginView::lifeSupportTimerFired(Timer<PluginView>*)
 {
     deref();
index de039fb..07c3c67 100644 (file)
@@ -29,7 +29,6 @@
 #define PluginView_h
 
 #include "FrameLoadRequest.h"
-#include "HaltablePlugin.h"
 #include "IntRect.h"
 #include "MediaCanStartListener.h"
 #include "PluginViewBase.h"
@@ -141,7 +140,6 @@ namespace WebCore {
                      , private PluginStreamClient
 #endif
                      , public PluginManualLoader
-                     , private HaltablePlugin
                      , private MediaCanStartListener {
     public:
         static PassRefPtr<PluginView> create(Frame* parentFrame, const IntSize&, Element*, const KURL&, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually);
@@ -244,16 +242,6 @@ namespace WebCore {
         void didFinishLoading();
         void didFail(const ResourceError&);
 
-        // HaltablePlugin
-        virtual void halt();
-        virtual void restart();
-        virtual Node* node() const;
-        virtual bool isWindowed() const { return m_isWindowed; }
-        virtual String pluginName() const;
-
-        bool isHalted() const { return m_isHalted; }
-        bool hasBeenHalted() const { return m_hasBeenHalted; }
-
         static bool isCallingPlugin();
 
         bool start();
@@ -461,9 +449,6 @@ private:
 
         bool m_isJavaScriptPaused;
 
-        bool m_isHalted;
-        bool m_hasBeenHalted;
-
         bool m_haveCalledSetWindow;
 
         static PluginView* s_currentPluginView;
index 3bdec6f..877e589 100644 (file)
@@ -120,14 +120,6 @@ void PluginView::updatePluginWidget()
 {
 }
 
-void PluginView::halt()
-{
-}
-
-void PluginView::restart()
-{
-}
-
 #if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
 void PluginView::handleFocusInEvent()
 {
index 48ca581..dbc374a 100644 (file)
@@ -952,12 +952,4 @@ void PluginView::platformDestroy()
 #endif
 }
 
-void PluginView::halt()
-{
-}
-
-void PluginView::restart()
-{
-}
-
 } // namespace WebCore
index 056bd1b..a70fc4d 100644 (file)
@@ -1040,14 +1040,6 @@ void PluginView::platformDestroy()
         XFreeColormap(QX11Info::display(), m_colormap);
 }
 
-void PluginView::halt()
-{
-}
-
-void PluginView::restart()
-{
-}
 #if USE(ACCELERATED_COMPOSITING)
 PlatformLayer* PluginView::platformLayer() const
 {
index 713abbb..0de594d 100644 (file)
@@ -1066,34 +1066,4 @@ PassRefPtr<Image> PluginView::snapshot()
 #endif
 }
 
-void PluginView::halt()
-{
-    ASSERT(!m_isHalted);
-    ASSERT(m_isStarted);
-
-#if !PLATFORM(QT)
-    // Show a screenshot of the plug-in.
-    toRenderWidget(m_element->renderer())->showSubstituteImage(snapshot());
-#endif
-
-    m_isHalted = true;
-    m_hasBeenHalted = true;
-
-    stop();
-    platformDestroy();
-}
-
-void PluginView::restart()
-{
-    ASSERT(!m_isStarted);
-    ASSERT(m_isHalted);
-
-    // Clear any substitute image.
-    toRenderWidget(m_element->renderer())->showSubstituteImage(0);
-
-    m_isHalted = false;
-    m_haveUpdatedPluginWidget = false;
-    start();
-}
-
 } // namespace WebCore
index 175feba..1554220 100644 (file)
@@ -216,12 +216,6 @@ void RenderWidget::styleDidChange(StyleDifference diff, const RenderStyle* oldSt
     }
 }
 
-void RenderWidget::showSubstituteImage(PassRefPtr<Image> prpImage)
-{
-    m_substituteImage = prpImage;
-    repaint();
-}
-
 void RenderWidget::notifyWidget(WidgetNotification notification)
 {
     if (m_widget)
@@ -268,25 +262,21 @@ void RenderWidget::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
     if (m_widget) {
         // Tell the widget to paint now.  This is the only time the widget is allowed
         // to paint itself.  That way it will composite properly with z-indexed layers.
-        if (m_substituteImage)
-            paintInfo.context->drawImage(m_substituteImage.get(), style()->colorSpace(), m_widget->frameRect());
-        else {
-            LayoutPoint widgetLocation = m_widget->frameRect().location();
-            LayoutPoint paintLocation(adjustedPaintOffset.x() + borderLeft() + paddingLeft(), adjustedPaintOffset.y() + borderTop() + paddingTop());
-            LayoutRect paintRect = paintInfo.rect;
-
-            LayoutSize widgetPaintOffset = paintLocation - widgetLocation;
-            // When painting widgets into compositing layers, tx and ty are relative to the enclosing compositing layer,
-            // not the root. In this case, shift the CTM and adjust the paintRect to be root-relative to fix plug-in drawing.
-            if (!widgetPaintOffset.isZero()) {
-                paintInfo.context->translate(widgetPaintOffset);
-                paintRect.move(-widgetPaintOffset);
-            }
-            m_widget->paint(paintInfo.context, paintRect);
-
-            if (!widgetPaintOffset.isZero())
-                paintInfo.context->translate(-widgetPaintOffset);
+        LayoutPoint widgetLocation = m_widget->frameRect().location();
+        LayoutPoint paintLocation(adjustedPaintOffset.x() + borderLeft() + paddingLeft(), adjustedPaintOffset.y() + borderTop() + paddingTop());
+        LayoutRect paintRect = paintInfo.rect;
+
+        LayoutSize widgetPaintOffset = paintLocation - widgetLocation;
+        // When painting widgets into compositing layers, tx and ty are relative to the enclosing compositing layer,
+        // not the root. In this case, shift the CTM and adjust the paintRect to be root-relative to fix plug-in drawing.
+        if (!widgetPaintOffset.isZero()) {
+            paintInfo.context->translate(widgetPaintOffset);
+            paintRect.move(-widgetPaintOffset);
         }
+        m_widget->paint(paintInfo.context, paintRect);
+
+        if (!widgetPaintOffset.isZero())
+            paintInfo.context->translate(-widgetPaintOffset);
 
         if (m_widget->isFrameView()) {
             FrameView* frameView = static_cast<FrameView*>(m_widget.get());
index d391387..63f6b9a 100644 (file)
@@ -41,8 +41,6 @@ public:
     void widgetPositionsUpdated();
     IntRect windowClipRect() const;
 
-    void showSubstituteImage(PassRefPtr<Image>);
-
     void notifyWidget(WidgetNotification);
     
     static void suspendWidgetHierarchyUpdates();
@@ -74,7 +72,6 @@ private:
     bool setWidgetGeometry(const IntRect&, const IntSize&);
 
     RefPtr<Widget> m_widget;
-    RefPtr<Image> m_substituteImage;
     FrameView* m_frameView;
     IntRect m_clipRect; // The rectangle needs to remain correct after scrolling, so it is stored in content view coordinates, and not clipped to window.
     int m_refCount;
index e83d3b5..45cd765 100644 (file)
@@ -1,3 +1,14 @@
+2011-08-05  Anders Carlsson  <andersca@apple.com>
+
+        Remove PluginHalter
+        https://bugs.webkit.org/show_bug.cgi?id=65729
+
+        Reviewed by Darin Adler.
+
+        Remove deleted files from Xcode project.
+
+        * WebKit.xcodeproj/project.pbxproj:
+
 2011-07-28  Tony Chang  <tony@chromium.org>
 
         Add sql to svn:ignore and remove app.
index f7397cf..4bd1c67 100644 (file)
@@ -11,8 +11,6 @@
                065AD5A40B0C32C7005A2B1D /* WebContextMenuClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 065AD5A20B0C32C7005A2B1D /* WebContextMenuClient.mm */; };
                06693DDC0BFBA85200216072 /* WebInspectorClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 06693DDA0BFBA85200216072 /* WebInspectorClient.h */; };
                06693DDD0BFBA85200216072 /* WebInspectorClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 06693DDB0BFBA85200216072 /* WebInspectorClient.mm */; };
-               0A2D87FD107AF52B00CDDEE3 /* WebPluginHalterClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A2D87FB107AF52B00CDDEE3 /* WebPluginHalterClient.h */; };
-               0A2D87FE107AF52B00CDDEE3 /* WebPluginHalterClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0A2D87FC107AF52B00CDDEE3 /* WebPluginHalterClient.mm */; };
                0AB752370FA2E4DB00D7CBB1 /* WebNetscapeContainerCheckContextInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 0AB752350FA2E4DB00D7CBB1 /* WebNetscapeContainerCheckContextInfo.h */; };
                0AB752380FA2E4DB00D7CBB1 /* WebNetscapeContainerCheckContextInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0AB752360FA2E4DB00D7CBB1 /* WebNetscapeContainerCheckContextInfo.mm */; };
                0ACE917310FE47E30096A45F /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0ACE917210FE47E30096A45F /* OpenGL.framework */; };
                065AD5A20B0C32C7005A2B1D /* WebContextMenuClient.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebContextMenuClient.mm; sourceTree = "<group>"; };
                06693DDA0BFBA85200216072 /* WebInspectorClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebInspectorClient.h; sourceTree = "<group>"; };
                06693DDB0BFBA85200216072 /* WebInspectorClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebInspectorClient.mm; sourceTree = "<group>"; };
-               0A2D87FB107AF52B00CDDEE3 /* WebPluginHalterClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginHalterClient.h; sourceTree = "<group>"; };
-               0A2D87FC107AF52B00CDDEE3 /* WebPluginHalterClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPluginHalterClient.mm; sourceTree = "<group>"; };
                0AB752350FA2E4DB00D7CBB1 /* WebNetscapeContainerCheckContextInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNetscapeContainerCheckContextInfo.h; sourceTree = "<group>"; };
                0AB752360FA2E4DB00D7CBB1 /* WebNetscapeContainerCheckContextInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebNetscapeContainerCheckContextInfo.mm; sourceTree = "<group>"; };
                0ACE917210FE47E30096A45F /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
                                84723BE4056D719E0044BFEA /* WebKeyGenerator.mm */,
                                1AA879B411CBE9BF003C664F /* WebPlatformStrategies.h */,
                                1AA879B511CBE9BF003C664F /* WebPlatformStrategies.mm */,
-                               0A2D87FB107AF52B00CDDEE3 /* WebPluginHalterClient.h */,
-                               0A2D87FC107AF52B00CDDEE3 /* WebPluginHalterClient.mm */,
                                A5DEFC0711D5331C00885273 /* WebSecurityOrigin.mm */,
                                A5DEFC0811D5331C00885273 /* WebSecurityOriginInternal.h */,
                                A5DEFC0911D5331C00885273 /* WebSecurityOriginPrivate.h */,
                                939810B00824BF01008DF038 /* WebPluginContainerPrivate.h in Headers */,
                                939810370824BF01008DF038 /* WebPluginController.h in Headers */,
                                939810380824BF01008DF038 /* WebPluginDatabase.h in Headers */,
-                               0A2D87FD107AF52B00CDDEE3 /* WebPluginHalterClient.h in Headers */,
                                939810390824BF01008DF038 /* WebPluginPackage.h in Headers */,
                                225F881509F97E8A00423A40 /* WebPluginPrivate.h in Headers */,
                                1A77B02E0EE7730500C8A1F9 /* WebPluginRequest.h in Headers */,
                                939811260824BF01008DF038 /* WebPluginContainerCheck.mm in Sources */,
                                939810DA0824BF01008DF038 /* WebPluginController.mm in Sources */,
                                939810DB0824BF01008DF038 /* WebPluginDatabase.mm in Sources */,
-                               0A2D87FE107AF52B00CDDEE3 /* WebPluginHalterClient.mm in Sources */,
                                939810DC0824BF01008DF038 /* WebPluginPackage.mm in Sources */,
                                1A77B02F0EE7730500C8A1F9 /* WebPluginRequest.m in Sources */,
                                224100F90918190100D2D266 /* WebPluginsPrivate.m in Sources */,
index a32b890..1a8b3cb 100644 (file)
@@ -1,3 +1,28 @@
+2011-08-05  Anders Carlsson  <andersca@apple.com>
+
+        Remove PluginHalter
+        https://bugs.webkit.org/show_bug.cgi?id=65729
+
+        Reviewed by Darin Adler.
+
+        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:
+
 2011-08-04  Mark Rowe  <mrowe@apple.com>
 
         Future-proof Xcode configuration settings.
index d83b053..4b4d6dc 100644 (file)
@@ -46,8 +46,6 @@ namespace WebCore {
     class HTMLPlugInElement;
 }
 
-class WebHaltablePlugin;
-
 // Also declared in WebCore/WidgetMac.mm
 @interface NSView (Widget)
 - (void)visibleRectDidChange;
@@ -68,8 +66,6 @@ class WebHaltablePlugin;
     BOOL _hasFocus;
     BOOL _isCompletelyObscured;
     BOOL _isPrivateBrowsingEnabled;
-    BOOL _isHalted;
-    BOOL _hasBeenHalted;
     BOOL _snapshotting;
     
     RefPtr<WebCore::HTMLPlugInElement> _element;
@@ -78,8 +74,6 @@ class WebHaltablePlugin;
     RetainPtr<NSURL> _sourceURL;
     RetainPtr<NSImage> _cachedSnapshot;
     
-    OwnPtr<WebHaltablePlugin> _haltable;
-    
     NSTrackingRectTag _trackingTag;
 }
 
@@ -122,11 +116,6 @@ class WebHaltablePlugin;
 - (void)start;
 - (void)stop;
 
-- (void)halt;
-- (void)resumeFromHalt;
-- (BOOL)isHalted;
-- (BOOL)hasBeenHalted;
-
 - (void)addWindowObservers;
 - (void)removeWindowObservers;
 - (BOOL)shouldClipOutPlugin;
index b3e82d1..1ee293d 100644 (file)
@@ -51,7 +51,6 @@
 #import <WebCore/Frame.h>
 #import <WebCore/FrameLoader.h>
 #import <WebCore/HTMLPlugInElement.h>
-#import <WebCore/HaltablePlugin.h>
 #import <WebCore/Page.h>
 #import <WebCore/ProtectionSpace.h>
 #import <WebCore/RenderView.h>
@@ -71,48 +70,6 @@ static const NSTimeInterval ClearSubstituteImageDelay = 0.5;
 
 using namespace WebCore;
 
-class WebHaltablePlugin : public HaltablePlugin {
-public:
-    WebHaltablePlugin(WebBaseNetscapePluginView* view)
-        : m_view(view)
-    {
-    }
-    
-private:
-    virtual void halt();
-    virtual void restart();
-    virtual Node* node() const;
-    virtual bool isWindowed() const;
-    virtual String pluginName() const;
-
-    WebBaseNetscapePluginView* m_view;
-};
-
-void WebHaltablePlugin::halt()
-{
-    [m_view halt];
-}
-
-void WebHaltablePlugin::restart()
-{ 
-    [m_view resumeFromHalt];
-}
-    
-Node* WebHaltablePlugin::node() const
-{
-    return [m_view element];
-}
-
-bool WebHaltablePlugin::isWindowed() const
-{
-    return false;
-}
-
-String WebHaltablePlugin::pluginName() const
-{
-    return [[m_view pluginPackage] pluginInfo].name;
-}
-
 @implementation WebBaseNetscapePluginView
 
 + (void)initialize
@@ -163,7 +120,6 @@ String WebHaltablePlugin::pluginName() const
         _mode = NP_EMBED;
     
     _loadManually = loadManually;
-    _haltable = adoptPtr(new WebHaltablePlugin(self));
     return self;
 }
 
@@ -454,7 +410,6 @@ String WebHaltablePlugin::pluginName() const
     }
     
     _isStarted = YES;
-    page->didStartPlugin(_haltable.get());
 
     [[self webView] addPluginInstanceView:self];
 
@@ -484,11 +439,6 @@ String WebHaltablePlugin::pluginName() const
     if (!_isStarted)
         return;
 
-    if (Frame* frame = core([self webFrame])) {
-        if (Page* page = frame->page())
-            page->didStopPlugin(_haltable.get());
-    }
-    
     _isStarted = NO;
     
     [[self webView] removePluginInstanceView:self];
@@ -502,61 +452,6 @@ String WebHaltablePlugin::pluginName() const
     [self destroyPlugin];
 }
 
-- (void)halt
-{
-    ASSERT(!_isHalted);
-    ASSERT(_isStarted);
-    Element *element = [self element];
-#ifndef BUILDING_ON_LEOPARD
-    CGImageRef cgImage = CGImageRetain([core([self webFrame])->nodeImage(element).get() CGImageForProposedRect:nil context:nil hints:nil]);
-#else
-    RetainPtr<CGImageSourceRef> imageRef(AdoptCF, CGImageSourceCreateWithData((CFDataRef)[core([self webFrame])->nodeImage(element).get() TIFFRepresentation], 0));
-    CGImageRef cgImage = CGImageSourceCreateImageAtIndex(imageRef.get(), 0, 0);
-#endif
-    ASSERT(cgImage);
-    
-    // BitmapImage will release the passed in CGImage on destruction.
-    RefPtr<Image> nodeImage = BitmapImage::create(cgImage);
-    ASSERT(element->renderer());
-    toRenderWidget(element->renderer())->showSubstituteImage(nodeImage);
-    [self stop];
-    _isHalted = YES;  
-    _hasBeenHalted = YES;
-}
-
-- (void)_clearSubstituteImage
-{
-    Element* element = [self element];
-    if (!element)
-        return;
-    
-    RenderObject* renderer = element->renderer();
-    if (!renderer)
-        return;
-    
-    toRenderWidget(renderer)->showSubstituteImage(0);
-}
-
-- (void)resumeFromHalt
-{
-    ASSERT(_isHalted);
-    ASSERT(!_isStarted);
-    [self start];
-    
-    if (_isStarted)
-        _isHalted = NO;
-    
-    ASSERT([self element]->renderer());
-    // FIXME 7417484: This is a workaround for plug-ins not drawing immediately. We'd like to detect when the
-    // plug-in actually draws instead of just assuming it will do so within 0.5 seconds of being restarted.
-    [self performSelector:@selector(_clearSubstituteImage) withObject:nil afterDelay:ClearSubstituteImageDelay];
-}
-
-- (BOOL)isHalted
-{
-    return _isHalted;
-}
-
 - (BOOL)shouldClipOutPlugin
 {
     NSWindow *window = [self window];
@@ -596,11 +491,6 @@ String WebHaltablePlugin::pluginName() const
     _cachedSnapshot.clear();
 }
 
-- (BOOL)hasBeenHalted
-{
-    return _hasBeenHalted;
-}
-
 - (void)viewWillMoveToWindow:(NSWindow *)newWindow
 {
     // We must remove the tracking rect before we move to the new window.
diff --git a/Source/WebKit/mac/WebCoreSupport/WebPluginHalterClient.h b/Source/WebKit/mac/WebCoreSupport/WebPluginHalterClient.h
deleted file mode 100644 (file)
index ed4ff11..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2009 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#import <WebCore/PluginHalterClient.h>
-#import <wtf/Forward.h>
-
-namespace WebCore {
-    class Node;
-}
-
-@class WebView;
-
-class WebPluginHalterClient : public WebCore::PluginHalterClient {
-public:
-    WebPluginHalterClient(WebView *);
-    
-    virtual bool shouldHaltPlugin(WebCore::Node*, bool, const WTF::String&) const;
-    virtual bool enabled() const;
-    
-private:
-    WebView *m_webView;
-};
diff --git a/Source/WebKit/mac/WebCoreSupport/WebPluginHalterClient.mm b/Source/WebKit/mac/WebCoreSupport/WebPluginHalterClient.mm
deleted file mode 100644 (file)
index b59c1f2..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2009 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#import "WebPluginHalterClient.h"
-
-#import "DOMNodeInternal.h"
-#import "WebDelegateImplementationCaching.h"
-#import "WebView.h"
-#import <WebCore/PlatformString.h>
-
-using namespace WebCore;
-
-WebPluginHalterClient::WebPluginHalterClient(WebView *webView)
-    : m_webView(webView)
-{
-    ASSERT_ARG(webView, webView);
-}
-
-bool WebPluginHalterClient::shouldHaltPlugin(Node* pluginNode, bool isWindowed, const String& pluginName) const
-{
-    ASSERT_ARG(pluginNode, pluginNode);
-    return CallUIDelegateReturningBoolean(NO, m_webView, @selector(webView:shouldHaltPlugin:isWindowed:pluginName:), kit(pluginNode), isWindowed, (NSString *)pluginName);
-}
-
-bool WebPluginHalterClient::enabled() const
-{
-    return [[m_webView UIDelegate] respondsToSelector:@selector(webView:shouldHaltPlugin:isWindowed:pluginName:)];
-}
index bd58039..2775fff 100644 (file)
@@ -98,7 +98,6 @@
 #define WebKitWebAudioEnabledPreferenceKey @"WebKitWebAudioEnabled"
 #define WebKitWebGLEnabledPreferenceKey @"WebKitWebGLEnabled"
 #define WebKitAccelerated2dCanvasEnabledPreferenceKey @"WebKitAccelerated2dCanvasEnabled"
-#define WebKitPluginAllowedRunTimePreferenceKey @"WebKitPluginAllowedRunTime"
 #define WebKitFrameFlatteningEnabledPreferenceKey @"WebKitFrameFlatteningEnabled"
 #define WebKitSpatialNavigationEnabledPreferenceKey @"WebKitSpatialNavigationEnabled"
 #define WebKitPaginateDuringLayoutEnabledPreferenceKey @"WebKitPaginateDuringLayoutEnabled"
index 9d3aa4c..c2796f9 100644 (file)
@@ -367,7 +367,6 @@ static WebCacheModel cacheModelForMainBundle(void)
         [NSNumber numberWithBool:NO],   WebKitShowRepaintCounterPreferenceKey,
         [NSNumber numberWithBool:NO],   WebKitWebGLEnabledPreferenceKey,
         [NSNumber numberWithBool:NO],   WebKitAccelerated2dCanvasEnabledPreferenceKey,
-        [NSNumber numberWithUnsignedInt:4], WebKitPluginAllowedRunTimePreferenceKey,
         [NSNumber numberWithBool:NO],   WebKitFrameFlatteningEnabledPreferenceKey,
         [NSNumber numberWithBool:NO],   WebKitSpatialNavigationEnabledPreferenceKey,
         [NSNumber numberWithBool:NO],  WebKitDNSPrefetchingEnabledPreferenceKey,
@@ -1333,16 +1332,6 @@ static NSString *classIBCreatorID = nil;
     [self _setBoolValue:enabled forKey:WebKitAccelerated2dCanvasEnabledPreferenceKey];
 }
 
-- (unsigned)pluginAllowedRunTime
-{
-    return [self _integerValueForKey:WebKitPluginAllowedRunTimePreferenceKey];
-}
-
-- (void)setPluginAllowedRunTime:(unsigned)allowedRunTime
-{
-    return [self _setIntegerValue:allowedRunTime forKey:WebKitPluginAllowedRunTimePreferenceKey];
-}
-
 - (BOOL)isFrameFlatteningEnabled
 {
     return [self _boolValueForKey:WebKitFrameFlatteningEnabledPreferenceKey];
index 9d67a85..7bf2f33 100644 (file)
@@ -126,9 +126,6 @@ extern NSString *WebPreferencesChangedInternalNotification;
 - (BOOL)experimentalNotificationsEnabled;
 - (void)setExperimentalNotificationsEnabled:(BOOL)notificationsEnabled;
 
-- (unsigned)pluginAllowedRunTime;
-- (void)setPluginAllowedRunTime:(unsigned)allowedRunTime;
-
 - (BOOL)isFrameFlatteningEnabled;
 - (void)setFrameFlatteningEnabled:(BOOL)flag;
 
index 7d2fcf6..cabedc2 100644 (file)
@@ -91,7 +91,6 @@
 #import "WebPanelAuthenticationHandler.h"
 #import "WebPlatformStrategies.h"
 #import "WebPluginDatabase.h"
-#import "WebPluginHalterClient.h"
 #import "WebPolicyDelegate.h"
 #import "WebPreferenceKeysPrivate.h"
 #import "WebPreferencesPrivate.h"
@@ -744,7 +743,6 @@ static NSString *leakSolarWalkQuirksUserScriptContents()
     pageClients.editorClient = new WebEditorClient(self);
     pageClients.dragClient = new WebDragClient(self);
     pageClients.inspectorClient = new WebInspectorClient(self);
-    pageClients.pluginHalterClient = adoptPtr(new WebPluginHalterClient(self));
 #if ENABLE(CLIENT_BASED_GEOLOCATION)
     pageClients.geolocationClient = new WebGeolocationClient(self);
 #endif
@@ -1563,7 +1561,6 @@ static bool needsSelfRetainWhileLoadingQuirk()
     settings->setCanvasUsesAcceleratedDrawing([preferences canvasUsesAcceleratedDrawing]);    
     settings->setShowDebugBorders([preferences showDebugBorders]);
     settings->setShowRepaintCounter([preferences showRepaintCounter]);
-    settings->setPluginAllowedRunTime([preferences pluginAllowedRunTime]);
     settings->setWebAudioEnabled([preferences webAudioEnabled]);
     settings->setWebGLEnabled([preferences webGLEnabled]);
     settings->setAccelerated2dCanvasEnabled([preferences accelerated2dCanvasEnabled]);
@@ -2539,59 +2536,6 @@ static inline IMP getMethod(id o, SEL s)
     return _private->includesFlattenedCompositingLayersWhenDrawingToBitmap;
 }
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
-static WebBaseNetscapePluginView *_pluginViewForNode(DOMNode *node)
-{
-    if (!node)
-        return nil;
-    
-    Node* coreNode = core(node);
-    if (!coreNode)
-        return nil;
-    
-    RenderObject* renderer = coreNode->renderer();
-    if (!renderer || !renderer->isWidget())
-        return nil;
-    
-    Widget* widget = toRenderWidget(renderer)->widget();
-    if (!widget || !widget->platformWidget())
-        return nil;
-    
-    NSView *view = widget->platformWidget();
-    if (![view isKindOfClass:[WebBaseNetscapePluginView class]])
-        return nil;
-    
-    return (WebBaseNetscapePluginView *)view;
-}
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
-
-+ (BOOL)_isNodeHaltedPlugin:(DOMNode *)node
-{
-#if ENABLE(NETSCAPE_PLUGIN_API)
-    return [_pluginViewForNode(node) isHalted];
-#else
-    return YES;
-#endif
-}
-
-+ (BOOL)_hasPluginForNodeBeenHalted:(DOMNode *)node
-{
-#if ENABLE(NETSCAPE_PLUGIN_API)
-    return [_pluginViewForNode(node) hasBeenHalted];
-#else
-    return YES;
-#endif
-}
-+ (void)_restartHaltedPluginForNode:(DOMNode *)node
-{
-#if ENABLE(NETSCAPE_PLUGIN_API)
-    if (!node)
-        return;
-    
-    [_pluginViewForNode(node) resumeFromHalt];
-#endif
-}
-
 - (NSPasteboard *)_insertionPasteboard
 {
     return _private ? _private->insertionPasteboard : nil;
index 0bf80c9..9844620 100644 (file)
@@ -503,11 +503,6 @@ Could be worth adding to the API.
 - (void)_setIncludesFlattenedCompositingLayersWhenDrawingToBitmap:(BOOL)flag;
 - (BOOL)_includesFlattenedCompositingLayersWhenDrawingToBitmap;
 
-// SPI for PluginHalter
-+ (BOOL)_isNodeHaltedPlugin:(DOMNode *)node;
-+ (BOOL)_hasPluginForNodeBeenHalted:(DOMNode *)node;
-+ (void)_restartHaltedPluginForNode:(DOMNode *)node;
-
 // Which pasteboard text is coming from in editing delegate methods such as shouldInsertNode.
 - (NSPasteboard *)_insertionPasteboard;
 
index b80e659..05e1b64 100644 (file)
@@ -1,3 +1,35 @@
+2011-08-05  Anders Carlsson  <andersca@apple.com>
+
+        Remove PluginHalter
+        https://bugs.webkit.org/show_bug.cgi?id=65729
+
+        Reviewed by Darin Adler.
+
+        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:
+
 2011-08-04  Jeff Miller  <jeffm@apple.com>
 
         Add support for setting and getting whether AVFoundation is enabled to IWebPreferences
diff --git a/Source/WebKit/win/Interfaces/IWebPluginHalterDelegate.idl b/Source/WebKit/win/Interfaces/IWebPluginHalterDelegate.idl
deleted file mode 100644 (file)
index e113da8..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2009 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef DO_NO_IMPORTS
-import "oaidl.idl";
-import "ocidl.idl";
-#endif
-
-interface IDOMNode;
-interface IWebView;
-
-[
-    object,
-    oleautomation,
-    uuid(2e0e5d9e-ffc9-4185-aa15-e66868d548ee),
-    pointer_default(unique)
-]
-interface IWebPluginHalterDelegate : IUnknown
-{
-    HRESULT shouldHaltPlugin([in] IWebView* webView, [in] IDOMNode*, [in] BOOL isWindowed, [in] BSTR pluginName, [out, retval] BOOL* result);
-}
index e95c23c..bdff78c 100644 (file)
@@ -92,8 +92,8 @@ interface IWebPreferencesPrivate : IUnknown
     // Used by DumpRenderTree.
     HRESULT setPreferenceForTest([in] BSTR key, [in] BSTR value);
 
-    HRESULT setPluginAllowedRunTime([in] UINT allowedRunTime);
-    HRESULT pluginAllowedRunTime([out, retval] UINT* allowedRunTime);
+    HRESULT unused1();
+    HRESULT unused2();
 
     HRESULT setAcceleratedCompositingEnabled([in] BOOL);
     HRESULT acceleratedCompositingEnabled([out, retval] BOOL*);
index d8245fc..46bd419 100644 (file)
@@ -42,7 +42,6 @@ interface IWebFrameLoadDelegatePrivate;
 interface IWebHistoryDelegate;
 interface IWebInspector;
 interface IWebInspectorPrivate;
-interface IWebPluginHalterDelegate;
 interface IWebURLRequest;
 interface IWebView;
 
@@ -197,8 +196,8 @@ interface IWebViewPrivate : IUnknown
     HRESULT removeUserStyleSheetsFromGroup([in] BSTR groupName, [in] IWebScriptWorld*);
     HRESULT removeAllUserContentFromGroup([in] BSTR groupName);
 
-    HRESULT setPluginHalterDelegate([in] IWebPluginHalterDelegate* d);
-    HRESULT pluginHalterDelegate([retval, out] IWebPluginHalterDelegate** d);
+    HRESULT unused1();
+    HRESULT unused2();
 
     // If rect is 0, the entire backing store will be invalidated.
     HRESULT invalidateBackingStore([in] const RECT* rect);
@@ -219,9 +218,9 @@ interface IWebViewPrivate : IUnknown
     HRESULT historyDelegate([out,retval] IWebHistoryDelegate** historyDelegate);
     HRESULT addVisitedLinks([in] BSTR* visitedURLs, [in] unsigned visitedURLCount);
 
-    HRESULT isNodeHaltedPlugin([in] IDOMNode*, [retval, out] BOOL*);
-    HRESULT restartHaltedPluginForNode([in] IDOMNode*);
-    HRESULT hasPluginForNodeBeenHalted([in] IDOMNode*, [retval, out] BOOL*);
+    HRESULT unused3();
+    HRESULT unused4();
+    HRESULT unused5();
 
     HRESULT setGeolocationProvider([in] IWebGeolocationProvider* locationProvider);
     HRESULT geolocationProvider([out, retval] IWebGeolocationProvider** locationProvider);
index 88158a4..8c78696 100644 (file)
@@ -109,7 +109,6 @@ import "ocidl.idl";
 #include "IWebNotification.idl"
 #include "IWebNotificationCenter.idl"
 #include "IWebNotificationObserver.idl"
-#include "IWebPluginHalterDelegate.idl"
 #include "IWebPolicyDelegate.idl"
 #include "IWebPolicyDelegatePrivate.idl"
 #include "IWebPreferences.idl"
diff --git a/Source/WebKit/win/WebCoreSupport/WebPluginHalterClient.cpp b/Source/WebKit/win/WebCoreSupport/WebPluginHalterClient.cpp
deleted file mode 100644 (file)
index 995b05d..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2009 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#include "config.h"
-
-#include "WebPluginHalterClient.h"
-
-#include "DOMCoreClasses.h"
-#include "WebView.h"
-#include <WebCore/Node.h>
-#include <wtf/Assertions.h>
-
-using namespace WebCore;
-
-WebPluginHalterClient::WebPluginHalterClient(WebView* webView)
-    : m_webView(webView)
-{
-    ASSERT_ARG(webView, webView);
-}
-
-bool WebPluginHalterClient::shouldHaltPlugin(Node* n, bool isWindowed, const String& pluginName) const
-{
-    ASSERT_ARG(n, n);
-
-    IWebPluginHalterDelegate* d;
-    if (FAILED(m_webView->pluginHalterDelegate(&d)) || !d)
-        return false;
-
-    COMPtr<IDOMNode> domNode(AdoptCOM, DOMNode::createInstance(n));
-
-    BOOL shouldHalt;
-    if (FAILED(d->shouldHaltPlugin(m_webView, domNode.get(), isWindowed, BString(pluginName), &shouldHalt)))
-        return false;
-
-    return shouldHalt;
-}
-
-bool WebPluginHalterClient::enabled() const
-{
-    IWebPluginHalterDelegate* d;
-    if (FAILED(m_webView->pluginHalterDelegate(&d)) || !d)
-        return false;
-
-    return true;
-}
diff --git a/Source/WebKit/win/WebCoreSupport/WebPluginHalterClient.h b/Source/WebKit/win/WebCoreSupport/WebPluginHalterClient.h
deleted file mode 100644 (file)
index 9a4ca01..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2009 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef WebPluginHalterClient_h
-#define WebPluginHalterClient_h
-
-#include <WebCore/PluginHalterClient.h>
-#include <wtf/Forward.h>
-
-namespace WebCore {
-    class Node;
-}
-
-class WebView;
-
-class WebPluginHalterClient : public WebCore::PluginHalterClient {
-public:
-    WebPluginHalterClient(WebView* webView);
-
-    virtual bool shouldHaltPlugin(WebCore::Node* n, bool isWindowed, const WTF::String& pluginName) const;
-    virtual bool enabled() const;
-
-private:
-    WebView* m_webView;
-};
-
-#endif // WebPluginHalterClient_h
index 724f98d..39c6eb7 100644 (file)
                        </FileConfiguration>
                </File>
                <File
-                       RelativePath="..\Interfaces\IWebPluginHalterDelegate.idl"
-                       >
-                       <FileConfiguration
-                               Name="Debug|Win32"
-                               ExcludedFromBuild="true"
-                               >
-                               <Tool
-                                       Name="VCMIDLTool"
-                               />
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="Release|Win32"
-                               ExcludedFromBuild="true"
-                               >
-                               <Tool
-                                       Name="VCMIDLTool"
-                               />
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="Production|Win32"
-                               ExcludedFromBuild="true"
-                               >
-                               <Tool
-                                       Name="VCMIDLTool"
-                               />
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="Debug_All|Win32"
-                               ExcludedFromBuild="true"
-                               >
-                               <Tool
-                                       Name="VCMIDLTool"
-                               />
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="Release_Cairo_CFLite|Win32"
-                               ExcludedFromBuild="true"
-                               >
-                               <Tool
-                                       Name="VCMIDLTool"
-                               />
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="Debug_Cairo_CFLite|Win32"
-                               ExcludedFromBuild="true"
-                               >
-                               <Tool
-                                       Name="VCMIDLTool"
-                               />
-                       </FileConfiguration>
-               </File>
-               <File
                        RelativePath="..\Interfaces\IWebPolicyDelegate.idl"
                        >
                        <FileConfiguration
index 4d25f44..3287a16 100644 (file)
                                RelativePath="..\WebCoreSupport\WebPlatformStrategies.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\WebCoreSupport\WebPluginHalterClient.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\WebCoreSupport\WebPluginHalterClient.h"
-                               >
-                       </File>
                </Filter>
                <File
                        RelativePath="..\WebKitPrefix.cpp"
index 67d643b..f99322e 100644 (file)
 
 #define WebKitUseHighResolutionTimersPreferenceKey "WebKitUseHighResolutionTimers"
 
-#define WebKitPluginAllowedRunTimePreferenceKey "WebKitPluginAllowedRunTime"
-
 #define WebKitFrameFlatteningEnabledPreferenceKey "WebKitFrameFlatteningEnabled"
 
 #define WebKitAcceleratedCompositingEnabledPreferenceKey "WebKitAcceleratedCompositingEnabled"
index dec1375..1a83c7b 100644 (file)
@@ -256,9 +256,6 @@ void WebPreferences::initializeDefaultSettings()
 
     CFDictionaryAddValue(defaults, CFSTR(WebKitUseHighResolutionTimersPreferenceKey), kCFBooleanTrue);
 
-    RetainPtr<CFStringRef> pluginAllowedRunTime(AdoptCF, CFStringCreateWithFormat(0, 0, CFSTR("%u"), numeric_limits<unsigned>::max()));
-    CFDictionaryAddValue(defaults, CFSTR(WebKitPluginAllowedRunTimePreferenceKey), pluginAllowedRunTime.get());
-
     CFDictionaryAddValue(defaults, CFSTR(WebKitAcceleratedCompositingEnabledPreferenceKey), kCFBooleanFalse);
     
     CFDictionaryAddValue(defaults, CFSTR(WebKitShowDebugBordersPreferenceKey), kCFBooleanFalse);
@@ -1490,18 +1487,6 @@ HRESULT STDMETHODCALLTYPE WebPreferences::shouldUseHighResolutionTimers(BOOL* us
     return S_OK;
 }
 
-HRESULT WebPreferences::setPluginAllowedRunTime(UINT allowedRunTime)
-{
-    setIntegerValue(CFSTR(WebKitPluginAllowedRunTimePreferenceKey), allowedRunTime);
-    return S_OK;
-}
-
-HRESULT WebPreferences::pluginAllowedRunTime(UINT* allowedRunTime)
-{
-    *allowedRunTime = integerValueForKey(CFSTR(WebKitPluginAllowedRunTimePreferenceKey));
-    return S_OK;
-}
-
 HRESULT WebPreferences::setPreferenceForTest(BSTR key, BSTR value)
 {
     if (!SysStringLen(key) || !SysStringLen(value))
index 9024847..d16ccef 100644 (file)
@@ -404,12 +404,6 @@ public:
     virtual HRESULT STDMETHODCALLTYPE shouldUseHighResolutionTimers(
     /* [retval][out] */ BOOL* useHighResolutionTimers);
 
-    virtual HRESULT STDMETHODCALLTYPE setPluginAllowedRunTime(
-    /* [in] */ UINT allowedRunTime);
-
-    virtual HRESULT STDMETHODCALLTYPE pluginAllowedRunTime(
-    /* [retval][out] */ UINT* allowedRunTime);
-
     virtual HRESULT STDMETHODCALLTYPE isFrameFlatteningEnabled(
     /* [retval][out] */ BOOL* enabled);
 
index a4b479d..889fba8 100644 (file)
@@ -57,7 +57,6 @@
 #include "WebMutableURLRequest.h"
 #include "WebNotificationCenter.h"
 #include "WebPlatformStrategies.h"
-#include "WebPluginHalterClient.h"
 #include "WebPreferences.h"
 #include "WebScriptWorld.h"
 #include "resource.h"
@@ -708,7 +707,6 @@ HRESULT STDMETHODCALLTYPE WebView::close()
     setResourceLoadDelegate(0);
     setUIDelegate(0);
     setFormDelegate(0);
-    setPluginHalterDelegate(0);
 
     if (m_webInspector)
         m_webInspector->webViewClosed();
@@ -2643,7 +2641,6 @@ HRESULT STDMETHODCALLTYPE WebView::initWithFrame(
     pageClients.editorClient = new WebEditorClient(this);
     pageClients.dragClient = new WebDragClient(this);
     pageClients.inspectorClient = new WebInspectorClient(this);
-    pageClients.pluginHalterClient = adoptPtr(new WebPluginHalterClient(this));
 #if ENABLE(CLIENT_BASED_GEOLOCATION)
     pageClients.geolocationClient = new WebGeolocationClient(this);
 #endif
@@ -4806,12 +4803,6 @@ HRESULT WebView::notifyPreferencesChanged(IWebNotification* notification)
         return hr;
     settings->setShouldUseHighResolutionTimers(enabled);
 
-    UINT runTime;
-    hr = prefsPrivate->pluginAllowedRunTime(&runTime);
-    if (FAILED(hr))
-        return hr;
-    settings->setPluginAllowedRunTime(runTime);
-
     hr = prefsPrivate->isFrameFlatteningEnabled(&enabled);
     if (FAILED(hr))
         return hr;
@@ -6467,85 +6458,34 @@ void WebView::setAcceleratedCompositing(bool accelerated)
 }
 #endif
 
-HRESULT STDMETHODCALLTYPE WebView::setPluginHalterDelegate(IWebPluginHalterDelegate* d)
-{
-    m_pluginHalterDelegate = d;
-    return S_OK;
-}
-
-HRESULT STDMETHODCALLTYPE WebView::pluginHalterDelegate(IWebPluginHalterDelegate** d)
+HRESULT WebView::unused1()
 {
-    if (!d)
-        return E_POINTER;
-
-    if (!m_pluginHalterDelegate)
-        return E_FAIL;
-
-    return m_pluginHalterDelegate.copyRefTo(d);
+    ASSERT_NOT_REACHED();
+    return E_FAIL;
 }
 
-static PluginView* pluginViewForNode(IDOMNode* domNode)
+HRESULT WebView::unused2()
 {
-    COMPtr<DOMNode> webKitDOMNode(Query, domNode);
-    if (!webKitDOMNode)
-        return 0;
-
-    Node* node = webKitDOMNode->node();
-    if (!node)
-        return 0;
-
-    RenderObject* renderer = node->renderer();
-    if (!renderer || !renderer->isWidget())
-        return 0;
-
-    Widget* widget = toRenderWidget(renderer)->widget();
-    if (!widget || !widget->isPluginView())
-        return 0;
-
-    return static_cast<PluginView*>(widget);
+    ASSERT_NOT_REACHED();
+    return E_FAIL;
 }
 
-HRESULT WebView::isNodeHaltedPlugin(IDOMNode* domNode, BOOL* result)
+HRESULT WebView::unused3()
 {
-    if (!domNode || !result)
-        return E_POINTER;
-
-    *result = FALSE;
-
-    PluginView* view = pluginViewForNode(domNode);
-    if (!view)
-        return E_FAIL;
-
-    *result = view->isHalted();
-    return S_OK;
+    ASSERT_NOT_REACHED();
+    return E_FAIL;
 }
 
-HRESULT WebView::restartHaltedPluginForNode(IDOMNode* domNode)
+HRESULT WebView::unused4()
 {
-    if (!domNode)
-        return E_POINTER;
-
-    PluginView* view = pluginViewForNode(domNode);
-    if (!view)
-        return E_FAIL;
-
-    view->restart();
-    return S_OK;
+    ASSERT_NOT_REACHED();
+    return E_FAIL;
 }
 
-HRESULT WebView::hasPluginForNodeBeenHalted(IDOMNode* domNode, BOOL* result)
+HRESULT WebView::unused5()
 {
-    if (!domNode || !result)
-        return E_POINTER;
-
-    *result = FALSE;
-
-    PluginView* view = pluginViewForNode(domNode);
-    if (!view)
-        return E_FAIL;
-
-    *result = view->hasBeenHalted();
-    return S_OK;
+    ASSERT_NOT_REACHED();
+    return E_FAIL;
 }
 
 HRESULT WebView::setGeolocationProvider(IWebGeolocationProvider* locationProvider)
index 876628b..b1d0a6c 100644 (file)
@@ -802,8 +802,8 @@ public:
     virtual HRESULT STDMETHODCALLTYPE removeUserStyleSheetsFromGroup(BSTR groupName, IWebScriptWorld*);
     virtual HRESULT STDMETHODCALLTYPE removeAllUserContentFromGroup(BSTR groupName);
 
-    virtual HRESULT STDMETHODCALLTYPE setPluginHalterDelegate(IWebPluginHalterDelegate*);
-    virtual HRESULT STDMETHODCALLTYPE pluginHalterDelegate(IWebPluginHalterDelegate**);
+    virtual HRESULT STDMETHODCALLTYPE unused1();
+    virtual HRESULT STDMETHODCALLTYPE unused2();
 
     virtual HRESULT STDMETHODCALLTYPE invalidateBackingStore(const RECT*);
 
@@ -815,9 +815,9 @@ public:
     virtual HRESULT STDMETHODCALLTYPE historyDelegate(IWebHistoryDelegate** historyDelegate);
     virtual HRESULT STDMETHODCALLTYPE addVisitedLinks(BSTR* visitedURLs, unsigned visitedURLCount);
 
-    virtual HRESULT STDMETHODCALLTYPE isNodeHaltedPlugin(IDOMNode*, BOOL*);
-    virtual HRESULT STDMETHODCALLTYPE restartHaltedPluginForNode(IDOMNode*);
-    virtual HRESULT STDMETHODCALLTYPE hasPluginForNodeBeenHalted(IDOMNode*, BOOL*);
+    virtual HRESULT STDMETHODCALLTYPE unused3();
+    virtual HRESULT STDMETHODCALLTYPE unused4();
+    virtual HRESULT STDMETHODCALLTYPE unused5();
 
     virtual HRESULT STDMETHODCALLTYPE setGeolocationProvider(IWebGeolocationProvider* locationProvider);
     virtual HRESULT STDMETHODCALLTYPE geolocationProvider(IWebGeolocationProvider** locationProvider);
@@ -1059,7 +1059,6 @@ protected:
     COMPtr<IWebHistoryDelegate> m_historyDelegate;
     COMPtr<WebPreferences> m_preferences;
     COMPtr<WebInspector> m_webInspector;
-    COMPtr<IWebPluginHalterDelegate> m_pluginHalterDelegate;
     COMPtr<IWebGeolocationProvider> m_geolocationProvider;
 
     bool m_userAgentOverridden;
index e8dc835..146c828 100644 (file)
@@ -1,3 +1,14 @@
+2011-08-05  Anders Carlsson  <andersca@apple.com>
+
+        Remove PluginHalter
+        https://bugs.webkit.org/show_bug.cgi?id=65729
+
+        Reviewed by Darin Adler.
+
+        Don't include PluginHalterClient.h, it's been removed.
+
+        * WebView.cpp:
+
 2011-08-03  Pavel Feldman  <pfeldman@chromium.org>
 
         Web Inspector: remove Node parameter from the InspectorClient::highlight
index 4987b6e..6aad229 100644 (file)
@@ -49,7 +49,6 @@
 #include "PlatformMouseEvent.h"
 #include "PlatformString.h"
 #include "PlatformWheelEvent.h"
-#include "PluginHalterClient.h"
 #include "RenderObject.h"
 #include "RenderView.h"
 #include "ResourceHandleManager.h"
index e488c29..4559f7d 100644 (file)
@@ -1,3 +1,15 @@
+2011-08-05  Anders Carlsson  <andersca@apple.com>
+
+        Remove PluginHalter
+        https://bugs.webkit.org/show_bug.cgi?id=65729
+
+        Reviewed by Darin Adler.
+
+        Remove call to set the allowed plug-in run time.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (resetDefaultsToConsistentValues):
+
 2011-08-05  Ademar de Souza Reis Jr.  <ademar.reis@openbossa.org>
 
         Unreviewed build fix for Qt-Minimal buildbot
index 4b93597..cd4c1bd 100644 (file)
@@ -447,7 +447,6 @@ static void resetDefaultsToConsistentValues()
     [preferences setCacheModel:WebCacheModelDocumentBrowser];
     [preferences setXSSAuditorEnabled:NO];
     [preferences setExperimentalNotificationsEnabled:NO];
-    [preferences setPluginAllowedRunTime:1];
     [preferences setPlugInsEnabled:YES];
 
     [preferences setPrivateBrowsingEnabled:NO];