Title: [100685] trunk
Revision
100685
Author
knor...@google.com
Date
2011-11-17 15:05:16 -0800 (Thu, 17 Nov 2011)

Log Message

       Several void functions in FrameView and RenderObject actually return values.
       https://bugs.webkit.org/show_bug.cgi?id=72640

Reviewed by Adam Barth.

* ../../Source/WebCore/page/FrameView.cpp:
* ../../Source/WebCore/rendering/RenderObject.cpp:

Modified Paths

Diff

Modified: trunk/ChangeLog (100684 => 100685)


--- trunk/ChangeLog	2011-11-17 23:02:20 UTC (rev 100684)
+++ trunk/ChangeLog	2011-11-17 23:05:16 UTC (rev 100685)
@@ -1,3 +1,13 @@
+2011-11-17  Kelly Norton  <knor...@google.com>
+
+       Several void functions in FrameView and RenderObject actually return values.
+       https://bugs.webkit.org/show_bug.cgi?id=72640
+
+        Reviewed by Adam Barth.
+
+        * ../../Source/WebCore/page/FrameView.cpp:
+        * ../../Source/WebCore/rendering/RenderObject.cpp:
+
 2011-11-17  Patrick Gansterer  <par...@webkit.org>
 
         [CMake] Make CODE_GENERATOR_PREPROCESSOR more useable

Modified: trunk/Source/WebCore/page/FrameView.cpp (100684 => 100685)


--- trunk/Source/WebCore/page/FrameView.cpp	2011-11-17 23:02:20 UTC (rev 100684)
+++ trunk/Source/WebCore/page/FrameView.cpp	2011-11-17 23:05:16 UTC (rev 100685)
@@ -1807,8 +1807,10 @@
 void FrameView::beginDeferredRepaints()
 {
     Page* page = m_frame->page();
-    if (page->mainFrame() != m_frame)
-        return page->mainFrame()->view()->beginDeferredRepaints();
+    if (page->mainFrame() != m_frame) {
+        page->mainFrame()->view()->beginDeferredRepaints();
+        return;
+    }
 
     m_deferringRepaints++;
 }
@@ -1817,8 +1819,10 @@
 void FrameView::endDeferredRepaints()
 {
     Page* page = m_frame->page();
-    if (page->mainFrame() != m_frame)
-        return page->mainFrame()->view()->endDeferredRepaints();
+    if (page->mainFrame() != m_frame) {
+        page->mainFrame()->view()->endDeferredRepaints();
+        return;
+    }
 
     ASSERT(m_deferringRepaints > 0);
 
@@ -2385,7 +2389,7 @@
     Page* page = m_frame->page();
     if (!page)
         return;
-    return page->chrome()->client()->didCompleteRubberBandForFrame(m_frame.get(), initialOverhang);
+    page->chrome()->client()->didCompleteRubberBandForFrame(m_frame.get(), initialOverhang);
 }
 
 void FrameView::didCompleteRubberBand(const IntSize& initialOverhang) const
@@ -2393,7 +2397,7 @@
     Page* page = m_frame->page();
     if (!page)
         return;
-    return page->chrome()->client()->didCompleteRubberBandForFrame(m_frame.get(), initialOverhang);
+    page->chrome()->client()->didCompleteRubberBandForFrame(m_frame.get(), initialOverhang);
 }
 
 void FrameView::didStartAnimatedScroll() const
@@ -2401,7 +2405,7 @@
     Page* page = m_frame->page();
     if (!page)
         return;
-    return page->chrome()->client()->didStartAnimatedScroll();
+    page->chrome()->client()->didStartAnimatedScroll();
 }
 
 void FrameView::didCompleteAnimatedScroll() const
@@ -2409,7 +2413,7 @@
     Page* page = m_frame->page();
     if (!page)
         return;
-    return page->chrome()->client()->didCompleteAnimatedScroll();
+    page->chrome()->client()->didCompleteAnimatedScroll();
 }
 
 void FrameView::setVisibleScrollerThumbRect(const IntRect& scrollerThumb)
@@ -2419,7 +2423,7 @@
         return;
     if (page->mainFrame() != m_frame)
         return;
-    return page->chrome()->client()->notifyScrollerThumbIsVisibleInRect(scrollerThumb);
+    page->chrome()->client()->notifyScrollerThumbIsVisibleInRect(scrollerThumb);
 }
 
 bool FrameView::isOnActivePage() const
@@ -2823,7 +2827,7 @@
             return;
     }
 
-    return ScrollView::paintOverhangAreas(context, horizontalOverhangArea, verticalOverhangArea, dirtyRect);
+    ScrollView::paintOverhangAreas(context, horizontalOverhangArea, verticalOverhangArea, dirtyRect);
 }
 
 void FrameView::updateLayoutAndStyleIfNeededRecursive()

Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (100684 => 100685)


--- trunk/Source/WebCore/rendering/RenderObject.cpp	2011-11-17 23:02:20 UTC (rev 100684)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp	2011-11-17 23:05:16 UTC (rev 100685)
@@ -1289,8 +1289,10 @@
         return;
     }
 
-    if (repaintContainer->isRenderFlowThread())
-        return toRenderFlowThread(repaintContainer)->repaintRectangleInRegions(r, immediate);
+    if (repaintContainer->isRenderFlowThread()) {
+        toRenderFlowThread(repaintContainer)->repaintRectangleInRegions(r, immediate);
+        return;
+    }
 
 #if USE(ACCELERATED_COMPOSITING)
     RenderView* v = view();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to