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

Fix compilation errors on Windows

Browse source
This commit is contained in:
Cheng Zhao 2016-03-10 15:57:03 +09:00
parent 20466bad8f
commit cadd1969d9
5 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
chromium_src/chrome/browser/ui/views/color_chooser_win.cc
View file

@ -9,8 +9,10 @@
#include "chrome/browser/ui/views/color_chooser_dialog.h" #include "chrome/browser/ui/views/color_chooser_dialog.h"
#include "content/public/browser/color_chooser.h" #include "content/public/browser/color_chooser.h"
#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host.h"
#include "content/public/browser/render_widget_host.h"
#include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/render_widget_host_view.h"
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
#include "ui/aura/window.h"
#include "ui/views/color_chooser/color_chooser_listener.h" #include "ui/views/color_chooser/color_chooser_listener.h"
class ColorChooserWin : public content::ColorChooser, class ColorChooserWin : public content::ColorChooser,
@ -55,9 +57,11 @@ ColorChooserWin* ColorChooserWin::Open(content::WebContents* web_contents,
ColorChooserWin::ColorChooserWin(content::WebContents* web_contents, ColorChooserWin::ColorChooserWin(content::WebContents* web_contents,
SkColor initial_color) SkColor initial_color)
: web_contents_(web_contents) { : web_contents_(web_contents) {
gfx::NativeWindow owning_window = (gfx::NativeWindow)::GetAncestor( gfx::NativeWindow owning_window = web_contents->GetRenderViewHost()
(HWND)web_contents->GetRenderViewHost()->GetView()->GetNativeView(), ->GetWidget()
GA_ROOT); ->GetView()
->GetNativeView()
->GetToplevelWindow();
color_chooser_dialog_ = new ColorChooserDialog(this, color_chooser_dialog_ = new ColorChooserDialog(this,
initial_color, initial_color,
owning_window); owning_window);

1
chromium_src/net/test/embedded_test_server/tcp_listen_socket.cc
View file

@ -8,6 +8,7 @@
// winsock2.h must be included first in order to ensure it is included before // winsock2.h must be included first in order to ensure it is included before
// windows.h. // windows.h.
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.h>
#elif defined(OS_POSIX) #elif defined(OS_POSIX)
#include <arpa/inet.h> #include <arpa/inet.h>
#include <errno.h> #include <errno.h>

1
common.gypi
View file

@ -43,6 +43,7 @@
'target_conditions': [ 'target_conditions': [
['_target_name in ["libuv", "http_parser", "openssl", "cares", "node", "zlib"]', { ['_target_name in ["libuv", "http_parser", "openssl", "cares", "node", "zlib"]', {
'msvs_disabled_warnings': [ 'msvs_disabled_warnings': [
4003, # not enough actual parameters for macro 'V'
4013, # 'free' undefined; assuming extern returning int 4013, # 'free' undefined; assuming extern returning int
4018, # signed/unsigned mismatch 4018, # signed/unsigned mismatch
4054, # 4054, #

2
script/lib/config.py
View file

@ -8,7 +8,7 @@ import sys
BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \ BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \
'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent' 'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent'
LIBCHROMIUMCONTENT_COMMIT = 'a661ccb38f21859309cc97c1fc313f1360101462' LIBCHROMIUMCONTENT_COMMIT = '497f11bcb91d9b0b5b5cbd004411b37b933c825e'
PLATFORM = { PLATFORM = {
'cygwin': 'win32', 'cygwin': 'win32',

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit 73d5b67617e22c7d5a305d86a05ea40972683b63 Subproject commit 4a1be58208fc89a2d56cd95aed4864158890b96b