Title: [104003] trunk/Source/WebCore
- Revision
- 104003
- Author
- [email protected]
- Date
- 2012-01-03 19:39:11 -0800 (Tue, 03 Jan 2012)
Log Message
[chromium] Prevent crashing due to NULL texture updater.
https://bugs.webkit.org/show_bug.cgi?id=75288
Patch by Eric Penner <[email protected]> on 2012-01-03
Reviewed by James Robinson.
* platform/graphics/chromium/ContentLayerChromium.cpp:
* platform/graphics/chromium/ContentLayerChromium.h:
* platform/graphics/chromium/ImageLayerChromium.cpp:
* platform/graphics/chromium/ImageLayerChromium.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (104002 => 104003)
--- trunk/Source/WebCore/ChangeLog 2012-01-04 03:36:46 UTC (rev 104002)
+++ trunk/Source/WebCore/ChangeLog 2012-01-04 03:39:11 UTC (rev 104003)
@@ -1,3 +1,15 @@
+2012-01-03 Eric Penner <[email protected]>
+
+ [chromium] Prevent crashing due to NULL texture updater.
+ https://bugs.webkit.org/show_bug.cgi?id=75288
+
+ Reviewed by James Robinson.
+
+ * platform/graphics/chromium/ContentLayerChromium.cpp:
+ * platform/graphics/chromium/ContentLayerChromium.h:
+ * platform/graphics/chromium/ImageLayerChromium.cpp:
+ * platform/graphics/chromium/ImageLayerChromium.h:
+
2012-01-03 Shawn Singh <[email protected]>
[chromium] CCLayerSorter accidentally reverses order of some layers.
Modified: trunk/Source/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp (104002 => 104003)
--- trunk/Source/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp 2012-01-04 03:36:46 UTC (rev 104002)
+++ trunk/Source/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp 2012-01-04 03:39:11 UTC (rev 104003)
@@ -87,12 +87,6 @@
{
}
-void ContentLayerChromium::cleanupResources()
-{
- m_textureUpdater.clear();
- TiledLayerChromium::cleanupResources();
-}
-
void ContentLayerChromium::paintContentsIfDirty()
{
updateTileSizeAndTilingOption();
Modified: trunk/Source/WebCore/platform/graphics/chromium/ContentLayerChromium.h (104002 => 104003)
--- trunk/Source/WebCore/platform/graphics/chromium/ContentLayerChromium.h 2012-01-04 03:36:46 UTC (rev 104002)
+++ trunk/Source/WebCore/platform/graphics/chromium/ContentLayerChromium.h 2012-01-04 03:39:11 UTC (rev 104003)
@@ -56,7 +56,6 @@
explicit ContentLayerChromium(CCLayerDelegate*);
private:
- virtual void cleanupResources();
virtual void createTextureUpdater(const CCLayerTreeHost*);
virtual LayerTextureUpdater* textureUpdater() const { return m_textureUpdater.get(); }
Modified: trunk/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.cpp (104002 => 104003)
--- trunk/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.cpp 2012-01-04 03:36:46 UTC (rev 104002)
+++ trunk/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.cpp 2012-01-04 03:39:11 UTC (rev 104003)
@@ -144,12 +144,6 @@
{
}
-void ImageLayerChromium::cleanupResources()
-{
- m_textureUpdater.clear();
- TiledLayerChromium::cleanupResources();
-}
-
void ImageLayerChromium::setContents(Image* contents)
{
// setContents() currently gets called whenever there is any
Modified: trunk/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.h (104002 => 104003)
--- trunk/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.h 2012-01-04 03:36:46 UTC (rev 104002)
+++ trunk/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.h 2012-01-04 03:39:11 UTC (rev 104003)
@@ -61,7 +61,6 @@
private:
explicit ImageLayerChromium(CCLayerDelegate*);
- virtual void cleanupResources();
virtual void createTextureUpdater(const CCLayerTreeHost*);
void setTilingOption(TilingOption);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
