mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Fix API changes of Chrome 53

Browse source
This commit is contained in:
Cheng Zhao 2016-09-06 17:24:37 +09:00
parent 2e0a1a8a64
commit f28e8d7168
52 changed files with 301 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

10
chromium_src/chrome/browser/media/native_desktop_media_list.cc
View file

@ -97,7 +97,8 @@ class NativeDesktopMediaList::Worker
typedef std::map<DesktopMediaID, uint32> ImageHashesMap;
// webrtc::DesktopCapturer::Callback interface.
void OnCaptureCompleted(webrtc::DesktopFrame* frame) override;
void OnCaptureResult(webrtc::DesktopCapturer::Result result,
std::unique_ptr<webrtc::DesktopFrame> frame) override;
base::WeakPtr<NativeDesktopMediaList> media_list_;
@ -217,9 +218,10 @@ void NativeDesktopMediaList::Worker::Refresh(
base::Bind(&NativeDesktopMediaList::OnRefreshFinished, media_list_));
}
void NativeDesktopMediaList::Worker::OnCaptureCompleted(
webrtc::DesktopFrame* frame) {
current_frame_.reset(frame);
void NativeDesktopMediaList::Worker::OnCaptureResult(
webrtc::DesktopCapturer::Result result,
std::unique_ptr<webrtc::DesktopFrame> frame) {
current_frame_ = std::move(frame);
}
NativeDesktopMediaList::NativeDesktopMediaList(

3
chromium_src/chrome/browser/printing/print_view_manager_base.cc
View file

@ -133,7 +133,8 @@ void PrintViewManagerBase::OnDidPrintPage(
}
}
std::unique_ptr<PdfMetafileSkia> metafile(new PdfMetafileSkia);
std::unique_ptr<PdfMetafileSkia> metafile(
new PdfMetafileSkia(PDF_SKIA_DOCUMENT_TYPE));
if (metafile_must_be_valid) {
if (!metafile->InitFromData(shared_buf.memory(), params.data_size)) {
NOTREACHED() << "Invalid metafile header";

1
chromium_src/chrome/common/chrome_paths.cc
View file

@ -17,6 +17,7 @@
#include "chrome/common/chrome_paths_internal.h"
#include "chrome/common/widevine_cdm_constants.h"
#include "third_party/widevine/cdm/stub/widevine_cdm_version.h"
#include "third_party/widevine/cdm/widevine_cdm_common.h"
#if defined(OS_ANDROID)
#include "base/android/path_utils.h"

3
chromium_src/chrome/common/widevine_cdm_constants.cc
View file

@ -7,9 +7,6 @@
#include "build/build_config.h"
#include "ppapi/shared_impl/ppapi_permissions.h"
const base::FilePath::CharType kWidevineCdmBaseDirectory[] =
FILE_PATH_LITERAL("WidevineCDM");
const char kWidevineCdmPluginExtension[] = "";
const int32_t kWidevineCdmPluginPermissions = ppapi::PERMISSION_DEV |

3
chromium_src/chrome/common/widevine_cdm_constants.h
View file

@ -8,9 +8,6 @@
#include "base/macros.h"
#include "base/files/file_path.h"
// The Widevine CDM adapter and Widevine CDM are in this directory.
extern const base::FilePath::CharType kWidevineCdmBaseDirectory[];
extern const char kWidevineCdmPluginExtension[];
// Permission bits for Widevine CDM plugin.

5
chromium_src/chrome/renderer/media/chrome_key_systems.cc
View file

@ -241,6 +241,7 @@ static void AddPepperBasedWidevine(
#endif // defined(USE_PROPRIETARY_CODECS)
}
using Robustness = cdm::WidevineKeySystemProperties::Robustness;
concrete_key_systems->emplace_back(new cdm::WidevineKeySystemProperties(
supported_codecs,
#if defined(OS_CHROMEOS)
@ -253,8 +254,8 @@ static void AddPepperBasedWidevine(
media::EmeFeatureSupport::REQUESTABLE, // Persistent state.
media::EmeFeatureSupport::REQUESTABLE)); // Distinctive identifier.
#else // (Desktop)
media::EmeRobustness::SW_SECURE_CRYPTO, // Maximum audio robustness.
media::EmeRobustness::SW_SECURE_DECODE, // Maximum video robustness.
Robustness::SW_SECURE_CRYPTO, // Maximum audio robustness.
Robustness::SW_SECURE_DECODE, // Maximum video robustness.
media::EmeSessionTypeSupport::NOT_SUPPORTED, // persistent-license.
media::EmeSessionTypeSupport::
NOT_SUPPORTED, // persistent-release-message.

4
chromium_src/chrome/renderer/pepper/pepper_flash_renderer_host.cc
View file

@ -205,8 +205,8 @@ int32_t PepperFlashRendererHost::OnDrawGlyphs(
style |= SkTypeface::kBold;
if (params.font_desc.italic)
style |= SkTypeface::kItalic;
sk_sp<SkTypeface> typeface(SkTypeface::CreateFromName(
params.font_desc.face.c_str(), static_cast<SkTypeface::Style>(style)));
sk_sp<SkTypeface> typeface(SkTypeface::MakeFromName(
params.font_desc.face.c_str(), SkFontStyle::FromOldStyle(style)));
if (!typeface)
return PP_ERROR_FAILED;

4
chromium_src/chrome/renderer/pepper/pepper_helper.cc
View file

@ -24,3 +24,7 @@ void PepperHelper::DidCreatePepperPlugin(content::RendererPpapiHost* host) {
std::unique_ptr<ppapi::host::InstanceMessageFilter>(
new PepperSharedMemoryMessageFilter(host)));
}
void PepperHelper::OnDestruct() {
delete this;
}

1
chromium_src/chrome/renderer/pepper/pepper_helper.h
View file

@ -17,6 +17,7 @@ class PepperHelper : public content::RenderFrameObserver {
// RenderFrameObserver.
void DidCreatePepperPlugin(content::RendererPpapiHost* host) override;
void OnDestruct() override;
private:
DISALLOW_COPY_AND_ASSIGN(PepperHelper);

9
chromium_src/chrome/renderer/printing/print_web_view_helper.cc
View file

@ -545,7 +545,8 @@ void PrepareFrameAndViewForPrint::CopySelection(
WebPreferences prefs = preferences;
prefs.javascript_enabled = false;
blink::WebView* web_view = blink::WebView::create(this);
blink::WebView* web_view =
blink::WebView::create(this, blink::WebPageVisibilityStateVisible);
owns_web_view_ = true;
content::RenderView::ApplyWebPreferences(prefs, web_view);
web_view->setMainFrame(
@ -662,6 +663,10 @@ bool PrintWebViewHelper::OnMessageReceived(const IPC::Message& message) {
return handled;
}
void PrintWebViewHelper::OnDestruct() {
delete this;
}
bool PrintWebViewHelper::GetPrintFrame(blink::WebLocalFrame** frame) {
DCHECK(frame);
blink::WebView* webView = render_view()->GetWebView();
@ -1266,7 +1271,7 @@ bool PrintWebViewHelper::PrintPreviewContext::CreatePreviewDocument(
return false;
}
metafile_.reset(new PdfMetafileSkia);
metafile_.reset(new PdfMetafileSkia(PDF_SKIA_DOCUMENT_TYPE));
CHECK(metafile_->Init());
current_page_index_ = 0;

6
chromium_src/chrome/renderer/printing/print_web_view_helper.h
View file

@ -92,9 +92,9 @@ class PrintWebViewHelper
};
// RenderViewObserver implementation.
virtual bool OnMessageReceived(const IPC::Message& message) override;
virtual void PrintPage(blink::WebLocalFrame* frame,
bool user_initiated) override;
bool OnMessageReceived(const IPC::Message& message) override;
void PrintPage(blink::WebLocalFrame* frame, bool user_initiated) override;
void OnDestruct() override;
// Message handlers ---------------------------------------------------------
#if !defined(DISABLE_BASIC_PRINTING)

7
chromium_src/chrome/renderer/printing/print_web_view_helper_mac.mm
View file

@ -23,7 +23,7 @@ using blink::WebFrame;
void PrintWebViewHelper::PrintPageInternal(
const PrintMsg_PrintPage_Params& params,
WebFrame* frame) {
PdfMetafileSkia metafile;
PdfMetafileSkia metafile(PDF_SKIA_DOCUMENT_TYPE);
CHECK(metafile.Init());
int page_number = params.page_number;
@ -61,7 +61,7 @@ bool PrintWebViewHelper::RenderPreviewPage(
is_print_ready_metafile_sent_;
if (render_to_draft) {
draft_metafile.reset(new PdfMetafileSkia());
draft_metafile.reset(new PdfMetafileSkia(PDF_SKIA_DOCUMENT_TYPE));
CHECK(draft_metafile->Init());
initial_render_metafile = draft_metafile.get();
}
@ -80,7 +80,8 @@ bool PrintWebViewHelper::RenderPreviewPage(
print_preview_context_.generate_draft_pages()) {
DCHECK(!draft_metafile.get());
draft_metafile =
print_preview_context_.metafile()->GetMetafileForCurrentPage();
print_preview_context_.metafile()->GetMetafileForCurrentPage(
PDF_SKIA_DOCUMENT_TYPE);
}
}
return PreviewPageRendered(page_number, draft_metafile.get());