mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-24 21:16:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix cocoa browser private dereferences

Browse Source
This commit is contained in:
Vincent Sanders 2014-10-19 01:54:16 +01:00
parent 6b36990787
commit 686fd09ad8
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cocoa/gui.m
View File

@ -33,7 +33,7 @@
#import "desktop/mouse.h" #import "desktop/mouse.h"
#import "desktop/gui_window.h" #import "desktop/gui_window.h"
#import "desktop/gui_misc.h" #import "desktop/gui_misc.h"
#import "desktop/browser.h" #import "desktop/browser_private.h"
#import "desktop/textinput.h" #import "desktop/textinput.h"
#import "image/ico.h" #import "image/ico.h"
#import "content/fetchers/resource.h" #import "content/fetchers/resource.h"
@ -95,9 +95,10 @@ static void gui_window_redraw_window(struct gui_window *g)
static void gui_window_update_box(struct gui_window *g, const struct rect *rect) static void gui_window_update_box(struct gui_window *g, const struct rect *rect)
{ {
const NSRect nsrect = cocoa_scaled_rect_wh( [(BrowserViewController *)g browser]->scale, const NSRect nsrect = cocoa_scaled_rect_wh(
rect->x0, rect->y0, browser_window_get_scale([(BrowserViewController *)g browser]),
rect->x1 - rect->x0, rect->y1 - rect->y0 ); rect->x0, rect->y0,
rect->x1 - rect->x0, rect->y1 - rect->y0 );
[[(BrowserViewController *)g browserView] setNeedsDisplayInRect: nsrect]; [[(BrowserViewController *)g browserView] setNeedsDisplayInRect: nsrect];
} }
@ -135,7 +136,7 @@ static void gui_window_get_dimensions(struct gui_window *g,
NSRect frame = [[[(BrowserViewController *)g browserView] superview] frame]; NSRect frame = [[[(BrowserViewController *)g browserView] superview] frame];
if (scaled) { if (scaled) {
const CGFloat scale = [(BrowserViewController *)g browser]->scale; const CGFloat scale = browser_window_get_scale([(BrowserViewController *)g browser]);
frame.size.width /= scale; frame.size.width /= scale;
frame.size.height /= scale; frame.size.height /= scale;
} }
@ -146,12 +147,13 @@ static void gui_window_get_dimensions(struct gui_window *g,
static void gui_window_update_extent(struct gui_window *g) static void gui_window_update_extent(struct gui_window *g)
{ {
BrowserViewController * const window = (BrowserViewController *)g; BrowserViewController * const window = (BrowserViewController *)g;
int width;
int height;
struct browser_window *browser = [window browser]; struct browser_window *browser = [window browser];
int width = content_get_width( browser->current_content );
int height = content_get_height( browser->current_content ); browser_window_get_extents(browser, false, &width, &height);
[[window browserView] setMinimumSize: cocoa_scaled_size( browser->scale, width, height )]; [[window browserView] setMinimumSize: cocoa_scaled_size( browser_window_get_scale(browser), width, height )];
} }
static void gui_window_set_status(struct gui_window *g, const char *text) static void gui_window_set_status(struct gui_window *g, const char *text)