Title: [120265] trunk/Source/WebCore
Revision
120265
Author
[email protected]
Date
2012-06-13 19:03:56 -0700 (Wed, 13 Jun 2012)

Log Message

Remove redundant code from RenderView and RenderBlock
https://bugs.webkit.org/show_bug.cgi?id=89019

Reviewed by Abhishek Arya.

As pointed out in https://bugs.webkit.org/show_bug.cgi?id=83981#c7 , RenderView::insertFixedPositionedObject()
is redundant and should be removed.
No new tests.

* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::insertPositionedObject):
(WebCore::RenderBlock::removePositionedObject):
* rendering/RenderView.cpp:
(WebCore):
* rendering/RenderView.h:
(RenderView):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (120264 => 120265)


--- trunk/Source/WebCore/ChangeLog	2012-06-14 00:40:40 UTC (rev 120264)
+++ trunk/Source/WebCore/ChangeLog	2012-06-14 02:03:56 UTC (rev 120265)
@@ -1,3 +1,22 @@
+2012-06-13  Yael Aharon  <[email protected]>
+
+        Remove redundant code from RenderView and RenderBlock
+        https://bugs.webkit.org/show_bug.cgi?id=89019
+
+        Reviewed by Abhishek Arya.
+
+        As pointed out in https://bugs.webkit.org/show_bug.cgi?id=83981#c7 , RenderView::insertFixedPositionedObject()
+        is redundant and should be removed.
+        No new tests.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::insertPositionedObject):
+        (WebCore::RenderBlock::removePositionedObject):
+        * rendering/RenderView.cpp:
+        (WebCore):
+        * rendering/RenderView.h:
+        (RenderView):
+
 2012-06-13  Dana Jansens  <[email protected]>
 
         [chromium] Create a CCStreamVideoDrawQuad used for StreamTexture video output

Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (120264 => 120265)


--- trunk/Source/WebCore/rendering/RenderBlock.cpp	2012-06-14 00:40:40 UTC (rev 120264)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp	2012-06-14 02:03:56 UTC (rev 120265)
@@ -3509,18 +3509,12 @@
         m_positionedObjects = adoptPtr(new PositionedObjectsListHashSet);
 
     m_positionedObjects->add(o);
-
-    if (o->style()->position() == FixedPosition && view())
-        view()->insertFixedPositionedObject(o);
 }
 
 void RenderBlock::removePositionedObject(RenderBox* o)
 {
     if (m_positionedObjects)
         m_positionedObjects->remove(o);
-
-    if (view())
-        view()->removeFixedPositionedObject(o);
 }
 
 void RenderBlock::removePositionedObjects(RenderBlock* o)

Modified: trunk/Source/WebCore/rendering/RenderView.cpp (120264 => 120265)


--- trunk/Source/WebCore/rendering/RenderView.cpp	2012-06-14 00:40:40 UTC (rev 120264)
+++ trunk/Source/WebCore/rendering/RenderView.cpp	2012-06-14 02:03:56 UTC (rev 120265)
@@ -945,20 +945,4 @@
     }
 }
 
-void RenderView::insertFixedPositionedObject(RenderBox* object)
-{
-    if (!m_positionedObjects)
-        m_positionedObjects = adoptPtr(new PositionedObjectsListHashSet);
-
-    m_positionedObjects->add(object);
-}
-
-void RenderView::removeFixedPositionedObject(RenderBox* object)
-{
-    if (!m_positionedObjects)
-        return;
-
-    m_positionedObjects->remove(object);
-}
-
 } // namespace WebCore

Modified: trunk/Source/WebCore/rendering/RenderView.h (120264 => 120265)


--- trunk/Source/WebCore/rendering/RenderView.h	2012-06-14 00:40:40 UTC (rev 120264)
+++ trunk/Source/WebCore/rendering/RenderView.h	2012-06-14 02:03:56 UTC (rev 120265)
@@ -183,8 +183,6 @@
     IntSize viewportSize() const { return document()->viewportSize(); }
 
     void setFixedPositionedObjectsNeedLayout();
-    void insertFixedPositionedObject(RenderBox*);
-    void removeFixedPositionedObject(RenderBox*);
 
 protected:
     virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&, ApplyContainerFlipOrNot = ApplyContainerFlip, bool* wasFixed = 0) const;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to