Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Side by Side Diff: Source/core/page/PageSerializer.cpp

Issue 336553003: Change Page::m_mainFrame to be a Frame. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/page/PageAnimator.cpp ('k') | Source/core/page/ScopedPageLoadDeferrer.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 } 174 }
175 175
176 PageSerializer::PageSerializer(Vector<SerializedResource>* resources) 176 PageSerializer::PageSerializer(Vector<SerializedResource>* resources)
177 : m_resources(resources) 177 : m_resources(resources)
178 , m_blankFrameCounter(0) 178 , m_blankFrameCounter(0)
179 { 179 {
180 } 180 }
181 181
182 void PageSerializer::serialize(Page* page) 182 void PageSerializer::serialize(Page* page)
183 { 183 {
184 serializeFrame(page->mainFrame()); 184 serializeFrame(page->deprecatedLocalMainFrame());
185 } 185 }
186 186
187 void PageSerializer::serializeFrame(LocalFrame* frame) 187 void PageSerializer::serializeFrame(LocalFrame* frame)
188 { 188 {
189 ASSERT(frame->document()); 189 ASSERT(frame->document());
190 Document& document = *frame->document(); 190 Document& document = *frame->document();
191 KURL url = document.url(); 191 KURL url = document.url();
192 // FIXME: This probably wants isAboutBlankURL? to exclude other about: urls (like about:srcdoc)? 192 // FIXME: This probably wants isAboutBlankURL? to exclude other about: urls (like about:srcdoc)?
193 if (!url.isValid() || url.protocolIsAbout()) { 193 if (!url.isValid() || url.protocolIsAbout()) {
194 // For blank frames we generate a fake URL so they can be referenced by their containing frame. 194 // For blank frames we generate a fake URL so they can be referenced by their containing frame.
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 if (iter != m_blankFrameURLs.end()) 384 if (iter != m_blankFrameURLs.end())
385 return iter->value; 385 return iter->value;
386 String url = "wyciwyg://frame/" + String::number(m_blankFrameCounter++); 386 String url = "wyciwyg://frame/" + String::number(m_blankFrameCounter++);
387 KURL fakeURL(ParsedURLString, url); 387 KURL fakeURL(ParsedURLString, url);
388 m_blankFrameURLs.add(frame, fakeURL); 388 m_blankFrameURLs.add(frame, fakeURL);
389 389
390 return fakeURL; 390 return fakeURL;
391 } 391 }
392 392
393 } 393 }
OLDNEW
« no previous file with comments | « Source/core/page/PageAnimator.cpp ('k') | Source/core/page/ScopedPageLoadDeferrer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698