[HBD] Remove PluginCache and reload plugin list when origin changes

third_party/WebKit/Source/core/page/Page.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All Rights Reserved.
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 36 matching lines @@
 #include "core/page/FocusController.h"
 #include "core/page/PointerLockController.h"
 #include "core/page/ScopedPageLoadDeferrer.h"
 #include "core/page/ValidationMessageClient.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
 #include "core/paint/PaintLayer.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/plugins/PluginData.h"
 #include "platform/text/CompressibleString.h"
 #include "public/platform/Platform.h"
+#include "public/platform/WebSecurityOrigin.h"
 
 namespace blink {
 
 // Set of all live pages; includes internal Page objects that are
 // not observable from scripts.
 static Page::PageSet& allPages()
 {
     DEFINE_STATIC_LOCAL(Page::PageSet, allPages, ());
     return allPages;
 }
@@ skipping 169 matching lines @@
 
     PluginData::refresh();
 
     for (const Page* page : allPages()) {
         // Clear out the page's plugin data.
         if (page->m_pluginData)
             page->m_pluginData = nullptr;
     }
 }
 
-PluginData* Page::pluginData() const
+PluginData* Page::pluginData()
 {
-    if (!m_pluginData)
-        m_pluginData = PluginData::create(this);
+    SecurityContext* context = mainFrame()->securityContext();
+    RefPtr<SecurityOrigin> origin = context ? context->getSecurityOrigin() : SecurityOrigin::createUnique().get();

[tommycli, 2016/08/01 23:44:09]

Add comment that context can be null in tests?

[trizzofo, 2016/08/02 02:36:11]

Done.

+    WebSecurityOrigin webOrigin(origin.get());
+
+    if (!m_pluginData || !origin->isSameSchemeHostPort(m_origin.get()))
+        m_pluginData = PluginData::create(&webOrigin);
+    m_origin = origin;

[tommycli, 2016/08/01 23:44:09]

Can we move this inside the conditional also? I think we only want to replace
the stored origin pointer when we also replace the m_pluginData.

[trizzofo, 2016/08/02 02:36:11]

I thought about updating it every time because, even though the origin may stay
the same, the SecurityOrigin instance changes with every navigation. So updating
it would make sure that the RefPtr is always pointing to the most recent
SecurityOrigin

     return m_pluginData.get();
 }
 
 void Page::setValidationMessageClient(ValidationMessageClient* client)
 {
     m_validationMessageClient = client;
 }
 
 void Page::setDefersLoading(bool defers)
 {
@@ skipping 291 matching lines @@
 {
 }
 
 Page::PageClients::~PageClients()
 {
 }
 
 template class CORE_TEMPLATE_EXPORT Supplement<Page>;
 
 } // namespace blink