Changeset 64994 in webkit


Ignore:
Timestamp:
Aug 9, 2010 11:22:33 AM (14 years ago)
Author:
eric@webkit.org
Message:

2010-08-09 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r64993.
http://trac.webkit.org/changeset/64993
https://bugs.webkit.org/show_bug.cgi?id=43734

broke chromium compile (Requested by jamesr on #webkit).

  • platform/graphics/chromium/CanvasLayerChromium.cpp: (WebCore::CanvasLayerChromium::updateTextureContents):
  • platform/graphics/chromium/CanvasLayerChromium.h:
  • platform/graphics/skia/PlatformContextSkia.cpp: (WebCore::PlatformContextSkia::~PlatformContextSkia): (WebCore::PlatformContextSkia::setGraphicsContext3D):
Location:
trunk/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r64993 r64994  
     12010-08-09  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r64993.
     4        http://trac.webkit.org/changeset/64993
     5        https://bugs.webkit.org/show_bug.cgi?id=43734
     6
     7        broke chromium compile (Requested by jamesr on #webkit).
     8
     9        * platform/graphics/chromium/CanvasLayerChromium.cpp:
     10        (WebCore::CanvasLayerChromium::updateTextureContents):
     11        * platform/graphics/chromium/CanvasLayerChromium.h:
     12        * platform/graphics/skia/PlatformContextSkia.cpp:
     13        (WebCore::PlatformContextSkia::~PlatformContextSkia):
     14        (WebCore::PlatformContextSkia::setGraphicsContext3D):
     15
    1162010-08-09  James Robinson  <jamesr@chromium.org>
    217
  • trunk/WebCore/platform/graphics/chromium/CanvasLayerChromium.cpp

    r64993 r64994  
    7676    // Update the contents of the texture used by the compositor.
    7777    if (m_contentsDirty) {
    78         if (m_prepareTextureCallback)
    79             m_prepareTextureCallback->willPrepareTexture();
    8078        m_context->prepareTexture();
    8179        m_contentsDirty = false;
  • trunk/WebCore/platform/graphics/chromium/CanvasLayerChromium.h

    r64993 r64994  
    5555    static void setShaderProgramId(unsigned shaderProgramId) { m_shaderProgramId = shaderProgramId; }
    5656
    57     class PrepareTextureCallback : public Noncopyable {
    58     public:
    59         virtual void willPrepareTexture() = 0;
    60     };
    61     void setPrepareTextureCallback(PassOwnPtr<PrepareTextureCallback> callback) { m_prepareTextureCallback = callback; }
    62 
    6357private:
    6458    explicit CanvasLayerChromium(GraphicsLayerChromium* owner);
     
    6660    unsigned m_textureId;
    6761    bool m_textureChanged;
    68     OwnPtr<PrepareTextureCallback> m_prepareTextureCallback;
    6962
    7063    static unsigned m_shaderProgramId;
  • trunk/WebCore/platform/graphics/skia/PlatformContextSkia.cpp

    r64993 r64994  
    3434
    3535#include "AffineTransform.h"
    36 #include "CanvasLayerChromium.h"
    3736#include "GraphicsContext.h"
    3837#include "ImageBuffer.h"
     
    222221PlatformContextSkia::~PlatformContextSkia()
    223222{
    224 #if USE(GLES2_RENDERING)
    225     if (m_gpuCanvas) {
    226         CanvasLayerChromium* layer = static_cast<CanvasLayerChromium*>(m_gpuCanvas->context()->platformLayer());
    227         layer->setPrepareTextureCallback(0);
    228     }
    229 #endif
    230223}
    231224
     
    686679#if USE(GLES2_RENDERING)
    687680
    688 class PrepareTextureCallbackImpl : public CanvasLayerChromium::PrepareTextureCallback {
    689 public:
    690     static PassOwnPtr<PrepareTextureCallbackImpl> create(PlatformContextSkia* pcs)
    691     {
    692         return new PrepareTextureCallbackImpl(pcs);
    693     }
    694 
    695     virtual void willPrepareTexture()
    696     {
    697         m_pcs->prepareForHardwareDraw();
    698     }
    699 private:
    700     explicit PrepareTextureCallbackImpl(PlatformContextSkia* pcs) : m_pcs(pcs) {}
    701     PlatformContextSkia* m_pcs;
    702 };
    703 
    704681void PlatformContextSkia::setGraphicsContext3D(GraphicsContext3D* context, const WebCore::IntSize& size)
    705682{
    706683    m_useGPU = true;
    707684    m_gpuCanvas = new GLES2Canvas(context, size);
    708     CanvasLayerChromium* layer = static_cast<CanvasLayerChromium*>(context->platformLayer());
    709     layer->setPrepareTextureCallback(PrepareTextureCallbackImpl::create(this));
    710685}
    711686
Note: See TracChangeset for help on using the changeset viewer.