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

Side by Side Diff: third_party/WebKit/Source/core/page/Page.cpp

Issue 1990343002: Fix navigator.plugins and navigator.mimeTypes for OOPIFs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 7 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All R ights Reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All R ights Reserved.
3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 251
252 for (const Page* page : allPages()) { 252 for (const Page* page : allPages()) {
253 // Clear out the page's plugin data. 253 // Clear out the page's plugin data.
254 if (page->m_pluginData) 254 if (page->m_pluginData)
255 page->m_pluginData = nullptr; 255 page->m_pluginData = nullptr;
256 } 256 }
257 } 257 }
258 258
259 PluginData* Page::pluginData() const 259 PluginData* Page::pluginData() const
260 { 260 {
261 if (!mainFrame()->isLocalFrame()
262 || !deprecatedLocalMainFrame()->loader().allowPlugins(NotAboutToInstanti atePlugin))
alexmos 2016/05/19 18:21:56 AFAICT, the places which called this didn't rely o
263 return nullptr;
264 if (!m_pluginData) 261 if (!m_pluginData)
265 m_pluginData = PluginData::create(this); 262 m_pluginData = PluginData::create(this);
266 return m_pluginData.get(); 263 return m_pluginData.get();
Nate Chapin 2016/05/19 19:44:40 Semi-tangential: What are the rules on what goes o
dcheng 2016/05/19 20:04:37 At one point, I believe the plan for FrameHost was
alexmos 2016/05/19 22:23:27 Yeah, I think the best cleanup for this is actuall
267 } 264 }
268 265
269 void Page::unmarkAllTextMatches() 266 void Page::unmarkAllTextMatches()
270 { 267 {
271 if (!mainFrame()) 268 if (!mainFrame())
272 return; 269 return;
273 270
274 Frame* frame = mainFrame(); 271 Frame* frame = mainFrame();
275 do { 272 do {
276 if (frame->isLocalFrame()) 273 if (frame->isLocalFrame())
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
576 { 573 {
577 } 574 }
578 575
579 Page::PageClients::~PageClients() 576 Page::PageClients::~PageClients()
580 { 577 {
581 } 578 }
582 579
583 template class CORE_TEMPLATE_EXPORT Supplement<Page>; 580 template class CORE_TEMPLATE_EXPORT Supplement<Page>;
584 581
585 } // namespace blink 582 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698