Title: [110578] trunk/Source/WebCore
- Revision
- 110578
- Author
- [email protected]
- Date
- 2012-03-13 10:30:05 -0700 (Tue, 13 Mar 2012)
Log Message
[BlackBerry] Remove sublayers before clamping just in case the layer already exists
https://bugs.webkit.org/show_bug.cgi?id=80989
Patch by Konrad Piascik <[email protected]> on 2012-03-13
Reviewed by Antonio Gomes.
Discovered when trying to add a highlight sublayer for web inspector. Since that layer
may already exist in the tree we need to see if it will be pruned before we clamp on the
size.
This was manually tested during the writing of another patch to add web inspector highlights
to accelrated compositing.
* platform/graphics/blackberry/LayerWebKitThread.cpp:
(WebCore::LayerWebKitThread::insertSublayer):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (110577 => 110578)
--- trunk/Source/WebCore/ChangeLog 2012-03-13 17:25:53 UTC (rev 110577)
+++ trunk/Source/WebCore/ChangeLog 2012-03-13 17:30:05 UTC (rev 110578)
@@ -1,3 +1,20 @@
+2012-03-13 Konrad Piascik <[email protected]>
+
+ [BlackBerry] Remove sublayers before clamping just in case the layer already exists
+ https://bugs.webkit.org/show_bug.cgi?id=80989
+
+ Reviewed by Antonio Gomes.
+
+ Discovered when trying to add a highlight sublayer for web inspector. Since that layer
+ may already exist in the tree we need to see if it will be pruned before we clamp on the
+ size.
+
+ This was manually tested during the writing of another patch to add web inspector highlights
+ to accelrated compositing.
+
+ * platform/graphics/blackberry/LayerWebKitThread.cpp:
+ (WebCore::LayerWebKitThread::insertSublayer):
+
2012-03-13 Vsevolod Vlasov <[email protected]>
Web Inspector: Add snippets model.
Modified: trunk/Source/WebCore/platform/graphics/blackberry/LayerWebKitThread.cpp (110577 => 110578)
--- trunk/Source/WebCore/platform/graphics/blackberry/LayerWebKitThread.cpp 2012-03-13 17:25:53 UTC (rev 110577)
+++ trunk/Source/WebCore/platform/graphics/blackberry/LayerWebKitThread.cpp 2012-03-13 17:30:05 UTC (rev 110578)
@@ -306,8 +306,8 @@
void LayerWebKitThread::insertSublayer(PassRefPtr<LayerWebKitThread> sublayer, size_t index)
{
+ sublayer->removeFromSuperlayer();
index = min(index, m_sublayers.size());
- sublayer->removeFromSuperlayer();
sublayer->setSuperlayer(this);
m_sublayers.insert(index, sublayer);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
