Changeset 146250 in webkit
- Timestamp:
- Mar 19, 2013 1:30:34 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 6 added
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r146240 r146250 1 2013-03-19 Dean Jackson <dino@apple.com> 2 3 Allow PlugIn Snapshotting to be tested 4 https://bugs.webkit.org/show_bug.cgi?id=98696 5 <rdar://problem/12456731> 6 7 Reviewed by Tim Horton. 8 9 Two new simple tests for plugin snapshotting. One that makes 10 sure the plugin was snapshotted (looks for the RenderSnapshottedPlugin) 11 and one that restarts a snapshotted plugin by clicking. 12 13 Since this feature is currently only enabled in WebKit2, the tests 14 are skipped everywhere else. 15 16 * platform/chromium/TestExpectations: Skip plugins/snapshotting. 17 * platform/efl/TestExpectations: Ditto. 18 * platform/gtk/TestExpectations: Ditto. 19 * platform/mac-wk2/TestExpectations: Ditto. 20 * platform/mac-wk2/plugins/snapshotting/restart-expected.txt: Added. 21 * platform/mac-wk2/plugins/snapshotting/simple-expected.txt: Added. 22 * platform/mac/TestExpectations: Skip plugins/snapshotting. 23 * platform/qt/TestExpectations: Ditto. 24 * platform/win/TestExpectations: Ditto. 25 * plugins/snapshotting/restart.html: Added. 26 * plugins/snapshotting/simple.html: Added. 27 1 28 2013-03-19 James Robinson <jamesr@chromium.org> 2 29 -
trunk/LayoutTests/platform/chromium/TestExpectations
r146172 r146250 4425 4425 webkit.org/b/112288 http/tests/security/cross-origin-appcache-allowed.html [ Failure ] 4426 4426 webkit.org/b/112288 http/tests/security/same-origin-appcache-blocked.html [ Failure ] 4427 4428 # Snapshotted plugins not enabled 4429 webkit.org/b/98696 plugins/snapshotting [ Skip ] -
trunk/LayoutTests/platform/efl/TestExpectations
r146189 r146250 1867 1867 # Started failing on EFL afrer r145025. 1868 1868 webkit.org/b/111860 fast/forms/number/number-validation-message.html [ Failure ] 1869 1870 # Snapshotted plugins not enabled 1871 webkit.org/b/98696 plugins/snapshotting [ Skip ] -
trunk/LayoutTests/platform/gtk/TestExpectations
r146211 r146250 429 429 # Require ENABLE(CUSTOM_ELEMENTS) support 430 430 webkit.org/b/110735 fast/dom/custom [ Failure ] 431 432 # Snapshotted plugins not enabled 433 webkit.org/b/98696 plugins/snapshotting [ Skip ] 431 434 432 435 #//////////////////////////////////////////////////////////////////////////////////////// -
trunk/LayoutTests/platform/mac-wk2/TestExpectations
r146221 r146250 428 428 ### START OF (5) Features that are not supported in WebKit1, so skipped in mac/TestExpectations then re-enabled here 429 429 430 # Snapshotted plugins not enabled on WK1 but are on WK2 431 plugins/snapshotting [ Pass ] 432 430 433 ### END OF (5) Features that are not supported in WebKit1, so skipped in mac/TestExpectations then re-enabled here 431 434 ######################################## -
trunk/LayoutTests/platform/mac/TestExpectations
r146221 r146250 1517 1517 # Feature not implemented 1518 1518 webkit.org/b/91611 media/media-higher-prio-audio-stream.html [ Skip ] 1519 1520 # Snapshotted plugins not enabled on WK1 1521 plugins/snapshotting [ Skip ] -
trunk/LayoutTests/platform/qt/TestExpectations
r146201 r146250 363 363 # CURSOR_VISIBILITY is not enabled in qt 364 364 webkit.org/b/107601 fullscreen/video-cursor-auto-hide.html [ Failure ] 365 366 # Snapshotted plugins not enabled 367 webkit.org/b/98696 plugins/snapshotting [ Skip ] 365 368 366 369 # =========================================================================== # -
trunk/LayoutTests/platform/win/TestExpectations
r146122 r146250 2695 2695 fast/borders/border-fit.html 2696 2696 fast/repaint/border-fit-lines.html 2697 2698 # Snapshotted plugins not enabled 2699 webkit.org/b/98696 plugins/snapshotting [ Skip ] -
trunk/Source/WebCore/ChangeLog
r146248 r146250 1 2013-03-19 Dean Jackson <dino@apple.com> 2 3 Allow PlugIn Snapshotting to be tested 4 https://bugs.webkit.org/show_bug.cgi?id=98696 5 6 Reviewed by Tim Horton. 7 8 Expose a new setting maximumPlugInSnapshotAttempts that can 9 be set by testing scripts. 10 11 Tests: plugins/snapshotting/restart.html 12 plugins/snapshotting/simple.html 13 14 * page/Settings.in: 15 1 16 2013-03-19 Dean Jackson <dino@apple.com> 2 17 -
trunk/Source/WebCore/page/Settings.in
r145849 r146250 182 182 applyPageScaleFactorInCompositor initial=false 183 183 plugInSnapshottingEnabled initial=false 184 maximumPlugInSnapshotAttempts type=unsigned, initial=20 184 185 frameFlatteningEnabled initial=false 185 186 -
trunk/Source/WebKit2/ChangeLog
r146248 r146250 1 2013-03-19 Dean Jackson <dino@apple.com> 2 3 Allow PlugIn Snapshotting to be tested 4 https://bugs.webkit.org/show_bug.cgi?id=98696 5 6 Reviewed by Tim Horton. 7 8 Use the new maximumPlugInSnapshotAttempts setting rather than a hardcoded 9 value. At the same time, if this value is 0, then snapshot immediately 10 (don't wait to get a snapshot and test it). 11 12 * WebProcess/Plugins/PluginView.cpp: 13 (WebKit::PluginView::didInitializePlugin): Snapshot immediately if maximum attempts are 0. 14 (WebKit::PluginView::pluginSnapshotTimerFired): Use setting rather than file local variable. 15 1 16 2013-03-19 Dean Jackson <dino@apple.com> 2 17 -
trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp
r145477 r146250 74 74 // This simulated mouse click delay in HTMLPlugInImageElement.cpp should generally be the same or shorter than this delay. 75 75 static const double pluginSnapshotTimerDelay = 1.1; 76 static const unsigned maximumSnapshotRetries = 60;77 76 78 77 class PluginView::URLRequest : public RefCounted<URLRequest> { … … 571 570 572 571 #if PLATFORM(MAC) 573 if (m_pluginElement->displayState() < HTMLPlugInElement::PlayingWithPendingMouseClick) 572 if (m_pluginElement->displayState() < HTMLPlugInElement::PlayingWithPendingMouseClick) { 573 if (frame() && !frame()->settings()->maximumPlugInSnapshotAttempts()) { 574 m_pluginElement->setDisplayState(HTMLPlugInElement::DisplayingSnapshot); 575 return; 576 } 574 577 m_pluginSnapshotTimer.restart(); 575 else {578 } else { 576 579 if (m_plugin->pluginLayer()) { 577 580 if (frame()) { … … 1624 1627 1625 1628 #if PLATFORM(MAC) 1629 unsigned maximumSnapshotRetries = frame() ? frame()->settings()->maximumPlugInSnapshotAttempts() : 0; 1626 1630 if (snapshotImage && isAlmostSolidColor(static_cast<BitmapImage*>(snapshotImage.get())) && m_countSnapshotRetries < maximumSnapshotRetries) { 1627 1631 ++m_countSnapshotRetries;
Note: See TracChangeset
for help on using the changeset viewer.