From 7a0aff2bae6124beeec8b2f2ea0698f91fcd7efe Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Tue, 31 Jan 2017 14:55:48 +0530 Subject: [PATCH] code cleanup --- atom/browser/api/atom_api_web_contents.cc | 8 ++++---- atom/browser/api/atom_api_web_view_manager.cc | 3 ++- atom/browser/web_contents_zoom_controller.cc | 14 ++++++-------- atom/browser/web_view_guest_delegate.cc | 12 +++++++----- atom/common/options_switches.cc | 1 - atom/common/options_switches.h | 1 - atom/renderer/api/atom_api_web_frame.cc | 4 ++-- 7 files changed, 21 insertions(+), 22 deletions(-) diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc index 0865ea0e5f..ae040be5c4 100644 --- a/atom/browser/api/atom_api_web_contents.cc +++ b/atom/browser/api/atom_api_web_contents.cc @@ -248,8 +248,8 @@ WebContents::WebContents(v8::Isolate* isolate, content::WebContents* web_contents, Type type) : content::WebContentsObserver(web_contents), - zoom_controller_(nullptr), embedder_(nullptr), + zoom_controller_(nullptr), type_(type), request_id_(0), background_throttling_(true), @@ -267,8 +267,8 @@ WebContents::WebContents(v8::Isolate* isolate, } WebContents::WebContents(v8::Isolate* isolate, const mate::Dictionary& options) - : zoom_controller_(nullptr), - embedder_(nullptr), + : embedder_(nullptr), + zoom_controller_(nullptr), type_(BROWSER_WINDOW), request_id_(0), background_throttling_(true), @@ -354,7 +354,7 @@ void WebContents::InitWithSessionAndOptions(v8::Isolate* isolate, WebContentsZoomController::CreateForWebContents(web_contents); zoom_controller_ = WebContentsZoomController::FromWebContents(web_contents); double zoom_factor; - if (options.Get("zoomFactor", &zoom_factor)) + if (options.Get(options::kZoomFactor, &zoom_factor)) zoom_controller_->SetDefaultZoomFactor(zoom_factor); web_contents->SetUserAgentOverride(GetBrowserContext()->GetUserAgent()); diff --git a/atom/browser/api/atom_api_web_view_manager.cc b/atom/browser/api/atom_api_web_view_manager.cc index 33205b80c6..961cb03220 100644 --- a/atom/browser/api/atom_api_web_view_manager.cc +++ b/atom/browser/api/atom_api_web_view_manager.cc @@ -8,6 +8,7 @@ #include "atom/common/native_mate_converters/content_converter.h" #include "atom/common/native_mate_converters/value_converter.h" #include "atom/common/node_includes.h" +#include "atom/common/options_switches.h" #include "content/public/browser/browser_context.h" #include "native_mate/dictionary.h" @@ -26,7 +27,7 @@ void AddGuest(int guest_instance_id, guest_web_contents); double zoom_factor; - if (options.GetDouble("zoomFactor", &zoom_factor)) { + if (options.GetDouble(atom::options::kZoomFactor, &zoom_factor)) { atom::WebContentsZoomController::FromWebContents(guest_web_contents) ->SetDefaultZoomFactor(zoom_factor); } diff --git a/atom/browser/web_contents_zoom_controller.cc b/atom/browser/web_contents_zoom_controller.cc index a40b683092..92eb30fac8 100644 --- a/atom/browser/web_contents_zoom_controller.cc +++ b/atom/browser/web_contents_zoom_controller.cc @@ -7,7 +7,6 @@ #include "content/public/browser/navigation_details.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/navigation_handle.h" -#include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" @@ -31,9 +30,7 @@ WebContentsZoomController::WebContentsZoomController( &WebContentsZoomController::OnZoomLevelChanged, base::Unretained(this))); } -WebContentsZoomController::~WebContentsZoomController() { - embedder_zoom_controller_ = nullptr; -} +WebContentsZoomController::~WebContentsZoomController() {} void WebContentsZoomController::AddObserver( WebContentsZoomController::Observer* observer) { @@ -72,8 +69,8 @@ void WebContentsZoomController::SetZoomLevel(double level) { host_zoom_factor_[host] = new_zoom_factor; content::HostZoomMap::SetZoomLevel(web_contents(), level); // Notify observers of zoom level changes. - FOR_EACH_OBSERVER(WebContentsZoomController::Observer, observers_, - OnZoomLevelChanged(web_contents(), level, false)); + for (Observer& observer : observers_) + observer.OnZoomLevelChanged(web_contents(), level, false); } } @@ -94,8 +91,8 @@ void WebContentsZoomController::SetTemporaryZoomLevel(double level) { old_view_id_ = web_contents()->GetRenderViewHost()->GetRoutingID(); host_zoom_map_->SetTemporaryZoomLevel(old_process_id_, old_view_id_, level); // Notify observers of zoom level changes. - FOR_EACH_OBSERVER(WebContentsZoomController::Observer, observers_, - OnZoomLevelChanged(web_contents(), level, true)); + for (Observer& observer : observers_) + observer.OnZoomLevelChanged(web_contents(), level, true); } bool WebContentsZoomController::UsesTemporaryZoomLevel() { @@ -122,6 +119,7 @@ void WebContentsZoomController::DidFinishNavigation( void WebContentsZoomController::WebContentsDestroyed() { observers_.Clear(); host_zoom_factor_.clear(); + embedder_zoom_controller_ = nullptr; } void WebContentsZoomController::RenderFrameHostChanged( diff --git a/atom/browser/web_view_guest_delegate.cc b/atom/browser/web_view_guest_delegate.cc index e8b1aee0ce..21b917ac61 100644 --- a/atom/browser/web_view_guest_delegate.cc +++ b/atom/browser/web_view_guest_delegate.cc @@ -23,11 +23,11 @@ const int kDefaultHeight = 300; } // namespace WebViewGuestDelegate::WebViewGuestDelegate() - : guest_host_(nullptr), + : embedder_zoom_controller_(nullptr), + guest_host_(nullptr), auto_size_enabled_(false), is_full_page_plugin_(false), - api_web_contents_(nullptr) { -} + api_web_contents_(nullptr) {} WebViewGuestDelegate::~WebViewGuestDelegate() { } @@ -39,9 +39,11 @@ void WebViewGuestDelegate::Initialize(api::WebContents* api_web_contents) { void WebViewGuestDelegate::Destroy() { // Give the content module an opportunity to perform some cleanup. - embedder_zoom_controller_->RemoveObserver(this); + if (embedder_zoom_controller_) { + embedder_zoom_controller_->RemoveObserver(this); + embedder_zoom_controller_ = nullptr; + } guest_host_->WillDestroy(); - embedder_zoom_controller_ = nullptr; guest_host_ = nullptr; } diff --git a/atom/common/options_switches.cc b/atom/common/options_switches.cc index 4729a28127..6db479ceb7 100644 --- a/atom/common/options_switches.cc +++ b/atom/common/options_switches.cc @@ -155,7 +155,6 @@ const char kAppUserModelId[] = "app-user-model-id"; // The command line switch versions of the options. const char kBackgroundColor[] = "background-color"; -const char kZoomFactor[] = "zoom-factor"; const char kPreloadScript[] = "preload"; const char kPreloadURL[] = "preload-url"; const char kNodeIntegration[] = "node-integration"; diff --git a/atom/common/options_switches.h b/atom/common/options_switches.h index c81ab529cf..abe3856cd8 100644 --- a/atom/common/options_switches.h +++ b/atom/common/options_switches.h @@ -81,7 +81,6 @@ extern const char kSecureSchemes[]; extern const char kAppUserModelId[]; extern const char kBackgroundColor[]; -extern const char kZoomFactor[]; extern const char kPreloadScript[]; extern const char kPreloadURL[]; extern const char kNodeIntegration[]; diff --git a/atom/renderer/api/atom_api_web_frame.cc b/atom/renderer/api/atom_api_web_frame.cc index cc2d28ca96..f103b89391 100644 --- a/atom/renderer/api/atom_api_web_frame.cc +++ b/atom/renderer/api/atom_api_web_frame.cc @@ -73,7 +73,7 @@ void WebFrame::SetName(const std::string& name) { } double WebFrame::SetZoomLevel(double level) { - double result; + double result = 0.0; content::RenderView* render_view = content::RenderView::FromWebView(web_frame_->view()); render_view->Send(new AtomViewHostMsg_SetTemporaryZoomLevel( @@ -82,7 +82,7 @@ double WebFrame::SetZoomLevel(double level) { } double WebFrame::GetZoomLevel() const { - double result; + double result = 0.0; content::RenderView* render_view = content::RenderView::FromWebView(web_frame_->view()); render_view->Send(