| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2011 Google Inc. All rights reserved. | 3 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 time_of_last_data_received_(0.0), | 110 time_of_last_data_received_(0.0), |
| 111 application_cache_host_(ApplicationCacheHost::Create(this)), | 111 application_cache_host_(ApplicationCacheHost::Create(this)), |
| 112 was_blocked_after_csp_(false), | 112 was_blocked_after_csp_(false), |
| 113 state_(kNotStarted), | 113 state_(kNotStarted), |
| 114 in_data_received_(false), | 114 in_data_received_(false), |
| 115 data_buffer_(SharedBuffer::Create()) { | 115 data_buffer_(SharedBuffer::Create()) { |
| 116 DCHECK(frame_); | 116 DCHECK(frame_); |
| 117 | 117 |
| 118 // The document URL needs to be added to the head of the list as that is | 118 // The document URL needs to be added to the head of the list as that is |
| 119 // where the redirects originated. | 119 // where the redirects originated. |
| 120 // hello world |
| 120 if (is_client_redirect_) | 121 if (is_client_redirect_) |
| 121 AppendRedirect(frame_->GetDocument()->Url()); | 122 AppendRedirect(frame_->GetDocument()->Url()); |
| 122 } | 123 } |
| 123 | 124 |
| 124 FrameLoader& DocumentLoader::GetFrameLoader() const { | 125 FrameLoader& DocumentLoader::GetFrameLoader() const { |
| 125 DCHECK(frame_); | 126 DCHECK(frame_); |
| 126 return frame_->Loader(); | 127 return frame_->Loader(); |
| 127 } | 128 } |
| 128 | 129 |
| 129 LocalFrameClient& DocumentLoader::GetLocalFrameClient() const { | 130 LocalFrameClient& DocumentLoader::GetLocalFrameClient() const { |
| (...skipping 978 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1108 InstallNewDocumentReason::kJavascriptURL, | 1109 InstallNewDocumentReason::kJavascriptURL, |
| 1109 kForceSynchronousParsing, KURL()); | 1110 kForceSynchronousParsing, KURL()); |
| 1110 if (!source.IsNull()) | 1111 if (!source.IsNull()) |
| 1111 writer_->AppendReplacingData(source); | 1112 writer_->AppendReplacingData(source); |
| 1112 EndWriting(); | 1113 EndWriting(); |
| 1113 } | 1114 } |
| 1114 | 1115 |
| 1115 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader); | 1116 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader); |
| 1116 | 1117 |
| 1117 } // namespace blink | 1118 } // namespace blink |
| OLD | NEW |