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

Fix compilation errors on OS X

Browse source
This commit is contained in:
Cheng Zhao 2016-03-08 23:28:53 +09:00
parent 4503aafe64
commit 5fae63a2f5
93 changed files with 242 additions and 317 deletions
Download patch file Download diff file Expand all files Collapse all files

2
chromium_src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h
View file

@ -5,8 +5,6 @@
#ifndef CHROME_RENDERER_PEPPER_CHROME_RENDERER_PEPPER_HOST_FACTORY_H_
#define CHROME_RENDERER_PEPPER_CHROME_RENDERER_PEPPER_HOST_FACTORY_H_
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "ppapi/host/host_factory.h"
namespace content {

2
chromium_src/chrome/renderer/pepper/pepper_flash_font_file_host.h
View file

@ -5,8 +5,6 @@
#ifndef CHROME_RENDERER_PEPPER_PEPPER_FLASH_FONT_FILE_HOST_H_
#define CHROME_RENDERER_PEPPER_PEPPER_FLASH_FONT_FILE_HOST_H_
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "ppapi/c/private/pp_private_font_charset.h"
#include "ppapi/host/resource_host.h"

2
chromium_src/chrome/renderer/pepper/pepper_flash_fullscreen_host.h
View file

@ -5,8 +5,6 @@
#ifndef CHROME_RENDERER_PEPPER_PEPPER_FLASH_FULLSCREEN_HOST_H_
#define CHROME_RENDERER_PEPPER_PEPPER_FLASH_FULLSCREEN_HOST_H_
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "ppapi/host/resource_host.h"
namespace content {

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

@ -8,7 +8,6 @@
#include <string>
#include <vector>
#include "base/basictypes.h"
#include "base/memory/weak_ptr.h"
#include "ppapi/host/host_message_context.h"
#include "ppapi/host/resource_host.h"

5
chromium_src/chrome/renderer/pepper/pepper_shared_memory_message_filter.cc
View file

@ -43,9 +43,8 @@ void PepperSharedMemoryMessageFilter::OnHostMsgCreateSharedMemory(
ppapi::proxy::SerializedHandle* plugin_handle) {
plugin_handle->set_null_shmem();
*host_handle_id = -1;
scoped_ptr<base::SharedMemory> shm(content::RenderThread::Get()
->HostAllocateSharedMemoryBuffer(size)
.Pass());
scoped_ptr<base::SharedMemory> shm(
content::RenderThread::Get()->HostAllocateSharedMemoryBuffer(size));
if (!shm.get())
return;

2
chromium_src/chrome/renderer/pepper/pepper_shared_memory_message_filter.h
View file

@ -5,8 +5,6 @@
#ifndef CHROME_RENDERER_PEPPER_PEPPER_SHARED_MEMORY_MESSAGE_FILTER_H_
#define CHROME_RENDERER_PEPPER_PEPPER_SHARED_MEMORY_MESSAGE_FILTER_H_
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "ppapi/c/pp_instance.h"
#include "ppapi/host/instance_message_filter.h"

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

@ -415,22 +415,19 @@ class PrepareFrameAndViewForPrint : public blink::WebViewClient,
return owns_web_view_ && frame() && frame()->isLoading();
}
// TODO(ojan): Remove this override and have this class use a non-null
// layerTreeView.
// blink::WebViewClient override:
virtual bool allowsBrokenNullLayerTreeView() const;
protected:
// blink::WebViewClient override:
virtual void didStopLoading();
void didStopLoading() override;
bool allowsBrokenNullLayerTreeView() const override;
// blink::WebFrameClient override:
virtual blink::WebFrame* createChildFrame(
// blink::WebFrameClient:
blink::WebFrame* createChildFrame(
blink::WebLocalFrame* parent,
blink::WebTreeScopeType scope,
const blink::WebString& name,
blink::WebSandboxFlags sandboxFlags);
virtual void frameDetached(blink::WebFrame* frame, DetachType type);
blink::WebSandboxFlags sandboxFlags,
const blink::WebFrameOwnerProperties& frameOwnerProperties) override;
void frameDetached(blink::WebFrame* frame, DetachType type) override;
private:
void CallOnReady();
@ -576,7 +573,8 @@ blink::WebFrame* PrepareFrameAndViewForPrint::createChildFrame(
blink::WebLocalFrame* parent,
blink::WebTreeScopeType scope,
const blink::WebString& name,
blink::WebSandboxFlags sandboxFlags) {
blink::WebSandboxFlags sandboxFlags,
const blink::WebFrameOwnerProperties& frameOwnerProperties) {
blink::WebFrame* frame = blink::WebLocalFrame::create(scope, this);
parent->appendChild(frame);
return frame;
@ -814,7 +812,7 @@ bool PrintWebViewHelper::FinalizePrintReadyDocument() {
// Get the size of the resulting metafile.
PdfMetafileSkia* metafile = print_preview_context_.metafile();
uint32 buf_size = metafile->GetDataSize();
uint32_t buf_size = metafile->GetDataSize();
DCHECK_GT(buf_size, 0u);
PrintHostMsg_DidPreviewDocument_Params preview_params;
@ -1164,7 +1162,7 @@ bool PrintWebViewHelper::RenderPagesForPrint(blink::WebLocalFrame* frame,
bool PrintWebViewHelper::CopyMetafileDataToSharedMem(
PdfMetafileSkia* metafile,
base::SharedMemoryHandle* shared_mem_handle) {
uint32 buf_size = metafile->GetDataSize();
uint32_t buf_size = metafile->GetDataSize();
scoped_ptr<base::SharedMemory> shared_buf(
content::RenderThread::Get()->HostAllocateSharedMemoryBuffer(
buf_size).release());

2
chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc
View file

@ -92,7 +92,7 @@ bool PrintWebViewHelper::PrintPagesNative(blink::WebFrame* frame,
metafile.FinishDocument();
// Get the size of the resulting metafile.
uint32 buf_size = metafile.GetDataSize();
uint32_t buf_size = metafile.GetDataSize();
DCHECK_GT(buf_size, 0u);
#if defined(OS_CHROMEOS) || defined(OS_ANDROID)

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

@ -116,15 +116,13 @@ void PrintWebViewHelper::RenderPage(const PrintMsg_Print_Params& params,
gfx::Rect canvas_area = content_area;
{
skia::PlatformCanvas* canvas = metafile->GetVectorCanvasForNewPage(
SkCanvas* canvas = metafile->GetVectorCanvasForNewPage(
*page_size, canvas_area, scale_factor);
if (!canvas)
return;
MetafileSkiaWrapper::SetMetafileOnCanvas(*canvas, metafile);
skia::SetIsDraftMode(*canvas, is_print_ready_metafile_sent_);
skia::SetIsPreviewMetafile(*canvas, is_preview);
RenderPageContent(frame, page_number, canvas_area, content_area,
scale_factor, static_cast<blink::WebCanvas*>(canvas));
}

4
chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc
View file

@ -96,7 +96,7 @@ bool PrintWebViewHelper::PrintPagesNative(blink::WebFrame* frame,
metafile.FinishDocument();
// Get the size of the resulting metafile.
uint32 buf_size = metafile.GetDataSize();
uint32_t buf_size = metafile.GetDataSize();
DCHECK_GT(buf_size, 0u);
PrintHostMsg_DidPrintPage_Params printed_page_params;
@ -218,7 +218,7 @@ void PrintWebViewHelper::PrintPageInternal(
bool PrintWebViewHelper::CopyMetafileDataToSharedMem(
PdfMetafileSkia* metafile,
base::SharedMemoryHandle* shared_mem_handle) {
uint32 buf_size = metafile->GetDataSize();
uint32_t buf_size = metafile->GetDataSize();
base::SharedMemory shared_buf;
// Allocate a shared memory buffer to hold the generated metafile data.
if (!shared_buf.CreateAndMapAnonymous(buf_size)) {

3
chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.cc
View file

@ -9,7 +9,6 @@
#include <map>
#include <string>
#include "base/basictypes.h"
#include "base/i18n/break_iterator.h"
#include "base/logging.h"
#include "base/strings/stringprintf.h"
@ -332,7 +331,7 @@ bool SpellcheckWordIterator::Initialize(
NOTREACHED() << "failed to open iterator (broken rules)";
return false;
}
iterator_ = iterator.Pass();
iterator_ = std::move(iterator);
// Set the character attributes so we can normalize the words extracted by
// this iterator.

2
chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.h
View file

@ -11,7 +11,7 @@
#include <string>
#include "base/basictypes.h"
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/strings/string16.h"
#include "third_party/icu/source/common/unicode/uscript.h"

3
chromium_src/chrome/renderer/tts_dispatcher.cc
View file

@ -4,7 +4,6 @@
#include "chrome/renderer/tts_dispatcher.h"
#include "base/basictypes.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/common/tts_messages.h"
#include "chrome/common/tts_utterance_request.h"
@ -197,4 +196,4 @@ void TtsDispatcher::OnSpeakingErrorOccurred(int utterance_id,
// The web speech API doesn't support an error message.
synthesizer_client_->speakingErrorOccurred(utterance);
utterance_id_map_.erase(utterance_id);
}
}

4
chromium_src/chrome/renderer/tts_dispatcher.h
View file

@ -7,8 +7,6 @@
#include <vector>
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/containers/hash_tables.h"
#include "content/public/renderer/render_process_observer.h"
#include "third_party/WebKit/public/platform/WebSpeechSynthesizer.h"
@ -75,4 +73,4 @@ class TtsDispatcher
DISALLOW_COPY_AND_ASSIGN(TtsDispatcher);
};
#endif // CHROME_RENDERER_TTS_DISPATCHER_H_
#endif // CHROME_RENDERER_TTS_DISPATCHER_H_