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

[project @ 2005-04-30 17:11:24 by bursa]

Browse Source 
Check box->background before using box->background->bitmap.

svn path=/import/netsurf/; revision=1706
This commit is contained in:
James Bursa 2005-04-30 17:11:24 +00:00
parent e22f12e223
commit 03810e4b6c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
render/html_redraw.c
View File

@ -789,7 +789,7 @@ bool html_redraw_background(int x, int y, struct box *box, float scale,
int px0 = clip_x0, py0 = clip_y0, px1 = clip_x1, py1 = clip_y1; int px0 = clip_x0, py0 = clip_y0, px1 = clip_x1, py1 = clip_y1;
int ox = x, oy = y; int ox = x, oy = y;
if (box->background->bitmap) { if (box->background && box->background->bitmap) {
/* handle background-repeat */ /* handle background-repeat */
switch (box->style->background_repeat) { switch (box->style->background_repeat) {
case CSS_BACKGROUND_REPEAT_REPEAT: case CSS_BACKGROUND_REPEAT_REPEAT:
@ -878,8 +878,9 @@ bool html_redraw_background(int x, int y, struct box *box, float scale,
if ((clip_x0 >= clip_x1) || (clip_y0 >= clip_y1) || if ((clip_x0 >= clip_x1) || (clip_y0 >= clip_y1) ||
(clip_box->style->background_color != TRANSPARENT) || (clip_box->style->background_color != TRANSPARENT) ||
((clip_box->background->bitmap) && (clip_box->background &&
(bitmap_get_opaque(clip_box->background->bitmap)))) { clip_box->background->bitmap &&
bitmap_get_opaque(clip_box->background->bitmap))) {
if (!(clip_box = clip_box->next)) if (!(clip_box = clip_box->next))
return true; return true;
continue; continue;
@ -895,7 +896,7 @@ bool html_redraw_background(int x, int y, struct box *box, float scale,
return false; return false;
} }
/* and plot the image */ /* and plot the image */
if (box->background->bitmap) { if (box->background && box->background->bitmap) {
if (!plot.clip(clip_x0, clip_y0, clip_x1, clip_y1)) if (!plot.clip(clip_x0, clip_y0, clip_x1, clip_y1))
return false; return false;
if (!plot.bitmap_tile(x, y, if (!plot.bitmap_tile(x, y,