<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[185926] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/185926">185926</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-24 14:34:28 -0700 (Wed, 24 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move PluginMainThreadScheduler to WebKit/win
https://bugs.webkit.org/show_bug.cgi?id=146289
Reviewed by Tim Horton.
Source/WebCore:
* CMakeLists.txt:
* Configurations/WebCore.xcconfig:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* plugins/PluginMainThreadScheduler.cpp:
(WebCore::PluginMainThreadScheduler::scheduler): Deleted.
(WebCore::PluginMainThreadScheduler::PluginMainThreadScheduler): Deleted.
(WebCore::PluginMainThreadScheduler::scheduleCall): Deleted.
(WebCore::PluginMainThreadScheduler::registerPlugin): Deleted.
(WebCore::PluginMainThreadScheduler::unregisterPlugin): Deleted.
(WebCore::PluginMainThreadScheduler::dispatchCallsForPlugin): Deleted.
(WebCore::PluginMainThreadScheduler::dispatchCalls): Deleted.
(WebCore::PluginMainThreadScheduler::mainThreadCallback): Deleted.
* plugins/PluginMainThreadScheduler.h:
(WebCore::PluginMainThreadScheduler::Call::Call): Deleted.
(WebCore::PluginMainThreadScheduler::Call::performCall): Deleted.
Source/WebKit:
* WebKit.vcxproj/WebKit/WebKit.vcxproj:
* WebKit.vcxproj/WebKit/WebKit.vcxproj.filters:
Source/WebKit/win:
* Plugins/PluginMainThreadScheduler.cpp: Renamed from Source/WebCore/plugins/PluginMainThreadScheduler.cpp.
(WebCore::PluginMainThreadScheduler::scheduler):
(WebCore::PluginMainThreadScheduler::PluginMainThreadScheduler):
(WebCore::PluginMainThreadScheduler::scheduleCall):
(WebCore::PluginMainThreadScheduler::registerPlugin):
(WebCore::PluginMainThreadScheduler::unregisterPlugin):
(WebCore::PluginMainThreadScheduler::dispatchCallsForPlugin):
(WebCore::PluginMainThreadScheduler::dispatchCalls):
(WebCore::PluginMainThreadScheduler::mainThreadCallback):
* Plugins/PluginMainThreadScheduler.h: Renamed from Source/WebCore/plugins/PluginMainThreadScheduler.h.
(WebCore::PluginMainThreadScheduler::Call::Call):
(WebCore::PluginMainThreadScheduler::Call::performCall):
* Plugins/PluginView.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsWebCorexcconfig">trunk/Source/WebCore/Configurations/WebCore.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitWebKitvcxproj">trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitWebKitvcxprojfilters">trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinPluginsPluginViewcpp">trunk/Source/WebKit/win/Plugins/PluginView.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitwinPluginsPluginMainThreadSchedulercpp">trunk/Source/WebKit/win/Plugins/PluginMainThreadScheduler.cpp</a></li>
<li><a href="#trunkSourceWebKitwinPluginsPluginMainThreadSchedulerh">trunk/Source/WebKit/win/Plugins/PluginMainThreadScheduler.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorepluginsPluginMainThreadSchedulercpp">trunk/Source/WebCore/plugins/PluginMainThreadScheduler.cpp</a></li>
<li><a href="#trunkSourceWebCorepluginsPluginMainThreadSchedulerh">trunk/Source/WebCore/plugins/PluginMainThreadScheduler.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (185925 => 185926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-06-24 20:54:28 UTC (rev 185925)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-06-24 21:34:28 UTC (rev 185926)
</span><span class="lines">@@ -2314,7 +2314,6 @@
</span><span class="cx"> plugins/DOMPlugin.cpp
</span><span class="cx"> plugins/DOMPluginArray.cpp
</span><span class="cx"> plugins/PluginData.cpp
</span><del>- plugins/PluginMainThreadScheduler.cpp
</del><span class="cx">
</span><span class="cx"> rendering/AutoTableLayout.cpp
</span><span class="cx"> rendering/BidiRun.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185925 => 185926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-24 20:54:28 UTC (rev 185925)
+++ trunk/Source/WebCore/ChangeLog 2015-06-24 21:34:28 UTC (rev 185926)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-06-24 Anders Carlsson <andersca@apple.com>
+
+ Move PluginMainThreadScheduler to WebKit/win
+ https://bugs.webkit.org/show_bug.cgi?id=146289
+
+ Reviewed by Tim Horton.
+
+ * CMakeLists.txt:
+ * Configurations/WebCore.xcconfig:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * plugins/PluginMainThreadScheduler.cpp:
+ (WebCore::PluginMainThreadScheduler::scheduler): Deleted.
+ (WebCore::PluginMainThreadScheduler::PluginMainThreadScheduler): Deleted.
+ (WebCore::PluginMainThreadScheduler::scheduleCall): Deleted.
+ (WebCore::PluginMainThreadScheduler::registerPlugin): Deleted.
+ (WebCore::PluginMainThreadScheduler::unregisterPlugin): Deleted.
+ (WebCore::PluginMainThreadScheduler::dispatchCallsForPlugin): Deleted.
+ (WebCore::PluginMainThreadScheduler::dispatchCalls): Deleted.
+ (WebCore::PluginMainThreadScheduler::mainThreadCallback): Deleted.
+ * plugins/PluginMainThreadScheduler.h:
+ (WebCore::PluginMainThreadScheduler::Call::Call): Deleted.
+ (WebCore::PluginMainThreadScheduler::Call::performCall): Deleted.
+
</ins><span class="cx"> 2015-06-24 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Better fix for Element with blur backdrop-filter shows edge duplication and dark edges
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsWebCorexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (185925 => 185926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2015-06-24 20:54:28 UTC (rev 185925)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2015-06-24 21:34:28 UTC (rev 185926)
</span><span class="lines">@@ -94,5 +94,5 @@
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS = $(EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS_IF_ENABLED_$(ENABLE_IOS_GESTURE_EVENTS));
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS_IF_ENABLED_ = JSGesture* DOMGesture*;
</span><span class="cx">
</span><del>-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.tiff *Cursor.png AccessibilityObjectMac.mm AXObjectCacheMac.mm ColorMac.mm Cursor.cpp CursorMac.mm DataTransferMac.mm EditorMac.mm EventHandlerMac.mm EventLoopMac.mm GeolocationServiceMac.mm GraphicsContext3DOpenGLES.cpp IconDatabase.cpp IconMac.mm KillRingMac.mm LocalCurrentGraphicsContext.mm MIMETypeRegistryMac.mm MediaPlayerPrivateQTKit.mm NSScrollerImpDetails.mm NetworkStateNotifierMac.cpp PasteboardMac.mm PlatformEventFactoryMac.mm PlatformMouseEventMac.mm PlatformPasteboardMac.mm PlatformScreenMac.mm PlatformSpeechSynthesizerMac.mm PluginMainThreadScheduler.cpp RunLoopMac.mm SSLKeyGeneratorMac.cpp ScrollViewMac.mm ScrollbarThemeMac.mm SharedTimerMac.mm SoundMac.mm SystemTimeMac.cpp ThemeMac.mm ThreadCheck.mm UserAgentMac.mm WebAccessibilityObjectWrapperMac.mm WebCoreSystemInterface.mm WebCoreView.m WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm WidgetMac.mm DisplayRe
freshMonitorMac.cpp $(EXCLUDED_SOURCE_FILE_NAMES_FOR_TOUCH_EVENTS) $(EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS);
</del><ins>+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.tiff *Cursor.png AccessibilityObjectMac.mm AXObjectCacheMac.mm ColorMac.mm Cursor.cpp CursorMac.mm DataTransferMac.mm EditorMac.mm EventHandlerMac.mm EventLoopMac.mm GeolocationServiceMac.mm GraphicsContext3DOpenGLES.cpp IconDatabase.cpp IconMac.mm KillRingMac.mm LocalCurrentGraphicsContext.mm MIMETypeRegistryMac.mm MediaPlayerPrivateQTKit.mm NSScrollerImpDetails.mm NetworkStateNotifierMac.cpp PasteboardMac.mm PlatformEventFactoryMac.mm PlatformMouseEventMac.mm PlatformPasteboardMac.mm PlatformScreenMac.mm PlatformSpeechSynthesizerMac.mm RunLoopMac.mm SSLKeyGeneratorMac.cpp ScrollViewMac.mm ScrollbarThemeMac.mm SharedTimerMac.mm SoundMac.mm SystemTimeMac.cpp ThemeMac.mm ThreadCheck.mm UserAgentMac.mm WebAccessibilityObjectWrapperMac.mm WebCoreSystemInterface.mm WebCoreView.m WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm WidgetMac.mm DisplayRefreshMonitorMac.cpp $(EXCLUDED_
SOURCE_FILE_NAMES_FOR_TOUCH_EVENTS) $(EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS);
</ins><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = *IOS.h *IOS.cpp *IOS.mm KillRingNone.cpp WAKAppKitStubs.h WAKClipView.h WAKResponder.h WAKScrollView.h WAKView.h WAKViewPrivate.h WAKWindow.h WKContentObservation.h WKGraphics.h WKTypes.h WKUtilities.h WKView.h WKViewPrivate.h WebCoreThread.h WebCoreThreadMessage.h WebCoreThreadRun.h WebCoreThreadSystemInterface.h $(EXCLUDED_SOURCE_FILE_NAMES_FOR_TOUCH_EVENTS) $(EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS);
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (185925 => 185926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-06-24 20:54:28 UTC (rev 185925)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-06-24 21:34:28 UTC (rev 185926)
</span><span class="lines">@@ -17898,7 +17898,6 @@
</span><span class="cx"> <ClCompile Include="..\plugins\DOMPlugin.cpp" />
</span><span class="cx"> <ClCompile Include="..\plugins\DOMPluginArray.cpp" />
</span><span class="cx"> <ClCompile Include="..\plugins\PluginData.cpp" />
</span><del>- <ClCompile Include="..\plugins\PluginMainThreadScheduler.cpp" />
</del><span class="cx"> <ClCompile Include="..\svg\SVGAllInOne.cpp" />
</span><span class="cx"> <ClCompile Include="..\svg\SVGFontFaceElement.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -21401,7 +21400,6 @@
</span><span class="cx"> <ClInclude Include="..\plugins\npfunctions.h" />
</span><span class="cx"> <ClInclude Include="..\plugins\npruntime.h" />
</span><span class="cx"> <ClInclude Include="..\plugins\PluginData.h" />
</span><del>- <ClInclude Include="..\plugins\PluginMainThreadScheduler.h" />
</del><span class="cx"> <ClInclude Include="..\svg\ColorDistance.h" />
</span><span class="cx"> <ClInclude Include="..\svg\SVGAElement.h" />
</span><span class="cx"> <ClInclude Include="..\svg\SVGAltGlyphDefElement.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (185925 => 185926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-06-24 20:54:28 UTC (rev 185925)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-06-24 21:34:28 UTC (rev 185926)
</span><span class="lines">@@ -4533,9 +4533,6 @@
</span><span class="cx"> <ClCompile Include="..\plugins\PluginData.cpp">
</span><span class="cx"> <Filter>plugins</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\plugins\PluginMainThreadScheduler.cpp">
- <Filter>plugins</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\svg\animation\SMILTime.cpp">
</span><span class="cx"> <Filter>svg\animation</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -11571,9 +11568,6 @@
</span><span class="cx"> <ClInclude Include="..\plugins\PluginData.h">
</span><span class="cx"> <Filter>plugins</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\plugins\PluginMainThreadScheduler.h">
- <Filter>plugins</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\svg\animation\SMILTime.h">
</span><span class="cx"> <Filter>svg\animation</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (185925 => 185926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-06-24 20:54:28 UTC (rev 185925)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-06-24 21:34:28 UTC (rev 185926)
</span><span class="lines">@@ -842,8 +842,6 @@
</span><span class="cx"> 1AD2316E0CD269E700C1F194 /* JSSQLTransactionCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD2316D0CD269E700C1F194 /* JSSQLTransactionCustom.cpp */; };
</span><span class="cx"> 1AD8F81B11CAB9E900E93E54 /* PlatformStrategies.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 1AD8F81C11CAB9E900E93E54 /* PlatformStrategies.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */; };
</span><del>- 1ADA14100E1AE5D900023EE5 /* PluginMainThreadScheduler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ADA140E0E1AE5D900023EE5 /* PluginMainThreadScheduler.cpp */; };
- 1ADA14110E1AE5D900023EE5 /* PluginMainThreadScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ADA140F0E1AE5D900023EE5 /* PluginMainThreadScheduler.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 1AE00D59182DAC8D00087DD7 /* KeyedCoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE00D57182DAC8D00087DD7 /* KeyedCoding.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 1AE2AA1E0A1CDAB400B42B25 /* JSHTMLAreaElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE2AA0A0A1CDAB300B42B25 /* JSHTMLAreaElement.cpp */; };
</span><span class="cx"> 1AE2AA1F0A1CDAB400B42B25 /* JSHTMLAreaElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE2AA0B0A1CDAB300B42B25 /* JSHTMLAreaElement.h */; };
</span><span class="lines">@@ -7970,8 +7968,6 @@
</span><span class="cx"> 1AD2316D0CD269E700C1F194 /* JSSQLTransactionCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSQLTransactionCustom.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformStrategies.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformStrategies.cpp; sourceTree = "<group>"; };
</span><del>- 1ADA140E0E1AE5D900023EE5 /* PluginMainThreadScheduler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginMainThreadScheduler.cpp; sourceTree = "<group>"; };
- 1ADA140F0E1AE5D900023EE5 /* PluginMainThreadScheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginMainThreadScheduler.h; sourceTree = "<group>"; };
</del><span class="cx"> 1AE00D57182DAC8D00087DD7 /* KeyedCoding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KeyedCoding.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AE2A9F00A1CDA5700B42B25 /* HTMLAreaElement.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = HTMLAreaElement.idl; sourceTree = "<group>"; };
</span><span class="cx"> 1AE2A9F10A1CDA5700B42B25 /* HTMLBaseFontElement.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = HTMLBaseFontElement.idl; sourceTree = "<group>"; };
</span><span class="lines">@@ -16580,8 +16576,6 @@
</span><span class="cx"> 1A927FD11416A15B003A83C8 /* nptypes.h */,
</span><span class="cx"> A9C6E4F10D745E48006442E9 /* PluginData.cpp */,
</span><span class="cx"> A9C6E4F20D745E48006442E9 /* PluginData.h */,
</span><del>- 1ADA140E0E1AE5D900023EE5 /* PluginMainThreadScheduler.cpp */,
- 1ADA140F0E1AE5D900023EE5 /* PluginMainThreadScheduler.h */,
</del><span class="cx"> 1AA8798F11CBE846003C664F /* PluginStrategy.h */,
</span><span class="cx"> 0AFDAC3C10F5448C00E1F3D2 /* PluginViewBase.h */,
</span><span class="cx"> );
</span><span class="lines">@@ -26143,7 +26137,6 @@
</span><span class="cx"> 31D591B316697A6C00E6BF02 /* PlugInClient.h in Headers */,
</span><span class="cx"> A9C6E4F40D745E48006442E9 /* PluginData.h in Headers */,
</span><span class="cx"> 97205ABC1239292700B17380 /* PluginDocument.h in Headers */,
</span><del>- 1ADA14110E1AE5D900023EE5 /* PluginMainThreadScheduler.h in Headers */,
</del><span class="cx"> 072AE1E5183C0741000A5988 /* PluginReplacement.h in Headers */,
</span><span class="cx"> 71E2183A17359FB8006E6E4D /* PlugInsResources.h in Headers */,
</span><span class="cx"> 1AA8799011CBE846003C664F /* PluginStrategy.h in Headers */,
</span><span class="lines">@@ -29680,7 +29673,6 @@
</span><span class="cx"> 074E82BA18A69F0E007EF54C /* PlatformTimeRanges.cpp in Sources */,
</span><span class="cx"> A9C6E4F30D745E48006442E9 /* PluginData.cpp in Sources */,
</span><span class="cx"> 97205ABB1239292700B17380 /* PluginDocument.cpp in Sources */,
</span><del>- 1ADA14100E1AE5D900023EE5 /* PluginMainThreadScheduler.cpp in Sources */,
</del><span class="cx"> 71E2183B17359FB8006E6E4D /* PlugInsResourcesData.cpp in Sources */,
</span><span class="cx"> B2B1F7160D00CAA8004AEA64 /* PointerEventsHitRules.cpp in Sources */,
</span><span class="cx"> 5CFC4350192409E300A0D3B5 /* PointerLockController.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsPluginMainThreadSchedulercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/plugins/PluginMainThreadScheduler.cpp (185925 => 185926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/PluginMainThreadScheduler.cpp 2015-06-24 20:54:28 UTC (rev 185925)
+++ trunk/Source/WebCore/plugins/PluginMainThreadScheduler.cpp 2015-06-24 21:34:28 UTC (rev 185926)
</span><span class="lines">@@ -1,110 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 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 "PluginMainThreadScheduler.h"
-
-namespace WebCore {
-
-PluginMainThreadScheduler& PluginMainThreadScheduler::scheduler()
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(PluginMainThreadScheduler, scheduler, ());
-
- return scheduler;
-}
-
-PluginMainThreadScheduler::PluginMainThreadScheduler()
- : m_callPending(false)
-{
-}
-
-void PluginMainThreadScheduler::scheduleCall(NPP npp, MainThreadFunction function, void* userData)
-{
- MutexLocker lock(m_queueMutex);
-
- CallQueueMap::iterator it = m_callQueueMap.find(npp);
- if (it == m_callQueueMap.end())
- return;
-
- it->value.append(Call(function, userData));
-
- if (!m_callPending) {
- callOnMainThread(mainThreadCallback, this);
- m_callPending = true;
- }
-}
-
-void PluginMainThreadScheduler::registerPlugin(NPP npp)
-{
- MutexLocker lock(m_queueMutex);
-
- ASSERT(!m_callQueueMap.contains(npp));
- m_callQueueMap.set(npp, Deque<Call>());
-}
-
-void PluginMainThreadScheduler::unregisterPlugin(NPP npp)
-{
- MutexLocker lock(m_queueMutex);
-
- ASSERT(m_callQueueMap.contains(npp));
- m_callQueueMap.remove(npp);
-}
-
-void PluginMainThreadScheduler::dispatchCallsForPlugin(NPP npp, const Deque<Call>& calls)
-{
- for (auto& call : calls) {
- // Check if the plug-in has been destroyed.
- {
- MutexLocker lock(m_queueMutex);
- if (!m_callQueueMap.contains(npp))
- return;
- }
-
- call.performCall();
- }
-}
-
-void PluginMainThreadScheduler::dispatchCalls()
-{
- m_queueMutex.lock();
- CallQueueMap copy(m_callQueueMap);
-
- // Empty all the queues in the original map
- for (auto& call : m_callQueueMap.values())
- call.clear();
-
- m_callPending = false;
- m_queueMutex.unlock();
-
- for (auto& entry : copy)
- dispatchCallsForPlugin(entry.key, entry.value);
-}
-
-void PluginMainThreadScheduler::mainThreadCallback(void* context)
-{
- static_cast<PluginMainThreadScheduler*>(context)->dispatchCalls();
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCorepluginsPluginMainThreadSchedulerh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/plugins/PluginMainThreadScheduler.h (185925 => 185926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/PluginMainThreadScheduler.h 2015-06-24 20:54:28 UTC (rev 185925)
+++ trunk/Source/WebCore/plugins/PluginMainThreadScheduler.h 2015-06-24 21:34:28 UTC (rev 185926)
</span><span class="lines">@@ -1,87 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 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 PluginMainThreadScheduler_h
-#define PluginMainThreadScheduler_h
-
-#include <wtf/Deque.h>
-#include <wtf/HashMap.h>
-#include <wtf/MainThread.h>
-#include <wtf/Threading.h>
-
-typedef struct _NPP NPP_t;
-typedef NPP_t* NPP;
-
-namespace WebCore {
-
-class PluginMainThreadScheduler {
- WTF_MAKE_NONCOPYABLE(PluginMainThreadScheduler); WTF_MAKE_FAST_ALLOCATED;
-public:
- typedef void MainThreadFunction(void*);
-
- WEBCORE_EXPORT static PluginMainThreadScheduler& scheduler();
-
- WEBCORE_EXPORT void scheduleCall(NPP, MainThreadFunction*, void* userData);
-
- WEBCORE_EXPORT void registerPlugin(NPP);
- WEBCORE_EXPORT void unregisterPlugin(NPP);
-
-private:
- PluginMainThreadScheduler();
- void dispatchCalls();
-
- class Call;
-
- void dispatchCallsForPlugin(NPP, const Deque<Call>& calls);
- typedef HashMap<NPP, Deque<Call>> CallQueueMap;
-
- static void mainThreadCallback(void* context);
-
- class Call {
- public:
- Call(MainThreadFunction* function, void* userData)
- : m_function(function)
- , m_userData(userData)
- {
- }
-
- void performCall() const
- {
- m_function(m_userData);
- }
-
- private:
- MainThreadFunction* m_function;
- void* m_userData;
- };
-
- bool m_callPending;
- CallQueueMap m_callQueueMap;
- Mutex m_queueMutex;
-};
-
-} // namespace WebCore
-
-#endif // PluginMainThreadScheduler_h
</del></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (185925 => 185926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2015-06-24 20:54:28 UTC (rev 185925)
+++ trunk/Source/WebKit/ChangeLog 2015-06-24 21:34:28 UTC (rev 185926)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-06-24 Anders Carlsson <andersca@apple.com>
+
+ Move PluginMainThreadScheduler to WebKit/win
+ https://bugs.webkit.org/show_bug.cgi?id=146289
+
+ Reviewed by Tim Horton.
+
+ * WebKit.vcxproj/WebKit/WebKit.vcxproj:
+ * WebKit.vcxproj/WebKit/WebKit.vcxproj.filters:
+
</ins><span class="cx"> 2015-06-17 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r185636.
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitWebKitvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj (185925 => 185926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj 2015-06-24 20:54:28 UTC (rev 185925)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj 2015-06-24 21:34:28 UTC (rev 185926)
</span><span class="lines">@@ -304,6 +304,7 @@
</span><span class="cx"> <ClCompile Include="..\..\win\Plugins\PluginStream.cpp" />
</span><span class="cx"> <ClCompile Include="..\..\win\Plugins\PluginView.cpp" />
</span><span class="cx"> <ClCompile Include="..\..\win\Plugins\PluginDatabaseWin.cpp" />
</span><ins>+ <ClCompile Include="..\..\win\Plugins\PluginMainThreadScheduler.cpp" />
</ins><span class="cx"> <ClCompile Include="..\..\win\Plugins\PluginMessageThrottlerWin.cpp" />
</span><span class="cx"> <ClCompile Include="..\..\win\Plugins\PluginPackageWin.cpp" />
</span><span class="cx"> <ClCompile Include="..\..\win\Plugins\PluginViewWin.cpp" />
</span><span class="lines">@@ -457,6 +458,7 @@
</span><span class="cx"> <ClInclude Include="..\..\win\Plugins\PluginStrategy.h" />
</span><span class="cx"> <ClInclude Include="..\..\win\Plugins\PluginStream.h" />
</span><span class="cx"> <ClInclude Include="..\..\win\Plugins\PluginView.h" />
</span><ins>+ <ClInclude Include="..\..\win\Plugins\PluginMainThreadScheduler.h" />
</ins><span class="cx"> <ClInclude Include="..\..\win\Plugins\PluginMessageThrottlerWin.h" />
</span><span class="cx"> <ClInclude Include="..\..\win\AccessibleBase.h" />
</span><span class="cx"> <ClInclude Include="..\..\win\AccessibleDocument.h" />
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitWebKitvcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj.filters (185925 => 185926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj.filters 2015-06-24 20:54:28 UTC (rev 185925)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj.filters 2015-06-24 21:34:28 UTC (rev 185926)
</span><span class="lines">@@ -309,6 +309,9 @@
</span><span class="cx"> <ClCompile Include="..\..\win\Plugins\PluginDebug.cpp">
</span><span class="cx"> <Filter>Sources\Plugins</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\..\win\Plugins\PluginMainThreadScheduler.cpp">
+ <Filter>Sources\Plugins</Filter>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\..\win\Plugins\PluginMessageThrottlerWin.cpp">
</span><span class="cx"> <Filter>Sources\Plugins</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -612,6 +615,9 @@
</span><span class="cx"> <ClInclude Include="..\..\win\Plugins\PluginView.h">
</span><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\..\win\Plugins\PluginMainThreadScheduler.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ins><span class="cx"> <ClInclude Include="..\..\win\Plugins\PluginMessageThrottlerWin.h">
</span><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (185925 => 185926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-06-24 20:54:28 UTC (rev 185925)
+++ trunk/Source/WebKit/win/ChangeLog 2015-06-24 21:34:28 UTC (rev 185926)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-06-24 Anders Carlsson <andersca@apple.com>
+
+ Move PluginMainThreadScheduler to WebKit/win
+ https://bugs.webkit.org/show_bug.cgi?id=146289
+
+ Reviewed by Tim Horton.
+
+ * Plugins/PluginMainThreadScheduler.cpp: Renamed from Source/WebCore/plugins/PluginMainThreadScheduler.cpp.
+ (WebCore::PluginMainThreadScheduler::scheduler):
+ (WebCore::PluginMainThreadScheduler::PluginMainThreadScheduler):
+ (WebCore::PluginMainThreadScheduler::scheduleCall):
+ (WebCore::PluginMainThreadScheduler::registerPlugin):
+ (WebCore::PluginMainThreadScheduler::unregisterPlugin):
+ (WebCore::PluginMainThreadScheduler::dispatchCallsForPlugin):
+ (WebCore::PluginMainThreadScheduler::dispatchCalls):
+ (WebCore::PluginMainThreadScheduler::mainThreadCallback):
+ * Plugins/PluginMainThreadScheduler.h: Renamed from Source/WebCore/plugins/PluginMainThreadScheduler.h.
+ (WebCore::PluginMainThreadScheduler::Call::Call):
+ (WebCore::PluginMainThreadScheduler::Call::performCall):
+ * Plugins/PluginView.cpp:
+
</ins><span class="cx"> 2015-06-23 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove windowResizerRect code, nobody is using it anymore
</span></span></pre></div>
<a id="trunkSourceWebKitwinPluginsPluginMainThreadSchedulercppfromrev185925trunkSourceWebCorepluginsPluginMainThreadSchedulercpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit/win/Plugins/PluginMainThreadScheduler.cpp (from rev 185925, trunk/Source/WebCore/plugins/PluginMainThreadScheduler.cpp) (0 => 185926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Plugins/PluginMainThreadScheduler.cpp (rev 0)
+++ trunk/Source/WebKit/win/Plugins/PluginMainThreadScheduler.cpp 2015-06-24 21:34:28 UTC (rev 185926)
</span><span class="lines">@@ -0,0 +1,110 @@
</span><ins>+/*
+ * Copyright (C) 2008 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 "PluginMainThreadScheduler.h"
+
+namespace WebCore {
+
+PluginMainThreadScheduler& PluginMainThreadScheduler::scheduler()
+{
+ DEPRECATED_DEFINE_STATIC_LOCAL(PluginMainThreadScheduler, scheduler, ());
+
+ return scheduler;
+}
+
+PluginMainThreadScheduler::PluginMainThreadScheduler()
+ : m_callPending(false)
+{
+}
+
+void PluginMainThreadScheduler::scheduleCall(NPP npp, MainThreadFunction function, void* userData)
+{
+ MutexLocker lock(m_queueMutex);
+
+ CallQueueMap::iterator it = m_callQueueMap.find(npp);
+ if (it == m_callQueueMap.end())
+ return;
+
+ it->value.append(Call(function, userData));
+
+ if (!m_callPending) {
+ callOnMainThread(mainThreadCallback, this);
+ m_callPending = true;
+ }
+}
+
+void PluginMainThreadScheduler::registerPlugin(NPP npp)
+{
+ MutexLocker lock(m_queueMutex);
+
+ ASSERT(!m_callQueueMap.contains(npp));
+ m_callQueueMap.set(npp, Deque<Call>());
+}
+
+void PluginMainThreadScheduler::unregisterPlugin(NPP npp)
+{
+ MutexLocker lock(m_queueMutex);
+
+ ASSERT(m_callQueueMap.contains(npp));
+ m_callQueueMap.remove(npp);
+}
+
+void PluginMainThreadScheduler::dispatchCallsForPlugin(NPP npp, const Deque<Call>& calls)
+{
+ for (auto& call : calls) {
+ // Check if the plug-in has been destroyed.
+ {
+ MutexLocker lock(m_queueMutex);
+ if (!m_callQueueMap.contains(npp))
+ return;
+ }
+
+ call.performCall();
+ }
+}
+
+void PluginMainThreadScheduler::dispatchCalls()
+{
+ m_queueMutex.lock();
+ CallQueueMap copy(m_callQueueMap);
+
+ // Empty all the queues in the original map
+ for (auto& call : m_callQueueMap.values())
+ call.clear();
+
+ m_callPending = false;
+ m_queueMutex.unlock();
+
+ for (auto& entry : copy)
+ dispatchCallsForPlugin(entry.key, entry.value);
+}
+
+void PluginMainThreadScheduler::mainThreadCallback(void* context)
+{
+ static_cast<PluginMainThreadScheduler*>(context)->dispatchCalls();
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebKitwinPluginsPluginMainThreadSchedulerhfromrev185925trunkSourceWebCorepluginsPluginMainThreadSchedulerh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit/win/Plugins/PluginMainThreadScheduler.h (from rev 185925, trunk/Source/WebCore/plugins/PluginMainThreadScheduler.h) (0 => 185926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Plugins/PluginMainThreadScheduler.h (rev 0)
+++ trunk/Source/WebKit/win/Plugins/PluginMainThreadScheduler.h 2015-06-24 21:34:28 UTC (rev 185926)
</span><span class="lines">@@ -0,0 +1,87 @@
</span><ins>+/*
+ * Copyright (C) 2008 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 PluginMainThreadScheduler_h
+#define PluginMainThreadScheduler_h
+
+#include <wtf/Deque.h>
+#include <wtf/HashMap.h>
+#include <wtf/MainThread.h>
+#include <wtf/Threading.h>
+
+typedef struct _NPP NPP_t;
+typedef NPP_t* NPP;
+
+namespace WebCore {
+
+class PluginMainThreadScheduler {
+ WTF_MAKE_NONCOPYABLE(PluginMainThreadScheduler); WTF_MAKE_FAST_ALLOCATED;
+public:
+ typedef void MainThreadFunction(void*);
+
+ WEBCORE_EXPORT static PluginMainThreadScheduler& scheduler();
+
+ WEBCORE_EXPORT void scheduleCall(NPP, MainThreadFunction*, void* userData);
+
+ WEBCORE_EXPORT void registerPlugin(NPP);
+ WEBCORE_EXPORT void unregisterPlugin(NPP);
+
+private:
+ PluginMainThreadScheduler();
+ void dispatchCalls();
+
+ class Call;
+
+ void dispatchCallsForPlugin(NPP, const Deque<Call>& calls);
+ typedef HashMap<NPP, Deque<Call>> CallQueueMap;
+
+ static void mainThreadCallback(void* context);
+
+ class Call {
+ public:
+ Call(MainThreadFunction* function, void* userData)
+ : m_function(function)
+ , m_userData(userData)
+ {
+ }
+
+ void performCall() const
+ {
+ m_function(m_userData);
+ }
+
+ private:
+ MainThreadFunction* m_function;
+ void* m_userData;
+ };
+
+ bool m_callPending;
+ CallQueueMap m_callQueueMap;
+ Mutex m_queueMutex;
+};
+
+} // namespace WebCore
+
+#endif // PluginMainThreadScheduler_h
</ins></span></pre></div>
<a id="trunkSourceWebKitwinPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Plugins/PluginView.cpp (185925 => 185926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Plugins/PluginView.cpp 2015-06-24 20:54:28 UTC (rev 185925)
+++ trunk/Source/WebKit/win/Plugins/PluginView.cpp 2015-06-24 21:34:28 UTC (rev 185926)
</span><span class="lines">@@ -57,7 +57,6 @@
</span><span class="cx"> #include <WebCore/NotImplemented.h>
</span><span class="cx"> #include <WebCore/Page.h>
</span><span class="cx"> #include <WebCore/PlatformMouseEvent.h>
</span><del>-#include <WebCore/PluginMainThreadScheduler.h>
</del><span class="cx"> #include <WebCore/ProxyServer.h>
</span><span class="cx"> #include <WebCore/RenderBox.h>
</span><span class="cx"> #include <WebCore/RenderObject.h>
</span><span class="lines">@@ -76,6 +75,7 @@
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><ins>+#include "PluginMainThreadScheduler.h"
</ins><span class="cx"> #include "PluginMessageThrottlerWin.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>