Changeset 181551 in webkit

Timestamp:

Mar 16, 2015, 5:28:55 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r181500 - RenderBlock::imageChange() calling const methods on exit
​https://bugs.webkit.org/show_bug.cgi?id=142648

Reviewed by Brent Fulgham.

No new tests, no change on behavior.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::imageChanged): Deleted.

• rendering/RenderBlock.h:

Location:

releases/WebKitGTK/webkit-2.8/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (1 diff)
• rendering/RenderBlock.h (modified) (1 diff)

releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-14  Adenilson Cavalcanti  <cavalcantii@gmail.com>
+
+        RenderBlock::imageChange() calling const methods on exit
+        https://bugs.webkit.org/show_bug.cgi?id=142648
+
+        Reviewed by Brent Fulgham.
+
+        No new tests, no change on behavior.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::imageChanged): Deleted.
+        * rendering/RenderBlock.h:
+
 2015-03-13  Joonghun Park  <jh718.park@samsung.com>
 

releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderBlock.cpp

@@ -952 +952 @@
 }
 
-#if ENABLE(CSS_SHAPES)
-void RenderBlock::imageChanged(WrappedImagePtr image, const IntRect*)
-{
-    RenderBox::imageChanged(image);
-
-    if (!parent() || !everHadLayout())
-        return;
-}
-#endif
-
 void RenderBlock::preparePaginationBeforeBlockLayout(bool& relayoutChildren)
 {

releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderBlock.h

@@ -303 +303 @@
 #endif
 
-
-#if ENABLE(CSS_SHAPES)
-    virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) override;
-#endif
-
     virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&) override;