Changeset 64994 in webkit
- Timestamp:
- Aug 9, 2010 11:22:33 AM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r64993 r64994 1 2010-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 1 16 2010-08-09 James Robinson <jamesr@chromium.org> 2 17 -
trunk/WebCore/platform/graphics/chromium/CanvasLayerChromium.cpp
r64993 r64994 76 76 // Update the contents of the texture used by the compositor. 77 77 if (m_contentsDirty) { 78 if (m_prepareTextureCallback)79 m_prepareTextureCallback->willPrepareTexture();80 78 m_context->prepareTexture(); 81 79 m_contentsDirty = false; -
trunk/WebCore/platform/graphics/chromium/CanvasLayerChromium.h
r64993 r64994 55 55 static void setShaderProgramId(unsigned shaderProgramId) { m_shaderProgramId = shaderProgramId; } 56 56 57 class PrepareTextureCallback : public Noncopyable {58 public:59 virtual void willPrepareTexture() = 0;60 };61 void setPrepareTextureCallback(PassOwnPtr<PrepareTextureCallback> callback) { m_prepareTextureCallback = callback; }62 63 57 private: 64 58 explicit CanvasLayerChromium(GraphicsLayerChromium* owner); … … 66 60 unsigned m_textureId; 67 61 bool m_textureChanged; 68 OwnPtr<PrepareTextureCallback> m_prepareTextureCallback;69 62 70 63 static unsigned m_shaderProgramId; -
trunk/WebCore/platform/graphics/skia/PlatformContextSkia.cpp
r64993 r64994 34 34 35 35 #include "AffineTransform.h" 36 #include "CanvasLayerChromium.h"37 36 #include "GraphicsContext.h" 38 37 #include "ImageBuffer.h" … … 222 221 PlatformContextSkia::~PlatformContextSkia() 223 222 { 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 #endif230 223 } 231 224 … … 686 679 #if USE(GLES2_RENDERING) 687 680 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 704 681 void PlatformContextSkia::setGraphicsContext3D(GraphicsContext3D* context, const WebCore::IntSize& size) 705 682 { 706 683 m_useGPU = true; 707 684 m_gpuCanvas = new GLES2Canvas(context, size); 708 CanvasLayerChromium* layer = static_cast<CanvasLayerChromium*>(context->platformLayer());709 layer->setPrepareTextureCallback(PrepareTextureCallbackImpl::create(this));710 685 } 711 686
Note: See TracChangeset
for help on using the changeset viewer.