Merge pull request #43 from junmin-zhu/fix

Raphael Kubo da Costa · Raphael Kubo da Costa · commit acb3279a0d30 · 2015-03-06T17:59:34.000+02:00
[Android] Fix Crosswalk failed to build debug version.
diff --git a/Source/core/loader/ProgressTracker.cpp b/Source/core/loader/ProgressTracker.cpp
@@ -95,7 +95,7 @@ void ProgressTracker::dispose()
 {
     if (m_inProgress)
         progressCompleted();
-    ASSERT(!m_frame->isLoading());
+    ASSERT(!m_inProgress);
 }
 
 double ProgressTracker::estimatedProgress() const

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ void ProgressTracker::dispose()`
`95`	`95`	`{`
`96`	`96`	`if (m_inProgress)`
`97`	`97`	`progressCompleted();`
`98`		`- ASSERT(!m_frame->isLoading());`
	`98`	`+ ASSERT(!m_inProgress);`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`double ProgressTracker::estimatedProgress() const`