Commit be9a7488 authored by Santosh Mahto's avatar Santosh Mahto

More style fixups

parent a6d057d7
......@@ -46,6 +46,6 @@ Thumbs.db
/binary_distrib
/docs
# CEF generated files
/include/cef_version.h
/include/cef_config.h
/include/cef_version.h
.ccls-cache/
......@@ -1974,6 +1974,12 @@ if (is_mac) {
# The cefclient target depends on packages that are not available in the
# default sysroot environment.
if (is_linux && !use_sysroot) {
pkg_config("glib") {
packages = [
"glib-2.0",
]
}
pkg_config("gtk") {
packages = [
"gmodule-2.0",
......@@ -1989,12 +1995,6 @@ if (is_mac) {
"gtkglext-1.0",
]
}
pkg_config("glib") {
packages = [
"glib-2.0",
]
}
}
if (is_linux) {
......
......@@ -51,13 +51,7 @@ CefBrowserPlatformDelegateNativeLinux::CefBrowserPlatformDelegateNativeLinux(
false,
use_external_begin_frame),
host_window_created_(false),
window_widget_(nullptr)
#if defined(USE_X11)
,
window_x11_(nullptr)
#endif
{
}
window_widget_(nullptr) {}
void CefBrowserPlatformDelegateNativeLinux::BrowserDestroyed(
CefBrowserHostImpl* browser) {
......
......@@ -63,7 +63,7 @@ class CefBrowserPlatformDelegateNativeLinux
views::Widget* window_widget_;
#if defined(USE_X11)
CefWindowX11* window_x11_;
CefWindowX11* window_x11_ = nullptr;
#endif
};
......
......@@ -117,7 +117,6 @@ if platform == 'windows':
gn_args['windows_sdk_path'] = os.environ['SDK_ROOT']
configs = GetAllPlatformConfigs(gn_args)
for dir, config in configs.items():
# Create out directories and write the args.gn file.
out_path = os.path.join(src_dir, 'out', dir)
......
# Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights
# Copyright (c) 2019 The Chromium Embedded Framework Authors. All rights
# reserved. Use of this source code is governed by a BSD-style license that
# can be found in the LICENSE file.
......@@ -16,7 +16,6 @@ if __name__ != "__main__":
disc = """
This utility creates the config header file.
"""
parser = OptionParser(description=disc)
parser.add_option(
'--header',
......@@ -55,7 +54,6 @@ def check_x11_build(gn_config):
return True
def write_config_header(header, cef_gn_config):
""" Creates the header file for the cef build configuration
if the information has changed or if the file doesn't already exist. """
......@@ -113,10 +111,8 @@ def write_config_header(header, cef_gn_config):
if newcontents != oldcontents:
write_file(header, newcontents)
return True
return False
written = write_config_header(options.header, options.cef_gn_config)
if not options.quiet:
if written:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment