bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 5fdc0fab (#520840)

Browse Source 
- Windows now builds with clang by default.
This commit is contained in:
Marshall Greenblatt
2017-12-07 16:44:24 -05:00
parent d5e141648b
commit 8d51acb9be
153 changed files with 2189 additions and 3387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
patch/patches/webkit_plugin_info_2015.patch
View File

@@ -1,11 +1,11 @@
diff --git third_party/WebKit/Source/core/dom/DOMImplementation.cpp third_party/WebKit/Source/core/dom/DOMImplementation.cpp
index b26a7d6b8413..476b5c138555 100644
index 1d861b036458..3b20c991659b 100644
--- third_party/WebKit/Source/core/dom/DOMImplementation.cpp
+++ third_party/WebKit/Source/core/dom/DOMImplementation.cpp
@@ -242,10 +242,11 @@ Document* DOMImplementation::createDocument(const String& type,
// For that reason, the origin must be retrieved directly from init.url().
if (init.GetFrame()->IsMainFrame()) {
RefPtr<SecurityOrigin> origin = SecurityOrigin::Create(init.Url());
scoped_refptr<SecurityOrigin> origin = SecurityOrigin::Create(init.Url());
- plugin_data = init.GetFrame()->GetPage()->GetPluginData(origin.get());
+ plugin_data = init.GetFrame()->GetPage()->GetPluginData(true,
+ origin.get());
@@ -17,10 +17,10 @@ index b26a7d6b8413..476b5c138555 100644
.Top()
.GetSecurityContext()
diff --git third_party/WebKit/Source/core/frame/LocalFrame.cpp third_party/WebKit/Source/core/frame/LocalFrame.cpp
index bf29beabedf7..e45901940d91 100644
index 123258b23cb2..f00869df94e3 100644
--- third_party/WebKit/Source/core/frame/LocalFrame.cpp
+++ third_party/WebKit/Source/core/frame/LocalFrame.cpp
@@ -1026,7 +1026,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
@@ -1046,7 +1046,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
PluginData* LocalFrame::GetPluginData() const {
if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin))
return nullptr;
@@ -30,10 +30,10 @@ index bf29beabedf7..e45901940d91 100644
}
diff --git third_party/WebKit/Source/core/page/Page.cpp third_party/WebKit/Source/core/page/Page.cpp
index 769fb58698a4..5372984b342a 100644
index c6071e8ba68e..4304cc95ba2e 100644
--- third_party/WebKit/Source/core/page/Page.cpp
+++ third_party/WebKit/Source/core/page/Page.cpp
@@ -126,7 +126,8 @@ Page::Page(PageClients& page_clients)
@@ -129,7 +129,8 @@ Page::Page(PageClients& page_clients)
overscroll_controller_(
OverscrollController::Create(GetVisualViewport(), GetChromeClient())),
main_frame_(nullptr),
@@ -41,9 +41,9 @@ index 769fb58698a4..5372984b342a 100644
+ plugin_data_main_frame_(nullptr),
+ plugin_data_sub_frame_(nullptr),
editor_client_(page_clients.editor_client),
spell_checker_client_(page_clients.spell_checker_client),
use_counter_(page_clients.chrome_client &&
@@ -300,21 +301,38 @@ void Page::RefreshPlugins() {
page_clients.chrome_client->IsSVGImageChromeClient()
@@ -303,21 +304,38 @@ void Page::RefreshPlugins() {
PluginData::RefreshBrowserSidePluginCache();
}
@@ -91,7 +91,7 @@ index 769fb58698a4..5372984b342a 100644
page->NotifyPluginsChanged();
}
}
@@ -661,7 +679,8 @@ DEFINE_TRACE(Page) {
@@ -675,7 +693,8 @@ void Page::Trace(blink::Visitor* visitor) {
visitor->Trace(visual_viewport_);
visitor->Trace(overscroll_controller_);
visitor->Trace(main_frame_);
@@ -102,7 +102,7 @@ index 769fb58698a4..5372984b342a 100644
visitor->Trace(use_counter_);
visitor->Trace(plugins_changed_observers_);
diff --git third_party/WebKit/Source/core/page/Page.h third_party/WebKit/Source/core/page/Page.h
index 0ba364b0a934..e9b79de58841 100644
index 1a02eb31d52a..d7d2c372f0c9 100644
--- third_party/WebKit/Source/core/page/Page.h
+++ third_party/WebKit/Source/core/page/Page.h
@@ -135,7 +135,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
@@ -115,7 +115,7 @@ index 0ba364b0a934..e9b79de58841 100644
// Refreshes the browser-side plugin cache.
static void RefreshPlugins();
@@ -351,7 +352,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
@@ -361,7 +362,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
// longer needed.
Member<Frame> main_frame_;
@@ -124,12 +124,12 @@ index 0ba364b0a934..e9b79de58841 100644
+ Member<PluginData> plugin_data_sub_frame_;
EditorClient* const editor_client_;
SpellCheckerClient* const spell_checker_client_;
SpellCheckStatus spell_check_status_ = SpellCheckStatus::kAutomatic;
diff --git third_party/WebKit/Source/platform/plugins/PluginData.cpp third_party/WebKit/Source/platform/plugins/PluginData.cpp
index 5eb6af5fbdd5..eac85461c7de 100644
index 385972d2e150..88a8e018b2e2 100644
--- third_party/WebKit/Source/platform/plugins/PluginData.cpp
+++ third_party/WebKit/Source/platform/plugins/PluginData.cpp
@@ -79,16 +79,18 @@ DEFINE_TRACE(PluginData) {
@@ -79,16 +79,18 @@ void PluginData::Trace(blink::Visitor* visitor) {
// static
void PluginData::RefreshBrowserSidePluginCache() {
PluginListBuilder builder(nullptr);
@@ -152,10 +152,10 @@ index 5eb6af5fbdd5..eac85461c7de 100644
for (PluginInfo* plugin_info : plugins_) {
for (MimeClassInfo* mime_class_info : plugin_info->mimes_)
diff --git third_party/WebKit/Source/platform/plugins/PluginData.h third_party/WebKit/Source/platform/plugins/PluginData.h
index 14a944467373..f4333c6a5f09 100644
index c2bdba557a6b..039446cef015 100644
--- third_party/WebKit/Source/platform/plugins/PluginData.h
+++ third_party/WebKit/Source/platform/plugins/PluginData.h
@@ -94,7 +94,7 @@ class PLATFORM_EXPORT PluginData final
@@ -95,7 +95,7 @@ class PLATFORM_EXPORT PluginData final
const HeapVector<Member<PluginInfo>>& Plugins() const { return plugins_; }
const HeapVector<Member<MimeClassInfo>>& Mimes() const { return mimes_; }
const SecurityOrigin* Origin() const { return main_frame_origin_.get(); }
@@ -165,10 +165,10 @@ index 14a944467373..f4333c6a5f09 100644
bool SupportsMimeType(const String& mime_type) const;
diff --git third_party/WebKit/public/platform/Platform.h third_party/WebKit/public/platform/Platform.h
index 379b033facc4..fcea4c7171b7 100644
index 09c2e1516512..00f634a16dc5 100644
--- third_party/WebKit/public/platform/Platform.h
+++ third_party/WebKit/public/platform/Platform.h
@@ -369,6 +369,7 @@ class BLINK_PLATFORM_EXPORT Platform {
@@ -377,6 +377,7 @@ class BLINK_PLATFORM_EXPORT Platform {
// satisfy this call. mainFrameOrigin is used by the browser process to
// filter plugins from the plugin list based on content settings.
virtual void GetPluginList(bool refresh,