Diff
Modified: trunk/LayoutTests/ChangeLog (101840 => 101841)
--- trunk/LayoutTests/ChangeLog 2011-12-02 19:24:08 UTC (rev 101840)
+++ trunk/LayoutTests/ChangeLog 2011-12-02 19:31:10 UTC (rev 101841)
@@ -1,3 +1,15 @@
+2011-12-02 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r101833.
+ http://trac.webkit.org/changeset/101833
+ https://bugs.webkit.org/show_bug.cgi?id=73678
+
+ test_expectations file invalid: run Tools/Scripts/new-run-
+ webkit-tests --lint-test-files (Requested by scheib on
+ #webkit).
+
+ * platform/chromium/test_expectations.txt:
+
2011-12-02 Vincent Scheib <[email protected]>
[Chromium] Fixe test_expectations.txt parse error
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (101840 => 101841)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-12-02 19:24:08 UTC (rev 101840)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-12-02 19:31:10 UTC (rev 101841)
@@ -3744,26 +3744,6 @@
BUG_CARYCLARK MAC CPU : fast/writing-mode/vertical-baseline-alignment.html = IMAGE
BUG_CARYCLARK MAC CPU : fast/writing-mode/vertical-font-fallback.html = IMAGE
-BUGALOKP: compositing/color-matching/image-color-matching.html = IMAGE
-BUGALOKP: compositing/direct-image-compositing.html = IMAGE
-BUGALOKP: compositing/geometry/ancestor-overflow-change.html = IMAGE
-BUGALOKP: compositing/geometry/fixed-position-transform-composited-page-scale.html = IMAGE
-BUGALOKP: compositing/geometry/layer-due-to-layer-children-deep.html = IMAGE
-BUGALOKP: compositing/geometry/layer-due-to-layer-children.html = IMAGE
-BUGALOKP: compositing/geometry/vertical-scroll-composited.html = IMAGE
-BUGALOKP: compositing/reflections/nested-reflection-transformed.html = IMAGE
-BUGALOKP: compositing/reflections/nested-reflection-transformed2.html = IMAGE
-BUGALOKP: compositing/reflections/nested-reflection-transition.html = IMAGE
-BUGALOKP: compositing/reflections/reflection-in-composited.html = IMAGE
-BUGALOKP: compositing/scaling/tiled-layer-recursion.html = IMAGE
-BUGALOKP: compositing/shadows/shadow-drawing.html = IMAGE
-BUGALOKP: platform/chromium/compositing/huge-layer-rotated.html = IMAGE
-BUGALOKP: platform/chromium/compositing/layout-width-change.html = IMAGE
-BUGALOKP: platform/chromium/compositing/tiny-layer-rotated.html = IMAGE
-BUGALOKP GPU: media/video-layer-crash.html = IMAGE
-BUGALOKP GPU: media/video-transformed.html = IMAGE
-BUGALOKP GPU: media/video-zoom-controls.html = IMAGE
-
BUGWK72271 MAC DEBUG : fast/loader/_javascript_-url-in-embed.html = PASS CRASH
BUGWK72271 SNOWLEOPARD DEBUG : fast/dom/node-iterator-reference-node-moved-crash.html = PASS CRASH
Modified: trunk/Source/WebCore/ChangeLog (101840 => 101841)
--- trunk/Source/WebCore/ChangeLog 2011-12-02 19:24:08 UTC (rev 101840)
+++ trunk/Source/WebCore/ChangeLog 2011-12-02 19:31:10 UTC (rev 101841)
@@ -1,3 +1,16 @@
+2011-12-02 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r101833.
+ http://trac.webkit.org/changeset/101833
+ https://bugs.webkit.org/show_bug.cgi?id=73678
+
+ test_expectations file invalid: run Tools/Scripts/new-run-
+ webkit-tests --lint-test-files (Requested by scheib on
+ #webkit).
+
+ * platform/graphics/chromium/cc/CCLayerQuad.cpp:
+ (WebCore::CCLayerQuad::floatQuad):
+
2011-12-02 Alok Priyadarshi <[email protected]>
[chromium] CCLayerQuad does not return FloatQuad in correct orientation
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerQuad.cpp (101840 => 101841)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerQuad.cpp 2011-12-02 19:24:08 UTC (rev 101840)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerQuad.cpp 2011-12-02 19:31:10 UTC (rev 101841)
@@ -60,10 +60,10 @@
FloatQuad CCLayerQuad::floatQuad() const
{
- return FloatQuad(m_left.intersect(m_top),
+ return FloatQuad(m_bottom.intersect(m_left),
+ m_left.intersect(m_top),
m_top.intersect(m_right),
- m_right.intersect(m_bottom),
- m_bottom.intersect(m_left));
+ m_right.intersect(m_bottom));
}
void CCLayerQuad::toFloatArray(float flattened[12]) const
Modified: trunk/Source/WebKit/chromium/ChangeLog (101840 => 101841)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-12-02 19:24:08 UTC (rev 101840)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-12-02 19:31:10 UTC (rev 101841)
@@ -1,3 +1,16 @@
+2011-12-02 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r101833.
+ http://trac.webkit.org/changeset/101833
+ https://bugs.webkit.org/show_bug.cgi?id=73678
+
+ test_expectations file invalid: run Tools/Scripts/new-run-
+ webkit-tests --lint-test-files (Requested by scheib on
+ #webkit).
+
+ * WebKit.gypi:
+ * tests/CCLayerQuadTest.cpp: Removed.
+
2011-12-02 Alok Priyadarshi <[email protected]>
[chromium] CCLayerQuad does not return FloatQuad in correct orientation
Modified: trunk/Source/WebKit/chromium/WebKit.gypi (101840 => 101841)
--- trunk/Source/WebKit/chromium/WebKit.gypi 2011-12-02 19:24:08 UTC (rev 101840)
+++ trunk/Source/WebKit/chromium/WebKit.gypi 2011-12-02 19:31:10 UTC (rev 101841)
@@ -58,7 +58,6 @@
'tests/CCDelayBasedTimeSourceTest.cpp',
'tests/CCFrameRateControllerTest.cpp',
'tests/CCLayerImplTest.cpp',
- 'tests/CCLayerQuadTest.cpp',
'tests/CCLayerSorterTest.cpp',
'tests/CCLayerTreeHostCommonTest.cpp',
'tests/CCLayerTreeHostImplTest.cpp',
Deleted: trunk/Source/WebKit/chromium/tests/CCLayerQuadTest.cpp (101840 => 101841)
--- trunk/Source/WebKit/chromium/tests/CCLayerQuadTest.cpp 2011-12-02 19:24:08 UTC (rev 101840)
+++ trunk/Source/WebKit/chromium/tests/CCLayerQuadTest.cpp 2011-12-02 19:31:10 UTC (rev 101841)
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2011 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 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 "cc/CCLayerQuad.h"
-
-#include <gtest/gtest.h>
-
-using namespace WebCore;
-
-namespace {
-
-TEST(CCLayerQuadTest, FloatQuadConversion)
-{
- FloatPoint p1(-0.5, -0.5);
- FloatPoint p2( 0.5, -0.5);
- FloatPoint p3( 0.5, 0.5);
- FloatPoint p4(-0.5, 0.5);
-
- FloatQuad quadCW(p1, p2, p3, p4);
- CCLayerQuad layerQuadCW(quadCW);
- EXPECT_TRUE(layerQuadCW.floatQuad() == quadCW);
-
- FloatQuad quadCCW(p1, p4, p3, p2);
- CCLayerQuad layerQuadCCW(quadCCW);
- EXPECT_TRUE(layerQuadCCW.floatQuad() == quadCCW);
-}
-
-TEST(CCLayerQuadTest, Inflate)
-{
- FloatPoint p1(-0.5, -0.5);
- FloatPoint p2( 0.5, -0.5);
- FloatPoint p3( 0.5, 0.5);
- FloatPoint p4(-0.5, 0.5);
-
- FloatQuad quad(p1, p2, p3, p4);
- CCLayerQuad layerQuad(quad);
- quad.scale(2.0, 2.0);
- layerQuad.inflate(0.5);
- EXPECT_TRUE(layerQuad.floatQuad() == quad);
-}
-
-} // namespace
