File tree Expand file tree Collapse file tree 1 file changed +13
-9
lines changed Expand file tree Collapse file tree 1 file changed +13
-9
lines changed Original file line number Diff line number Diff line change @@ -67,16 +67,20 @@ void Menu::Call(const std::string& method,
67
67
arguments.GetInteger (1 , &y);
68
68
content::WebContents* web_contents = content::WebContents::FromRenderFrameHost (rvh);
69
69
DCHECK (web_contents);
70
- double zoom_factor = content::ZoomLevelToZoomFactor (
71
- zoom::ZoomController::FromWebContents (web_contents)->GetZoomLevel ());
72
- if (zoom_factor > content::kMaximumZoomFactor ) {
73
- zoom_factor = content::kMaximumZoomFactor ;
74
- }
75
- if (zoom_factor < content::kMinimumZoomFactor ) {
76
- zoom_factor = content::kMinimumZoomFactor ;
70
+ zoom::ZoomController* zoom_controller = zoom::ZoomController::FromWebContents (web_contents);
71
+
72
+ if (zoom_controller) {
73
+ double zoom_factor = content::ZoomLevelToZoomFactor (zoom_controller->GetZoomLevel ());
74
+ if (zoom_factor > content::kMaximumZoomFactor ) {
75
+ zoom_factor = content::kMaximumZoomFactor ;
76
+ }
77
+ if (zoom_factor < content::kMinimumZoomFactor ) {
78
+ zoom_factor = content::kMinimumZoomFactor ;
79
+ }
80
+ x *= zoom_factor;
81
+ y *= zoom_factor;
77
82
}
78
- x *= zoom_factor;
79
- y *= zoom_factor;
83
+
80
84
Popup (x, y, rvh);
81
85
} else if (method == " EnableShowEvent" ) {
82
86
arguments.GetBoolean (0 , &enable_show_event_);
You can’t perform that action at this time.
0 commit comments