Title: [104209] trunk/Source/WebKit/chromium
- Revision
- 104209
- Author
- [email protected]
- Date
- 2012-01-05 13:41:04 -0800 (Thu, 05 Jan 2012)
Log Message
[chromium][aura] WebExternalTextureLayerImpl::drawsContent() returns incorrect value, causing accelerated content to not display in Aura desktop
https://bugs.webkit.org/show_bug.cgi?id=75551
Reviewed by James Robinson.
* WebKit.gypi:
* src/WebExternalTextureLayerImpl.cpp:
(WebKit::WebExternalTextureLayerImpl::WebExternalTextureLayerImpl):
* tests/WebExternalTextureLayerImplTest.cpp: Copied from Source/WebKit/chromium/src/WebExternalTextureLayerImpl.cpp.
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (104208 => 104209)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-01-05 21:39:02 UTC (rev 104208)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-01-05 21:41:04 UTC (rev 104209)
@@ -1,3 +1,15 @@
+2012-01-05 W. James MacLean <[email protected]>
+
+ [chromium][aura] WebExternalTextureLayerImpl::drawsContent() returns incorrect value, causing accelerated content to not display in Aura desktop
+ https://bugs.webkit.org/show_bug.cgi?id=75551
+
+ Reviewed by James Robinson.
+
+ * WebKit.gypi:
+ * src/WebExternalTextureLayerImpl.cpp:
+ (WebKit::WebExternalTextureLayerImpl::WebExternalTextureLayerImpl):
+ * tests/WebExternalTextureLayerImplTest.cpp: Copied from Source/WebKit/chromium/src/WebExternalTextureLayerImpl.cpp.
+
2012-01-05 Tien Ren Chen <[email protected]>
[chromium] Add CCTimer class for the compositor
Modified: trunk/Source/WebKit/chromium/WebKit.gypi (104208 => 104209)
--- trunk/Source/WebKit/chromium/WebKit.gypi 2012-01-05 21:39:02 UTC (rev 104208)
+++ trunk/Source/WebKit/chromium/WebKit.gypi 2012-01-05 21:41:04 UTC (rev 104209)
@@ -101,6 +101,7 @@
'tests/TreeTestHelpers.cpp',
'tests/TreeTestHelpers.h',
'tests/WebCompositorInputHandlerImplTest.cpp',
+ 'tests/WebExternalTextureLayerImplTest.cpp',
'tests/WebFrameTest.cpp',
'tests/WebGLLayerChromiumTest.cpp',
'tests/WebLayerTest.cpp',
Modified: trunk/Source/WebKit/chromium/src/WebExternalTextureLayerImpl.cpp (104208 => 104209)
--- trunk/Source/WebKit/chromium/src/WebExternalTextureLayerImpl.cpp 2012-01-05 21:39:02 UTC (rev 104208)
+++ trunk/Source/WebKit/chromium/src/WebExternalTextureLayerImpl.cpp 2012-01-05 21:41:04 UTC (rev 104209)
@@ -42,6 +42,7 @@
: PluginLayerChromium(this)
{
setFlipped(false);
+ setIsDrawable(true);
}
WebExternalTextureLayerImpl::~WebExternalTextureLayerImpl()
Copied: trunk/Source/WebKit/chromium/tests/WebExternalTextureLayerImplTest.cpp (from rev 104208, trunk/Source/WebKit/chromium/src/WebExternalTextureLayerImpl.cpp) (0 => 104209)
--- trunk/Source/WebKit/chromium/tests/WebExternalTextureLayerImplTest.cpp (rev 0)
+++ trunk/Source/WebKit/chromium/tests/WebExternalTextureLayerImplTest.cpp 2012-01-05 21:41:04 UTC (rev 104209)
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2012 Google 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 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 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 "WebExternalTextureLayerImpl.h"
+
+#include <gtest/gtest.h>
+#include <wtf/RefPtr.h>
+
+namespace {
+
+using namespace WebKit;
+using WTF::RefPtr;
+
+class WebExternalTextureLayerImplTest : public WebExternalTextureLayerImpl {
+public:
+ bool isDrawable() const { return drawsContent(); }
+};
+
+TEST(WebExternalTextureLayerImpl, testIsDrawable)
+{
+ RefPtr<WebExternalTextureLayerImplTest> textureLayer = adoptRef(new WebExternalTextureLayerImplTest());
+
+ textureLayer->setTextureId(1);
+ EXPECT_TRUE(textureLayer->isDrawable());
+}
+
+}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
