Title: [108276] trunk/Source/WebCore
Revision
108276
Author
yael.aha...@nokia.com
Date
2012-02-20 17:33:41 -0800 (Mon, 20 Feb 2012)

Log Message

Regression (108135) isOpaque() returns uninitialized variable.
https://bugs.webkit.org/show_bug.cgi?id=79049

Reviewed by Noam Rosenthal.

isOpaque() should use the new m_flags instead of the old m_isOpaque.
No new tests. No new functionality.

* platform/graphics/texmap/TextureMapper.h:
(WebCore::BitmapTexture::reset):
(WebCore::BitmapTexture::isOpaque):
(BitmapTexture):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (108275 => 108276)


--- trunk/Source/WebCore/ChangeLog	2012-02-21 01:27:27 UTC (rev 108275)
+++ trunk/Source/WebCore/ChangeLog	2012-02-21 01:33:41 UTC (rev 108276)
@@ -1,3 +1,18 @@
+2012-02-20  Yael Aharon  <yael.aha...@nokia.com>
+
+        Regression (108135) isOpaque() returns uninitialized variable.
+        https://bugs.webkit.org/show_bug.cgi?id=79049
+
+        Reviewed by Noam Rosenthal.
+
+        isOpaque() should use the new m_flags instead of the old m_isOpaque.
+        No new tests. No new functionality.
+
+        * platform/graphics/texmap/TextureMapper.h:
+        (WebCore::BitmapTexture::reset):
+        (WebCore::BitmapTexture::isOpaque):
+        (BitmapTexture):
+
 2012-02-20  Kentaro Hara  <hara...@chromium.org>
 
         Unreviewed. Rebaselined run-bindings-tests results.

Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h (108275 => 108276)


--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h	2012-02-21 01:27:27 UTC (rev 108275)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h	2012-02-21 01:33:41 UTC (rev 108276)
@@ -70,7 +70,7 @@
 
     virtual int bpp() const { return 32; }
     virtual void didReset() { }
-    void reset(const IntSize& size, Flags flags = 0)
+    void reset(const IntSize& size, Flags flags)
     {
         m_flags = flags;
         m_contentSize = size;
@@ -79,7 +79,7 @@
 
     inline IntSize contentSize() const { return m_contentSize; }
     inline int numberOfBytes() const { return size().width() * size().height() * bpp() >> 3; }
-    inline bool isOpaque() const { return m_isOpaque; }
+    inline bool isOpaque() const { return !(m_flags & SupportsAlpha); }
 
 #if ENABLE(CSS_FILTERS)
     virtual void applyFilters(const BitmapTexture& contentTexture, const FilterOperations&) { }
@@ -87,7 +87,6 @@
 
 protected:
     IntSize m_contentSize;
-    bool m_isOpaque;
 
 private:
     Flags m_flags;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to