Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (125116 => 125117)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-08-08 23:56:50 UTC (rev 125116)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-08-08 23:59:09 UTC (rev 125117)
@@ -1,3 +1,23 @@
+2012-08-08 James Robinson <[email protected]>
+
+ [chromium] Fix up includes and types in chromium compositor unit tests
+ https://bugs.webkit.org/show_bug.cgi?id=93553
+
+ Reviewed by Adrienne Walker.
+
+ This removes some unused GraphicsContext3DPrivate.h includes and adds some includes that were being implicitely
+ depending upon - mostly for wtf/PassOwnPtr.h.
+
+ * tests/CCLayerTreeHostTest.cpp:
+ (::CCLayerTreeHostTestCommit::beginTest):
+ (::CCLayerTreeHostTestCommit::commitCompleteOnCCThread):
+ * tests/CCRenderSurfaceFiltersTest.cpp:
+ * tests/CompositorFakeWebGraphicsContext3D.h:
+ * tests/FakeGraphicsContext3DTest.cpp:
+ * tests/FakeWebScrollbarThemeGeometry.h:
+ * tests/TextureCopierTest.cpp:
+ * tests/ThrottledTextureUploaderTest.cpp:
+
2012-08-08 Eric Penner <[email protected]>
[chromium] Refactor tile flags.
Modified: trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp (125116 => 125117)
--- trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp 2012-08-08 23:56:50 UTC (rev 125116)
+++ trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp 2012-08-08 23:59:09 UTC (rev 125117)
@@ -1005,7 +1005,7 @@
virtual void beginTest()
{
m_layerTreeHost->setViewportSize(IntSize(20, 20), IntSize(20, 20));
- m_layerTreeHost->setBackgroundColor(Color::gray);
+ m_layerTreeHost->setBackgroundColor(SK_ColorGRAY);
m_layerTreeHost->setPageScaleFactorAndLimits(5, 5, 5);
postSetNeedsCommitToMainThread();
@@ -1014,7 +1014,7 @@
virtual void commitCompleteOnCCThread(CCLayerTreeHostImpl* impl)
{
EXPECT_EQ(IntSize(20, 20), impl->layoutViewportSize());
- EXPECT_EQ(Color::gray, impl->backgroundColor());
+ EXPECT_EQ(SK_ColorGRAY, impl->backgroundColor());
EXPECT_EQ(5, impl->pageScale());
endTest();
Modified: trunk/Source/WebKit/chromium/tests/CCRenderSurfaceFiltersTest.cpp (125116 => 125117)
--- trunk/Source/WebKit/chromium/tests/CCRenderSurfaceFiltersTest.cpp 2012-08-08 23:56:50 UTC (rev 125116)
+++ trunk/Source/WebKit/chromium/tests/CCRenderSurfaceFiltersTest.cpp 2012-08-08 23:59:09 UTC (rev 125117)
@@ -27,7 +27,6 @@
#include "cc/CCRenderSurfaceFilters.h"
#include "CompositorFakeWebGraphicsContext3D.h"
-#include "GraphicsContext3DPrivate.h"
#include <gtest/gtest.h>
#include <public/WebFilterOperation.h>
#include <public/WebFilterOperations.h>
Modified: trunk/Source/WebKit/chromium/tests/CompositorFakeWebGraphicsContext3D.h (125116 => 125117)
--- trunk/Source/WebKit/chromium/tests/CompositorFakeWebGraphicsContext3D.h 2012-08-08 23:56:50 UTC (rev 125116)
+++ trunk/Source/WebKit/chromium/tests/CompositorFakeWebGraphicsContext3D.h 2012-08-08 23:59:09 UTC (rev 125117)
@@ -26,6 +26,7 @@
#define CompositorFakeWebGraphicsContext3D_h
#include "FakeWebGraphicsContext3D.h"
+#include <wtf/PassOwnPtr.h>
namespace WebKit {
Modified: trunk/Source/WebKit/chromium/tests/FakeGraphicsContext3DTest.cpp (125116 => 125117)
--- trunk/Source/WebKit/chromium/tests/FakeGraphicsContext3DTest.cpp 2012-08-08 23:56:50 UTC (rev 125116)
+++ trunk/Source/WebKit/chromium/tests/FakeGraphicsContext3DTest.cpp 2012-08-08 23:59:09 UTC (rev 125117)
@@ -26,9 +26,10 @@
#include "config.h"
#include "FakeWebGraphicsContext3D.h"
-
#include <gmock/gmock.h>
#include <gtest/gtest.h>
+#include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
using namespace WebCore;
using namespace WebKit;
Modified: trunk/Source/WebKit/chromium/tests/FakeWebScrollbarThemeGeometry.h (125116 => 125117)
--- trunk/Source/WebKit/chromium/tests/FakeWebScrollbarThemeGeometry.h 2012-08-08 23:56:50 UTC (rev 125116)
+++ trunk/Source/WebKit/chromium/tests/FakeWebScrollbarThemeGeometry.h 2012-08-08 23:59:09 UTC (rev 125117)
@@ -27,6 +27,7 @@
#define FakeWebScrollbarThemeGeometry_h
#include <public/WebScrollbarThemeGeometry.h>
+#include <wtf/PassOwnPtr.h>
namespace WebKit {
Modified: trunk/Source/WebKit/chromium/tests/TextureCopierTest.cpp (125116 => 125117)
--- trunk/Source/WebKit/chromium/tests/TextureCopierTest.cpp 2012-08-08 23:56:50 UTC (rev 125116)
+++ trunk/Source/WebKit/chromium/tests/TextureCopierTest.cpp 2012-08-08 23:59:09 UTC (rev 125117)
@@ -27,7 +27,6 @@
#include "TextureCopier.h"
#include "FakeWebGraphicsContext3D.h"
-#include "GraphicsContext3DPrivate.h"
#include <gmock/gmock.h>
#include <gtest/gtest.h>
Modified: trunk/Source/WebKit/chromium/tests/ThrottledTextureUploaderTest.cpp (125116 => 125117)
--- trunk/Source/WebKit/chromium/tests/ThrottledTextureUploaderTest.cpp 2012-08-08 23:56:50 UTC (rev 125116)
+++ trunk/Source/WebKit/chromium/tests/ThrottledTextureUploaderTest.cpp 2012-08-08 23:59:09 UTC (rev 125117)
@@ -26,8 +26,8 @@
#include "ThrottledTextureUploader.h"
+#include "Extensions3DChromium.h"
#include "FakeWebGraphicsContext3D.h"
-#include "GraphicsContext3DPrivate.h"
#include <gmock/gmock.h>
#include <gtest/gtest.h>
