Title: [87694] trunk/Source
- Revision
- 87694
- Author
- noam.rosent...@nokia.com
- Date
- 2011-05-30 11:28:08 -0700 (Mon, 30 May 2011)
Log Message
2011-05-30 Noam Rosenthal <noam.rosent...@nokia.com>
Reviewed by Kenneth Rohde Christiansen.
[Texmap][Qt] Disable accelerated plugins/media until they're working.
https://bugs.webkit.org/show_bug.cgi?id=61687
Until this works properly, we should indicate that our media implementation
in texture mapper doesn't support accelerated compositing.
This makes LayoutTests/compositing/video/* work again.
* platform/graphics/qt/MediaPlayerPrivateQt.h:
(WebCore::MediaPlayerPrivateQt::supportsAcceleratedRendering):
(WebCore::MediaPlayerPrivateQt::platformLayer):
2011-05-30 Noam Rosenthal <noam.rosent...@nokia.com>
Reviewed by Kenneth Rohde Christiansen.
[Texmap][Qt] Disable accelerated plugins/media in until they're working.
https://bugs.webkit.org/show_bug.cgi?id=61687
Turn off accelerated compositing for media and plugins when in texture-mapper.
* Api/qwebsettings.cpp:
(QWebSettingsPrivate::apply):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (87693 => 87694)
--- trunk/Source/WebCore/ChangeLog 2011-05-30 17:21:14 UTC (rev 87693)
+++ trunk/Source/WebCore/ChangeLog 2011-05-30 18:28:08 UTC (rev 87694)
@@ -1,3 +1,19 @@
+2011-05-30 Noam Rosenthal <noam.rosent...@nokia.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Texmap][Qt] Disable accelerated plugins/media until they're working.
+ https://bugs.webkit.org/show_bug.cgi?id=61687
+
+ Until this works properly, we should indicate that our media implementation
+ in texture mapper doesn't support accelerated compositing.
+
+ This makes LayoutTests/compositing/video/* work again.
+
+ * platform/graphics/qt/MediaPlayerPrivateQt.h:
+ (WebCore::MediaPlayerPrivateQt::supportsAcceleratedRendering):
+ (WebCore::MediaPlayerPrivateQt::platformLayer):
+
2011-05-30 Mikhail Naganov <mnaga...@chromium.org>
Reviewed by Adam Barth.
Modified: trunk/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h (87693 => 87694)
--- trunk/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h 2011-05-30 17:21:14 UTC (rev 87693)
+++ trunk/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h 2011-05-30 18:28:08 UTC (rev 87694)
@@ -103,11 +103,11 @@
#if USE(ACCELERATED_COMPOSITING)
#if USE(TEXTURE_MAPPER)
// whether accelerated rendering is supported by the media engine for the current media.
- virtual bool supportsAcceleratedRendering() const { return true; }
+ virtual bool supportsAcceleratedRendering() const { return false; }
// called when the rendering system flips the into or out of accelerated rendering mode.
virtual void acceleratedRenderingStateChanged() { }
// Const-casting here is safe, since all of TextureMapperPlatformLayer's functions are const.g
- virtual PlatformLayer* platformLayer() const { return const_cast<MediaPlayerPrivateQt*>(this); }
+ virtual PlatformLayer* platformLayer() const { return 0; }
virtual void paintToTextureMapper(TextureMapper*, const FloatRect& targetRect, const TransformationMatrix&, float opacity, BitmapTexture* mask) const;
#else
virtual bool supportsAcceleratedRendering() const { return false; }
Modified: trunk/Source/WebKit/qt/Api/qwebsettings.cpp (87693 => 87694)
--- trunk/Source/WebKit/qt/Api/qwebsettings.cpp 2011-05-30 17:21:14 UTC (rev 87693)
+++ trunk/Source/WebKit/qt/Api/qwebsettings.cpp 2011-05-30 18:28:08 UTC (rev 87694)
@@ -172,10 +172,14 @@
value = attributes.value(QWebSettings::AcceleratedCompositingEnabled,
global->attributes.value(QWebSettings::AcceleratedCompositingEnabled));
+ settings->setAcceleratedCompositingEnabled(value);
settings->setAcceleratedCompositingFor3DTransformsEnabled(value);
settings->setAcceleratedCompositingForAnimationEnabled(value);
- settings->setAcceleratedCompositingForVideoEnabled(value);
+#if USE(TEXTURE_MAPPER)
+ settings->setAcceleratedCompositingForVideoEnabled(false);
+ settings->setAcceleratedCompositingForPluginsEnabled(false);
#endif
+#endif
#if ENABLE(WEBGL)
value = attributes.value(QWebSettings::WebGLEnabled,
global->attributes.value(QWebSettings::WebGLEnabled));
Modified: trunk/Source/WebKit/qt/ChangeLog (87693 => 87694)
--- trunk/Source/WebKit/qt/ChangeLog 2011-05-30 17:21:14 UTC (rev 87693)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-05-30 18:28:08 UTC (rev 87694)
@@ -1,3 +1,15 @@
+2011-05-30 Noam Rosenthal <noam.rosent...@nokia.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Texmap][Qt] Disable accelerated plugins/media in until they're working.
+ https://bugs.webkit.org/show_bug.cgi?id=61687
+
+ Turn off accelerated compositing for media and plugins when in texture-mapper.
+
+ * Api/qwebsettings.cpp:
+ (QWebSettingsPrivate::apply):
+
2011-05-28 Adam Barth <aba...@webkit.org>
Reviewed by Alexey Proskuryakov.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
