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

Side by Side Diff: Source/WebCore/loader/Prerenderer.cpp

Issue 10824152: Merge 123798 - Guard Prerenderer against inserting prerenders into detached documents. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/
Patch Set: Created 8 years, 4 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
« no previous file with comments | « Source/WebCore/ChangeLog ('k') | no next file » | 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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 65
66 Prerenderer::~Prerenderer() 66 Prerenderer::~Prerenderer()
67 { 67 {
68 } 68 }
69 69
70 PassRefPtr<PrerenderHandle> Prerenderer::render(const KURL& url) 70 PassRefPtr<PrerenderHandle> Prerenderer::render(const KURL& url)
71 { 71 {
72 // Prerenders are unlike requests in most ways (for instance, they pass down fragments, and they don't return data), 72 // Prerenders are unlike requests in most ways (for instance, they pass down fragments, and they don't return data),
73 // but they do have referrers. 73 // but they do have referrers.
74 const ReferrerPolicy referrerPolicy = document()->referrerPolicy(); 74 const ReferrerPolicy referrerPolicy = document()->referrerPolicy();
75
76 if (!document()->frame())
77 return 0;
78
75 const String referrer = SecurityPolicy::generateReferrerHeader(referrerPolic y, url, document()->frame()->loader()->outgoingReferrer()); 79 const String referrer = SecurityPolicy::generateReferrerHeader(referrerPolic y, url, document()->frame()->loader()->outgoingReferrer());
76 80
77 RefPtr<PrerenderHandle> prerenderHandle = PrerenderHandle::create(url, refer rer, referrerPolicy); 81 RefPtr<PrerenderHandle> prerenderHandle = PrerenderHandle::create(url, refer rer, referrerPolicy);
78 82
79 client()->willAddPrerender(prerenderHandle.get()); 83 client()->willAddPrerender(prerenderHandle.get());
80 prerenderHandle->add(); 84 prerenderHandle->add();
81 85
82 m_activeHandles.append(prerenderHandle); 86 m_activeHandles.append(prerenderHandle);
83 return prerenderHandle; 87 return prerenderHandle;
84 } 88 }
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 PrerendererClient* Prerenderer::client() 132 PrerendererClient* Prerenderer::client()
129 { 133 {
130 if (!m_client) 134 if (!m_client)
131 m_client = PrerendererClient::from(document()->page()); 135 m_client = PrerendererClient::from(document()->page());
132 return m_client; 136 return m_client;
133 } 137 }
134 138
135 } 139 }
136 140
137 #endif // ENABLE(LINK_PRERENDER) 141 #endif // ENABLE(LINK_PRERENDER)
OLDNEW
« no previous file with comments | « Source/WebCore/ChangeLog ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698