OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. |
3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) | 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) |
5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> | 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> |
6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. |
7 * | 7 * |
8 * Redistribution and use in source and binary forms, with or without | 8 * Redistribution and use in source and binary forms, with or without |
9 * modification, are permitted provided that the following conditions | 9 * modification, are permitted provided that the following conditions |
10 * are met: | 10 * are met: |
(...skipping 3039 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3050 #if ENABLE(INSPECTOR) | 3050 #if ENABLE(INSPECTOR) |
3051 page->inspectorController()->didLoadResourceFromMemoryCache(m_documentLo
ader.get(), resource); | 3051 page->inspectorController()->didLoadResourceFromMemoryCache(m_documentLo
ader.get(), resource); |
3052 #endif | 3052 #endif |
3053 m_documentLoader->didTellClientAboutLoad(resource->url()); | 3053 m_documentLoader->didTellClientAboutLoad(resource->url()); |
3054 return; | 3054 return; |
3055 } | 3055 } |
3056 | 3056 |
3057 unsigned long identifier; | 3057 unsigned long identifier; |
3058 ResourceError error; | 3058 ResourceError error; |
3059 requestFromDelegate(request, identifier, error); | 3059 requestFromDelegate(request, identifier, error); |
| 3060 #if ENABLE(INSPECTOR) |
| 3061 page->inspectorController()->markResourceAsCached(identifier); |
| 3062 #endif |
3060 notifier()->sendRemainingDelegateMessages(m_documentLoader.get(), identifier
, resource->response(), resource->encodedSize(), error); | 3063 notifier()->sendRemainingDelegateMessages(m_documentLoader.get(), identifier
, resource->response(), resource->encodedSize(), error); |
3061 } | 3064 } |
3062 | 3065 |
3063 void FrameLoader::applyUserAgent(ResourceRequest& request) | 3066 void FrameLoader::applyUserAgent(ResourceRequest& request) |
3064 { | 3067 { |
3065 String userAgent = client()->userAgent(request.url()); | 3068 String userAgent = client()->userAgent(request.url()); |
3066 ASSERT(!userAgent.isNull()); | 3069 ASSERT(!userAgent.isNull()); |
3067 request.setHTTPUserAgent(userAgent); | 3070 request.setHTTPUserAgent(userAgent); |
3068 } | 3071 } |
3069 | 3072 |
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3522 windowRect.setHeight(features.height + (windowRect.height() - pageSize.h
eight())); | 3525 windowRect.setHeight(features.height + (windowRect.height() - pageSize.h
eight())); |
3523 page->chrome()->setWindowRect(windowRect); | 3526 page->chrome()->setWindowRect(windowRect); |
3524 | 3527 |
3525 page->chrome()->show(); | 3528 page->chrome()->show(); |
3526 | 3529 |
3527 created = true; | 3530 created = true; |
3528 return frame; | 3531 return frame; |
3529 } | 3532 } |
3530 | 3533 |
3531 } // namespace WebCore | 3534 } // namespace WebCore |
OLD | NEW |