Merge 67709 - 2010-09-17 Pavel Feldman <pfeldman@chromium.org>...

WebCore/loader/FrameLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ skipping 3039 matching lines @@
 #if ENABLE(INSPECTOR)
         page->inspectorController()->didLoadResourceFromMemoryCache(m_documentLoader.get(), resource);
 #endif
         m_documentLoader->didTellClientAboutLoad(resource->url());
         return;
     }
 
     unsigned long identifier;
     ResourceError error;
     requestFromDelegate(request, identifier, error);
+#if ENABLE(INSPECTOR)
+    page->inspectorController()->markResourceAsCached(identifier);
+#endif
     notifier()->sendRemainingDelegateMessages(m_documentLoader.get(), identifier, resource->response(), resource->encodedSize(), error);
 }
 
 void FrameLoader::applyUserAgent(ResourceRequest& request)
 {
     String userAgent = client()->userAgent(request.url());
     ASSERT(!userAgent.isNull());
     request.setHTTPUserAgent(userAgent);
 }
 
@@ skipping 452 matching lines @@
         windowRect.setHeight(features.height + (windowRect.height() - pageSize.height()));
     page->chrome()->setWindowRect(windowRect);
 
     page->chrome()->show();
 
     created = true;
     return frame;
 }
 
 } // namespace WebCore