Code cleanup in core/loader/

Source/core/loader/ProgressTracker.cpp

 /*
  * Copyright (C) 2007 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 19 matching lines @@
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/loader/FrameLoader.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "platform/Logging.h"
 #include "platform/network/ResourceResponse.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/text/CString.h"
 
-using std::min;
+using namespace std;
 
 namespace blink {
 
 // Always start progress at initialProgressValue. This helps provide feedback as
 // soon as a load starts.
 static const double initialProgressValue = 0.1;
 
 // Similarly, always leave space at the end. This helps show the user that we're not done
 // until we're done.
 static const double finalProgressValue = 0.9; // 1.0 - initialProgressValue
@@ skipping 93 matching lines @@
 
     long long estimatedLength = response.expectedContentLength();
     if (estimatedLength < 0)
         estimatedLength = progressItemDefaultEstimatedLength;
 
     m_totalPageAndResourceBytesToLoad += estimatedLength;
 
     if (ProgressItem* item = m_progressItems.get(identifier)) {
         item->bytesReceived = 0;
         item->estimatedLength = estimatedLength;
-    } else
+    } else {
         m_progressItems.set(identifier, adoptPtr(new ProgressItem(estimatedLength)));
+    }
 }
 
 void ProgressTracker::incrementProgress(unsigned long identifier, int length)
 {
     ProgressItem* item = m_progressItems.get(identifier);
 
     // FIXME: Can this ever happen?
     if (!item)
         return;
 
     unsigned bytesReceived = length;
     double increment, percentOfRemainingBytes;
     long long remainingBytes, estimatedBytesForPendingRequests;
 
     item->bytesReceived += bytesReceived;
     if (item->bytesReceived > item->estimatedLength) {
         m_totalPageAndResourceBytesToLoad += ((item->bytesReceived * 2) - item->estimatedLength);
         item->estimatedLength = item->bytesReceived * 2;
     }
 
     int numPendingOrLoadingRequests = m_frame->document()->fetcher()->requestCount();
     estimatedBytesForPendingRequests = progressItemDefaultEstimatedLength * numPendingOrLoadingRequests;
     remainingBytes = ((m_totalPageAndResourceBytesToLoad + estimatedBytesForPendingRequests) - m_totalBytesReceived);
-    if (remainingBytes > 0)  // Prevent divide by 0.
+    if (remainingBytes > 0) // Prevent divide by 0.
         percentOfRemainingBytes = (double)bytesReceived / (double)remainingBytes;
     else
         percentOfRemainingBytes = 1.0;
 
     // For documents that use WebCore's layout system, treat first layout as the half-way point.
     bool useClampedMaxProgress = !m_frame->view()->didFirstLayout();
     double maxProgressValue = useClampedMaxProgress ? 0.5 : finalProgressValue;
     increment = (maxProgressValue - m_progressValue) * percentOfRemainingBytes;
     m_progressValue += increment;
     m_progressValue = min(m_progressValue, maxProgressValue);
@@ skipping 27 matching lines @@
         return;
 
     // Adjust the total expected bytes to account for any overage/underage.
     long long delta = item->bytesReceived - item->estimatedLength;
     m_totalPageAndResourceBytesToLoad += delta;
 
     m_progressItems.remove(identifier);
 }
 
 }