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

Minimum fixes needed for chromium_src

Browse source
This commit is contained in:
Brian R. Bondy 2016-04-29 09:15:04 -04:00 • committed by Cheng Zhao
parent 02d72c81af
commit ce7c1023d5
10 changed files with 28 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
chromium_src/chrome/browser/printing/printing_message_filter.cc
View file

@ -71,10 +71,6 @@ void RenderParamsFromPrintSettings(const PrintSettings& settings,
params->margin_top = settings.page_setup_device_units().content_area().y();
params->margin_left = settings.page_setup_device_units().content_area().x();
params->dpi = settings.dpi();
// Currently hardcoded at 1.25. See PrintSettings' constructor.
params->min_shrink = settings.min_shrink();
// Currently hardcoded at 2.0. See PrintSettings' constructor.
params->max_shrink = settings.max_shrink();
// Currently hardcoded at 72dpi. See PrintSettings' constructor.
params->desired_dpi = settings.desired_dpi();
// Always use an invalid cookie.

2
chromium_src/chrome/browser/process_singleton_posix.cc
View file

@ -79,7 +79,7 @@
#include "base/time/time.h"
#include "base/timer/timer.h"
#include "content/public/browser/browser_thread.h"
#include "net/base/net_util.h"
#include "net/base/network_interfaces.h"
#include "ui/base/l10n/l10n_util.h"
#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS)

10
chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc
View file

@ -4,6 +4,8 @@
#include "chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h"
#include <stddef.h>
#include "base/pickle.h"
#include "base/strings/utf_string_conversions.h"
#include "content/public/browser/browser_thread.h"
@ -48,10 +50,10 @@ ui::ClipboardType ConvertClipboardType(uint32_t type) {
// clipboard interface for custom data.
bool JumpToFormatInPickle(const base::string16& format,
base::PickleIterator* iter) {
size_t size = 0;
if (!iter->ReadSizeT(&size))
uint32_t size = 0;
if (!iter->ReadUInt32(&size))
return false;
for (size_t i = 0; i < size; ++i) {
for (uint32_t i = 0; i < size; ++i) {
base::string16 stored_format;
if (!iter->ReadString16(&stored_format))
return false;
@ -83,7 +85,7 @@ std::string ReadDataFromPickle(const base::string16& format,
bool WriteDataToPickle(const std::map<base::string16, std::string>& data,
base::Pickle* pickle) {
pickle->WriteSizeT(data.size());
pickle->WriteUInt32(data.size());
for (std::map<base::string16, std::string>::const_iterator it = data.begin();
it != data.end();
++it) {

2
chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc
View file

@ -21,7 +21,7 @@
#include "content/public/browser/child_process_security_policy.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/common/pepper_plugin_info.h"
#include "net/base/net_util.h"
#include "net/base/network_interfaces.h"
#include "ppapi/c/pp_errors.h"
#include "ppapi/host/dispatch_host_message.h"
#include "ppapi/host/host_message_context.h"