Diff
Modified: trunk/Source/WebCore/ChangeLog (106600 => 106601)
--- trunk/Source/WebCore/ChangeLog 2012-02-02 23:42:26 UTC (rev 106600)
+++ trunk/Source/WebCore/ChangeLog 2012-02-03 00:06:57 UTC (rev 106601)
@@ -1,3 +1,23 @@
+2012-02-02 Justin Novosad <[email protected]>
+
+ [Chromium] Use SkCanvas::flush in skia port
+ https://bugs.webkit.org/show_bug.cgi?id=77463
+
+ Reviewed by Stephen White.
+
+ Code cleanup in skia port. Using SkCanvas::flush to remove
+ unnecessary dependency on GrContext. Removed unnecessary inclusions
+ and forward declarations of GrContext in several source files.
+
+ * platform/graphics/chromium/Canvas2DLayerChromium.cpp:
+ (WebCore::Canvas2DLayerChromium::paintContentsIfDirty):
+ * platform/graphics/chromium/LayerRendererChromium.cpp:
+ * platform/graphics/chromium/LayerRendererChromium.h:
+ * platform/graphics/chromium/cc/CCLayerTreeHost.h:
+ * platform/graphics/chromium/cc/CCLayerTreeHostImpl.h:
+ * platform/graphics/chromium/cc/CCProxy.h:
+ * platform/graphics/skia/PlatformContextSkia.cpp:
+
2012-02-02 Chris Marrin <[email protected]>
Turn on CSS Filters on Windows
Modified: trunk/Source/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.cpp (106600 => 106601)
--- trunk/Source/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.cpp 2012-02-02 23:42:26 UTC (rev 106600)
+++ trunk/Source/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.cpp 2012-02-03 00:06:57 UTC (rev 106601)
@@ -41,9 +41,7 @@
#include "GraphicsContext3D.h"
#include "LayerRendererChromium.h" // For the GLC() macro
-#include "GrContext.h"
#include "SkCanvas.h"
-#include "SkDevice.h"
namespace WebCore {
@@ -113,16 +111,9 @@
bool success = m_context->makeContextCurrent();
ASSERT_UNUSED(success, success);
- // FIXME: Replace this block of skia code with m_canvas->flush, when that
- // API becomes available.
- // https://bugs.webkit.org/show_bug.cgi?id=77463
if (m_canvas)
- m_canvas->getDevice()->accessRenderTarget(); // Triggers execution of pending draw operations.
+ m_canvas->flush();
- GrContext* grContext = m_context->grContext();
- if (grContext)
- grContext->flush();
-
m_context->flush();
}
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp (106600 => 106601)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2012-02-02 23:42:26 UTC (rev 106600)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2012-02-03 00:06:57 UTC (rev 106601)
@@ -66,7 +66,6 @@
#include "cc/CCVideoDrawQuad.h"
#if USE(SKIA)
#include "Extensions3D.h"
-#include "GrContext.h"
#include "NativeImageSkia.h"
#include "PlatformContextSkia.h"
#elif USE(CG)
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h (106600 => 106601)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h 2012-02-02 23:42:26 UTC (rev 106600)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h 2012-02-03 00:06:57 UTC (rev 106601)
@@ -56,10 +56,6 @@
#include <wtf/RetainPtr.h>
#endif
-#if USE(SKIA)
-class GrContext;
-#endif
-
namespace WebCore {
class CCHeadsUpDisplay;
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h (106600 => 106601)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h 2012-02-02 23:42:26 UTC (rev 106600)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h 2012-02-03 00:06:57 UTC (rev 106601)
@@ -38,10 +38,6 @@
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
-#if USE(SKIA)
-class GrContext;
-#endif
-
namespace WebCore {
class CCLayerTreeHostImpl;
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h (106600 => 106601)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h 2012-02-02 23:42:26 UTC (rev 106600)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h 2012-02-03 00:06:57 UTC (rev 106601)
@@ -32,10 +32,6 @@
#include "cc/CCRenderPass.h"
#include <wtf/RefPtr.h>
-#if USE(SKIA)
-class GrContext;
-#endif
-
namespace WebCore {
class CCCompletionEvent;
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCProxy.h (106600 => 106601)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCProxy.h 2012-02-02 23:42:26 UTC (rev 106600)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCProxy.h 2012-02-03 00:06:57 UTC (rev 106601)
@@ -31,10 +31,6 @@
#include <wtf/PassRefPtr.h>
#include <wtf/Threading.h>
-#if USE(SKIA)
-class GrContext;
-#endif
-
namespace WebCore {
class CCThread;
Modified: trunk/Source/WebCore/platform/graphics/skia/PlatformContextSkia.cpp (106600 => 106601)
--- trunk/Source/WebCore/platform/graphics/skia/PlatformContextSkia.cpp 2012-02-02 23:42:26 UTC (rev 106600)
+++ trunk/Source/WebCore/platform/graphics/skia/PlatformContextSkia.cpp 2012-02-03 00:06:57 UTC (rev 106601)
@@ -50,9 +50,6 @@
#include "SkDashPathEffect.h"
#include "SkShader.h"
-#include "GrContext.h"
-#include "SkGpuDevice.h"
-
#include <wtf/MathExtras.h>
#include <wtf/Vector.h>
