Changeset 106601 in webkit


Ignore:
Timestamp:
Feb 2, 2012 4:06:57 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[Chromium] Use SkCanvas::flush in skia port
​https://bugs.webkit.org/show_bug.cgi?id=77463

Patch by Justin Novosad <​junov@chromium.org> on 2012-02-02
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:
Location:
trunk/Source/WebCore
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r106593 r106601  
     12012-02-02  Justin Novosad  <junov@chromium.org>
     2
     3        [Chromium] Use SkCanvas::flush in skia port
     4        https://bugs.webkit.org/show_bug.cgi?id=77463
     5
     6        Reviewed by Stephen White.
     7
     8        Code cleanup in skia port. Using SkCanvas::flush to remove
     9        unnecessary dependency on GrContext.  Removed unnecessary inclusions
     10        and forward declarations of GrContext in several source files.
     11
     12        * platform/graphics/chromium/Canvas2DLayerChromium.cpp:
     13        (WebCore::Canvas2DLayerChromium::paintContentsIfDirty):
     14        * platform/graphics/chromium/LayerRendererChromium.cpp:
     15        * platform/graphics/chromium/LayerRendererChromium.h:
     16        * platform/graphics/chromium/cc/CCLayerTreeHost.h:
     17        * platform/graphics/chromium/cc/CCLayerTreeHostImpl.h:
     18        * platform/graphics/chromium/cc/CCProxy.h:
     19        * platform/graphics/skia/PlatformContextSkia.cpp:
     20
    1212012-02-02  Chris Marrin  <cmarrin@apple.com>
    222

  • trunk/Source/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.cpp

    r106500 r106601  
    4242#include "LayerRendererChromium.h" // For the GLC() macro
    4343
    44 #include "GrContext.h"
    4544#include "SkCanvas.h"
    46 #include "SkDevice.h"
    4745
    4846namespace WebCore {
    … …  
    114112    ASSERT_UNUSED(success, success);
    115113
    116     // FIXME: Replace this block of skia code with m_canvas->flush, when that
    117     // API becomes available.
    118     // https://bugs.webkit.org/show_bug.cgi?id=77463
    119114    if (m_canvas)
    120         m_canvas->getDevice()->accessRenderTarget(); // Triggers execution of pending draw operations.
    121 
    122     GrContext* grContext = m_context->grContext();
    123     if (grContext)
    124         grContext->flush();
     115        m_canvas->flush();
    125116
    126117    m_context->flush();

  • trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp

    r106306 r106601  
    6767#if USE(SKIA)
    6868#include "Extensions3D.h"
    69 #include "GrContext.h"
    7069#include "NativeImageSkia.h"
    7170#include "PlatformContextSkia.h"

  • trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h

    r105311 r106601  
    5757#endif
    5858
    59 #if USE(SKIA)
    60 class GrContext;
    61 #endif
    62 
    6359namespace WebCore {
    6460

  • trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h

    r106383 r106601  
    3939#include <wtf/RefCounted.h>
    4040
    41 #if USE(SKIA)
    42 class GrContext;
    43 #endif
    44 
    4541namespace WebCore {
    4642

  • trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h

    r106158 r106601  
    3232#include "cc/CCRenderPass.h"
    3333#include <wtf/RefPtr.h>
    34 
    35 #if USE(SKIA)
    36 class GrContext;
    37 #endif
    3834
    3935namespace WebCore {

  • trunk/Source/WebCore/platform/graphics/chromium/cc/CCProxy.h

    r105583 r106601  
    3131#include <wtf/PassRefPtr.h>
    3232#include <wtf/Threading.h>
    33 
    34 #if USE(SKIA)
    35 class GrContext;
    36 #endif
    3733
    3834namespace WebCore {

  • trunk/Source/WebCore/platform/graphics/skia/PlatformContextSkia.cpp

    r104861 r106601  
    5050#include "SkDashPathEffect.h"
    5151#include "SkShader.h"
    52 
    53 #include "GrContext.h"
    54 #include "SkGpuDevice.h"
    5552
    5653#include <wtf/MathExtras.h>
Note: See TracChangeset for help on using the changeset viewer.