Title: [86761] trunk/Source/WebKit2
- Revision
- 86761
- Author
- [email protected]
- Date
- 2011-05-18 08:04:23 -0700 (Wed, 18 May 2011)
Log Message
2011-05-18 Andreas Kling <[email protected]>
Reviewed by Kenneth Rohde Christiansen.
[Qt][WK2] Don't lie about supporting accelerated compositing.
https://bugs.webkit.org/show_bug.cgi?id=61054
Until we have an implementation of LayerTreeHost, we shouldn't lie about it.
* WebKit2.pro:
* WebProcess/WebPage/LayerTreeHost.h:
* WebProcess/WebPage/qt/LayerTreeHostQt.cpp: Added.
(WebKit::LayerTreeHost::supportsAcceleratedCompositing):
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (86760 => 86761)
--- trunk/Source/WebKit2/ChangeLog 2011-05-18 14:31:10 UTC (rev 86760)
+++ trunk/Source/WebKit2/ChangeLog 2011-05-18 15:04:23 UTC (rev 86761)
@@ -1,3 +1,17 @@
+2011-05-18 Andreas Kling <[email protected]>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Qt][WK2] Don't lie about supporting accelerated compositing.
+ https://bugs.webkit.org/show_bug.cgi?id=61054
+
+ Until we have an implementation of LayerTreeHost, we shouldn't lie about it.
+
+ * WebKit2.pro:
+ * WebProcess/WebPage/LayerTreeHost.h:
+ * WebProcess/WebPage/qt/LayerTreeHostQt.cpp: Added.
+ (WebKit::LayerTreeHost::supportsAcceleratedCompositing):
+
2011-05-17 Jeremy Noble <[email protected]>
Reviewed by Darin Adler.
Modified: trunk/Source/WebKit2/WebKit2.pro (86760 => 86761)
--- trunk/Source/WebKit2/WebKit2.pro 2011-05-18 14:31:10 UTC (rev 86760)
+++ trunk/Source/WebKit2/WebKit2.pro 2011-05-18 15:04:23 UTC (rev 86761)
@@ -540,6 +540,7 @@
WebProcess/WebPage/WebPageGroupProxy.cpp \
WebProcess/WebPage/qt/WebInspectorQt.cpp \
WebProcess/WebPage/qt/ChunkedUpdateDrawingAreaQt.cpp \
+ WebProcess/WebPage/qt/LayerTreeHostQt.cpp \
WebProcess/WebPage/qt/TiledDrawingAreaQt.cpp \
WebProcess/WebPage/qt/WebPageQt.cpp \
WebProcess/WebProcess.cpp \
Modified: trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h (86760 => 86761)
--- trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h 2011-05-18 14:31:10 UTC (rev 86760)
+++ trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h 2011-05-18 15:04:23 UTC (rev 86761)
@@ -79,7 +79,7 @@
WebPage* m_webPage;
};
-#if !PLATFORM(WIN)
+#if !PLATFORM(WIN) && !PLATFORM(QT)
inline bool LayerTreeHost::supportsAcceleratedCompositing()
{
return true;
Added: trunk/Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.cpp (0 => 86761)
--- trunk/Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.cpp (rev 0)
+++ trunk/Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.cpp 2011-05-18 15:04:23 UTC (rev 86761)
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * 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. AND ITS CONTRIBUTORS ``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 ITS 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 "LayerTreeHost.h"
+
+namespace WebKit {
+
+bool LayerTreeHost::supportsAcceleratedCompositing()
+{
+ return false;
+}
+
+} // namespace WebKit
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
