2011-03-15 Alok priyadarshi <alokp@chromium.org>

        Reviewed by James Robinson.

        Valgrind error due to uninitialized PluginLayerChromium::m_textureId
        https://bugs.webkit.org/show_bug.cgi?id=56390

        * platform/graphics/chromium/PluginLayerChromium.cpp:
        (WebCore::PluginLayerChromium::PluginLayerChromium):
        * platform/graphics/chromium/PluginLayerChromium.h:
        (WebCore::PluginLayerChromium::textureId):
2011-03-15  Alok priyadarshi  <alokp@chromium.org>

        Reviewed by James Robinson.

        Valgrind error due to uninitialized PluginLayerChromium::m_textureId
        https://bugs.webkit.org/show_bug.cgi?id=56390

        * src/WebPluginContainerImpl.cpp:
        (WebKit::WebPluginContainerImpl::setBackingTextureId):
        (WebKit::WebPluginContainerImpl::platformLayer):

git-svn-id: svn://svn.chromium.org/blink/trunk@81169 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 9384ba7f
2011-03-15 Alok priyadarshi <alokp@chromium.org>
Reviewed by James Robinson.
Valgrind error due to uninitialized PluginLayerChromium::m_textureId
https://bugs.webkit.org/show_bug.cgi?id=56390
* platform/graphics/chromium/PluginLayerChromium.cpp:
(WebCore::PluginLayerChromium::PluginLayerChromium):
* platform/graphics/chromium/PluginLayerChromium.h:
(WebCore::PluginLayerChromium::textureId):
2011-03-14 Nikolas Zimmermann <nzimmermann@rim.com> 2011-03-14 Nikolas Zimmermann <nzimmermann@rim.com>
Reviewed by Dirk Schulze. Reviewed by Dirk Schulze.
......
...@@ -43,6 +43,7 @@ PassRefPtr<PluginLayerChromium> PluginLayerChromium::create(GraphicsLayerChromiu ...@@ -43,6 +43,7 @@ PassRefPtr<PluginLayerChromium> PluginLayerChromium::create(GraphicsLayerChromiu
PluginLayerChromium::PluginLayerChromium(GraphicsLayerChromium* owner) PluginLayerChromium::PluginLayerChromium(GraphicsLayerChromium* owner)
: LayerChromium(owner) : LayerChromium(owner)
, m_textureId(0)
{ {
} }
......
...@@ -40,9 +40,9 @@ public: ...@@ -40,9 +40,9 @@ public:
virtual bool drawsContent() const { return true; } virtual bool drawsContent() const { return true; }
virtual void updateContentsIfDirty(); virtual void updateContentsIfDirty();
virtual void draw(); virtual void draw();
unsigned textureId() const { return m_textureId; }
void setTextureId(unsigned textureId); void setTextureId(unsigned textureId);
unsigned getTextureId() const { return m_textureId; }
typedef ProgramBinding<VertexShaderPosTex, FragmentShaderRGBATexFlipAlpha> Program; typedef ProgramBinding<VertexShaderPosTex, FragmentShaderRGBATexFlipAlpha> Program;
......
2011-03-15 Alok priyadarshi <alokp@chromium.org>
Reviewed by James Robinson.
Valgrind error due to uninitialized PluginLayerChromium::m_textureId
https://bugs.webkit.org/show_bug.cgi?id=56390
* src/WebPluginContainerImpl.cpp:
(WebKit::WebPluginContainerImpl::setBackingTextureId):
(WebKit::WebPluginContainerImpl::platformLayer):
2011-03-15 Brett Wilson <brettw@chromium.org> 2011-03-15 Brett Wilson <brettw@chromium.org>
Reviewed by Adam Barth. Reviewed by Adam Barth.
......
...@@ -310,7 +310,7 @@ void WebPluginContainerImpl::reportGeometry() ...@@ -310,7 +310,7 @@ void WebPluginContainerImpl::reportGeometry()
void WebPluginContainerImpl::setBackingTextureId(unsigned id) void WebPluginContainerImpl::setBackingTextureId(unsigned id)
{ {
#if USE(ACCELERATED_COMPOSITING) #if USE(ACCELERATED_COMPOSITING)
unsigned currId = m_platformLayer->getTextureId(); unsigned currId = m_platformLayer->textureId();
if (currId == id) if (currId == id)
return; return;
...@@ -443,7 +443,7 @@ void WebPluginContainerImpl::willDestroyPluginLoadObserver(WebPluginLoadObserver ...@@ -443,7 +443,7 @@ void WebPluginContainerImpl::willDestroyPluginLoadObserver(WebPluginLoadObserver
#if USE(ACCELERATED_COMPOSITING) #if USE(ACCELERATED_COMPOSITING)
WebCore::LayerChromium* WebPluginContainerImpl::platformLayer() const WebCore::LayerChromium* WebPluginContainerImpl::platformLayer() const
{ {
return m_platformLayer->getTextureId() ? m_platformLayer.get() : 0; return m_platformLayer->textureId() ? m_platformLayer.get() : 0;
} }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment