| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2009 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 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
| 8 * are met: | 8 * are met: |
| 9 * | 9 * |
| 10 * 1. Redistributions of source code must retain the above copyright | 10 * 1. Redistributions of source code must retain the above copyright |
| (...skipping 4640 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4651 case FrameLoadTypeStandard: | 4651 case FrameLoadTypeStandard: |
| 4652 case FrameLoadTypeRedirectWithLockedBackForwardList: | 4652 case FrameLoadTypeRedirectWithLockedBackForwardList: |
| 4653 break; | 4653 break; |
| 4654 case FrameLoadTypeSame: | 4654 case FrameLoadTypeSame: |
| 4655 default: | 4655 default: |
| 4656 ASSERT_NOT_REACHED(); | 4656 ASSERT_NOT_REACHED(); |
| 4657 } | 4657 } |
| 4658 | 4658 |
| 4659 action = NavigationAction(itemOriginalURL, loadType, false); | 4659 action = NavigationAction(itemOriginalURL, loadType, false); |
| 4660 } | 4660 } |
| 4661 |
| 4662 const HTTPHeaderMap& headerMap = item->httpHeaderFields(); |
| 4663 if (headerMap.size() > 0) { |
| 4664 HTTPHeaderMap::const_iterator it = headerMap.begin(); |
| 4665 for (; it != headerMap.end(); ++it) |
| 4666 request.addHTTPHeaderField(it->first, it->second); |
| 4667 } |
| 4661 | 4668 |
| 4662 if (!addedExtraFields) | 4669 if (!addedExtraFields) |
| 4663 addExtraFieldsToRequest(request, m_loadType, true, formData); | 4670 addExtraFieldsToRequest(request, m_loadType, true, formData); |
| 4664 | 4671 |
| 4665 loadWithNavigationAction(request, action, false, loadType, 0); | 4672 loadWithNavigationAction(request, action, false, loadType, 0); |
| 4666 } | 4673 } |
| 4667 } | 4674 } |
| 4668 } | 4675 } |
| 4669 | 4676 |
| 4670 // Walk the frame tree and ensure that the URLs match the URLs in the item. | 4677 // Walk the frame tree and ensure that the URLs match the URLs in the item. |
| (...skipping 650 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5321 m_client->dispatchDidLoadResourceFromMemoryCache(m_documentLoader.get(),
request, resource->response(), resource->encodedSize()); | 5328 m_client->dispatchDidLoadResourceFromMemoryCache(m_documentLoader.get(),
request, resource->response(), resource->encodedSize()); |
| 5322 } | 5329 } |
| 5323 } | 5330 } |
| 5324 | 5331 |
| 5325 bool FrameLoaderClient::hasHTMLView() const | 5332 bool FrameLoaderClient::hasHTMLView() const |
| 5326 { | 5333 { |
| 5327 return true; | 5334 return true; |
| 5328 } | 5335 } |
| 5329 | 5336 |
| 5330 } // namespace WebCore | 5337 } // namespace WebCore |
| OLD | NEW |