Title: [181551] releases/WebKitGTK/webkit-2.8/Source/WebCore
- Revision
- 181551
- Author
- carlo...@webkit.org
- Date
- 2015-03-16 05:28:55 -0700 (Mon, 16 Mar 2015)
Log 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:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (181550 => 181551)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-03-16 12:24:46 UTC (rev 181550)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-03-16 12:28:55 UTC (rev 181551)
@@ -1,3 +1,16 @@
+2015-03-14 Adenilson Cavalcanti <cavalcan...@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.p...@samsung.com>
Fix Debug build error 'comparison is always true due to limited range of data type [-Werror=type-limits]'
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderBlock.cpp (181550 => 181551)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderBlock.cpp 2015-03-16 12:24:46 UTC (rev 181550)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderBlock.cpp 2015-03-16 12:28:55 UTC (rev 181551)
@@ -951,16 +951,6 @@
return *rareData.get();
}
-#if ENABLE(CSS_SHAPES)
-void RenderBlock::imageChanged(WrappedImagePtr image, const IntRect*)
-{
- RenderBox::imageChanged(image);
-
- if (!parent() || !everHadLayout())
- return;
-}
-#endif
-
void RenderBlock::preparePaginationBeforeBlockLayout(bool& relayoutChildren)
{
// Regions changing widths can force us to relayout our children.
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderBlock.h (181550 => 181551)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderBlock.h 2015-03-16 12:24:46 UTC (rev 181550)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderBlock.h 2015-03-16 12:28:55 UTC (rev 181551)
@@ -302,11 +302,6 @@
void checkPositionedObjectsNeedLayout();
#endif
-
-#if ENABLE(CSS_SHAPES)
- virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) override;
-#endif
-
virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&) override;
virtual bool canHaveChildren() const override { return true; }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
