Title: [88727] trunk/Source/WebCore
- Revision
- 88727
- Author
- caio.olive...@openbossa.org
- Date
- 2011-06-13 15:53:05 -0700 (Mon, 13 Jun 2011)
Log Message
2011-06-13 Caio Marcelo de Oliveira Filho <caio.olive...@openbossa.org>
Reviewed by Adam Barth.
Simplify logic in ProgressTracker::progressCompleted()
https://bugs.webkit.org/show_bug.cgi?id=62598
Testing for "m_numProgressTrackedFrames != 0" is unnecessary because it is
always true, otherwise we would entered in the first part of the conditional.
* loader/ProgressTracker.cpp:
(WebCore::ProgressTracker::progressCompleted):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (88726 => 88727)
--- trunk/Source/WebCore/ChangeLog 2011-06-13 22:50:53 UTC (rev 88726)
+++ trunk/Source/WebCore/ChangeLog 2011-06-13 22:53:05 UTC (rev 88727)
@@ -1,3 +1,16 @@
+2011-06-13 Caio Marcelo de Oliveira Filho <caio.olive...@openbossa.org>
+
+ Reviewed by Adam Barth.
+
+ Simplify logic in ProgressTracker::progressCompleted()
+ https://bugs.webkit.org/show_bug.cgi?id=62598
+
+ Testing for "m_numProgressTrackedFrames != 0" is unnecessary because it is
+ always true, otherwise we would entered in the first part of the conditional.
+
+ * loader/ProgressTracker.cpp:
+ (WebCore::ProgressTracker::progressCompleted):
+
2011-06-13 Dimitri Glazkov <dglaz...@chromium.org>
Unreviewed, rolling out r88704.
Modified: trunk/Source/WebCore/loader/ProgressTracker.cpp (88726 => 88727)
--- trunk/Source/WebCore/loader/ProgressTracker.cpp 2011-06-13 22:50:53 UTC (rev 88726)
+++ trunk/Source/WebCore/loader/ProgressTracker.cpp 2011-06-13 22:53:05 UTC (rev 88727)
@@ -129,8 +129,7 @@
frame->loader()->client()->willChangeEstimatedProgress();
m_numProgressTrackedFrames--;
- if (m_numProgressTrackedFrames == 0 ||
- (frame == m_originatingProgressFrame && m_numProgressTrackedFrames != 0))
+ if (!m_numProgressTrackedFrames || m_originatingProgressFrame == frame)
finalProgressComplete();
frame->loader()->client()->didChangeEstimatedProgress();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
