| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 for (unsigned i = 0; i < m_childFrames.size(); ++i) | 193 for (unsigned i = 0; i < m_childFrames.size(); ++i) |
| 194 frame->tree()->removeChild(m_childFrames[i]->view()->frame()); | 194 frame->tree()->removeChild(m_childFrames[i]->view()->frame()); |
| 195 | 195 |
| 196 if (!m_isMainFrame) | 196 if (!m_isMainFrame) |
| 197 frame->page()->decrementSubframeCount(); | 197 frame->page()->decrementSubframeCount(); |
| 198 | 198 |
| 199 frame->loader()->client()->didSaveToPageCache(); | 199 frame->loader()->client()->didSaveToPageCache(); |
| 200 | 200 |
| 201 #ifndef NDEBUG | 201 #ifndef NDEBUG |
| 202 if (m_isMainFrame) | 202 if (m_isMainFrame) |
| 203 LOG(PageCache, "Finished creating CachedFrame for main frame url '%s' an
d DocumentLoader %p\n", m_url.string().utf8().data(), m_documentLoader.get()); | 203 LOG_INFO(PageCache, "Finished creating CachedFrame for main frame url '%
s' and DocumentLoader %p\n", m_url.string().utf8().data(), m_documentLoader.get(
)); |
| 204 else | 204 else |
| 205 LOG(PageCache, "Finished creating CachedFrame for child frame with url '
%s' and DocumentLoader %p\n", m_url.string().utf8().data(), m_documentLoader.get
()); | 205 LOG_INFO(PageCache, "Finished creating CachedFrame for child frame with
url '%s' and DocumentLoader %p\n", m_url.string().utf8().data(), m_documentLoade
r.get()); |
| 206 #endif | 206 #endif |
| 207 | 207 |
| 208 } | 208 } |
| 209 | 209 |
| 210 void CachedFrame::open() | 210 void CachedFrame::open() |
| 211 { | 211 { |
| 212 ASSERT(m_view); | 212 ASSERT(m_view); |
| 213 m_view->frame()->loader()->open(*this); | 213 m_view->frame()->loader()->open(*this); |
| 214 | 214 |
| 215 if (!m_isMainFrame) | 215 if (!m_isMainFrame) |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 291 int CachedFrame::descendantFrameCount() const | 291 int CachedFrame::descendantFrameCount() const |
| 292 { | 292 { |
| 293 int count = m_childFrames.size(); | 293 int count = m_childFrames.size(); |
| 294 for (size_t i = 0; i < m_childFrames.size(); ++i) | 294 for (size_t i = 0; i < m_childFrames.size(); ++i) |
| 295 count += m_childFrames[i]->descendantFrameCount(); | 295 count += m_childFrames[i]->descendantFrameCount(); |
| 296 | 296 |
| 297 return count; | 297 return count; |
| 298 } | 298 } |
| 299 | 299 |
| 300 } // namespace WebCore | 300 } // namespace WebCore |
| OLD | NEW |