Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove old MOCHA #ifdefs

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@11422 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cyeh%netscape.com
1998-09-29 20:55:21 +00:00
parent b5e3e00b52
commit 048c08f8a0
12 changed files with 10 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/lib/layout/layblock.c
View File

@@ -1765,9 +1765,7 @@ lo_begin_layer_internal(MWContext *context,
/* Push this layer on the layer stack */ /* Push this layer on the layer stack */
lo_PushLayerState(state->top_state, layer_state); lo_PushLayerState(state->top_state, layer_state);
#ifdef MOCHA
ET_SetActiveLayer(context, layer_state->id); ET_SetActiveLayer(context, layer_state->id);
#endif /* MOCHA */
state->layer_nest_level++; state->layer_nest_level++;
if (param->src) { if (param->src) {
@@ -2343,10 +2341,8 @@ lo_EndLayer(MWContext *context,
state->layer_nest_level--; state->layer_nest_level--;
lo_PopLayerState(state); lo_PopLayerState(state);
#ifdef MOCHA
enclosing_layer_state = lo_CurrentLayerState(state); enclosing_layer_state = lo_CurrentLayerState(state);
ET_SetActiveLayer(context, enclosing_layer_state->id); ET_SetActiveLayer(context, enclosing_layer_state->id);
#endif /* MOCHA */
if (block->is_dynamic) { if (block->is_dynamic) {
lo_TopState * top_state; lo_TopState * top_state;
@@ -2373,11 +2369,9 @@ lo_EndLayer(MWContext *context,
} }
} }
#ifdef MOCHA
if (send_load_event) if (send_load_event)
ET_SendLoadEvent(context, EVENT_LOAD, NULL, NULL, layer_state->id, ET_SendLoadEvent(context, EVENT_LOAD, NULL, NULL, layer_state->id,
state->top_state->resize_reload); state->top_state->resize_reload);
#endif
lo_DeleteBlock(block); lo_DeleteBlock(block);
layer_state->temp_block = NULL; layer_state->temp_block = NULL;
@@ -2721,9 +2715,7 @@ LO_PrepareLayerForWriting(MWContext *context, int32 layer_id,
state->layer_nest_level++; state->layer_nest_level++;
/* Push this layer on the layer stack */ /* Push this layer on the layer stack */
lo_PushLayerState(state->top_state, layer_state); lo_PushLayerState(state->top_state, layer_state);
#ifdef MOCHA
ET_SetActiveLayer(context, layer_state->id); ET_SetActiveLayer(context, layer_state->id);
#endif /* MOCHA */
block->clip_expansion_policy = lo_GetLayerClipExpansionPolicy(layer); block->clip_expansion_policy = lo_GetLayerClipExpansionPolicy(layer);

2
mozilla/lib/layout/laybuiltin.c
View File

@@ -179,9 +179,7 @@ lo_FormatBuiltinInternal (MWContext *context, lo_DocState *state, PA_Tag *tag,
#endif #endif
builtin->nextBuiltin = NULL; builtin->nextBuiltin = NULL;
#ifdef MOCHA
builtin->mocha_object = NULL; builtin->mocha_object = NULL;
#endif
builtin->FE_Data = NULL; builtin->FE_Data = NULL;
builtin->session_data = NULL; builtin->session_data = NULL;

4
mozilla/lib/layout/laycell.c
View File

@@ -982,11 +982,7 @@ void lo_CreateCellFromSubDoc( MWContext *context, lo_DocState *state,
* back up to the top level state, instead of propogating up * back up to the top level state, instead of propogating up
* like we used to. * like we used to.
*/ */
#ifdef MOCHA
lo_AddNameList(state->top_state->doc_state, subdoc_state); lo_AddNameList(state->top_state->doc_state, subdoc_state);
#else
lo_AddNameList(state, subdoc_state);
#endif /* MOCHA */
} }
} }

3
mozilla/lib/layout/layembed.c
View File

@@ -332,10 +332,7 @@ lo_FormatEmbedInternal(MWContext *context, lo_DocState *state, PA_Tag *tag,
lo_DocLists *doc_lists; lo_DocLists *doc_lists;
embed->nextEmbed= NULL; embed->nextEmbed= NULL;
#ifdef MOCHA
embed->objTag.mocha_object = NULL; embed->objTag.mocha_object = NULL;
#endif
embed->objTag.FE_Data = NULL; embed->objTag.FE_Data = NULL;
embed->objTag.session_data = NULL; embed->objTag.session_data = NULL;
embed->objTag.line_height = state->line_height; embed->objTag.line_height = state->line_height;

32
mozilla/lib/layout/layform.c
View File

@@ -448,10 +448,8 @@ lo_BeginForm(MWContext *context, lo_DocState *state, PA_Tag *tag)
form->form_ele_size = 0; form->form_ele_size = 0;
form->form_elements = NULL; form->form_elements = NULL;
form->next = NULL; form->next = NULL;
#ifdef MOCHA
form->name = lo_FetchParamValue(context, tag, PARAM_NAME); form->name = lo_FetchParamValue(context, tag, PARAM_NAME);
form->mocha_object = NULL; form->mocha_object = NULL;
#endif
buff = lo_FetchParamValue(context, tag, PARAM_ACTION); buff = lo_FetchParamValue(context, tag, PARAM_ACTION);
if (buff != NULL) if (buff != NULL)
@@ -558,12 +556,10 @@ lo_BeginForm(MWContext *context, lo_DocState *state, PA_Tag *tag)
form->next = doc_lists->form_list; form->next = doc_lists->form_list;
doc_lists->form_list = form; doc_lists->form_list = form;
#ifdef MOCHA
if (!state->in_relayout) if (!state->in_relayout)
{ {
lo_BeginReflectForm(context, state, tag, form); lo_BeginReflectForm(context, state, tag, form);
} }
#endif
} }
@@ -627,12 +623,10 @@ lo_EndForm(MWContext *context, lo_DocState *state)
FE_FormTextIsSubmit(context, single_text_ele); FE_FormTextIsSubmit(context, single_text_ele);
} }
#ifdef MOCHA
if (!state->in_relayout) if (!state->in_relayout)
{ {
lo_EndReflectForm(context, form_list); lo_EndReflectForm(context, form_list);
} }
#endif
} }
@@ -774,10 +768,8 @@ new_form_element(MWContext *context, lo_DocState *state, int32 type)
form_element->layer_id = lo_CurrentLayerId(state); form_element->layer_id = lo_CurrentLayerId(state);
form_element->element_data = NULL; form_element->element_data = NULL;
form_element->element_index = 0; form_element->element_index = 0;
#ifdef MOCHA
form_element->mocha_object = NULL; form_element->mocha_object = NULL;
form_element->event_handler_present = FALSE; form_element->event_handler_present = FALSE;
#endif
/* TEXTATTR HERE */ /* TEXTATTR HERE */
#ifdef DOM #ifdef DOM
@@ -977,9 +969,9 @@ lo_form_input_text(MWContext *context, lo_DocState *state,
LO_FormElementStruct *form_element; LO_FormElementStruct *form_element;
lo_FormElementTextData *form_data; lo_FormElementTextData *form_data;
PA_Block buff; PA_Block buff;
#if defined(XP_MAC)&&defined(MOCHA) #if defined(XP_MAC)
PA_Block keydown, keypress, keyup; PA_Block keydown, keypress, keyup;
#endif /* defined(XP_MAC)&&defined(MOCHA) */ #endif /* defined(XP_MAC) */
char *str; char *str;
char *tptr; char *tptr;
int16 charset; int16 charset;
@@ -1116,7 +1108,7 @@ lo_form_input_text(MWContext *context, lo_DocState *state,
PA_FREE(buff); PA_FREE(buff);
} }
#if defined(XP_MAC)&&defined(MOCHA) #if defined(XP_MAC)
keydown = lo_FetchParamValue(context, tag, PARAM_ONKEYDOWN); keydown = lo_FetchParamValue(context, tag, PARAM_ONKEYDOWN);
keypress = lo_FetchParamValue(context, tag, PARAM_ONKEYPRESS); keypress = lo_FetchParamValue(context, tag, PARAM_ONKEYPRESS);
keyup = lo_FetchParamValue(context, tag, PARAM_ONKEYUP); keyup = lo_FetchParamValue(context, tag, PARAM_ONKEYUP);
@@ -1132,7 +1124,7 @@ lo_form_input_text(MWContext *context, lo_DocState *state,
PA_FREE(keypress); PA_FREE(keypress);
if (keyup) if (keyup)
PA_FREE(keyup); PA_FREE(keyup);
#endif /* defined(XP_MAC)&&defined(MOCHA) */ #endif /* defined(XP_MAC) */
return(form_element); return(form_element);
} }
@@ -1145,9 +1137,9 @@ lo_form_textarea(MWContext *context, lo_DocState *state,
LO_FormElementStruct *form_element; LO_FormElementStruct *form_element;
lo_FormElementTextareaData *form_data; lo_FormElementTextareaData *form_data;
PA_Block buff; PA_Block buff;
#if defined(XP_MAC)&&defined(MOCHA) #if defined(XP_MAC)
PA_Block keydown, keypress, keyup; PA_Block keydown, keypress, keyup;
#endif /* defined(XP_MAC)&&defined(MOCHA) */ #endif /* defined(XP_MAC) */
char *str; char *str;
form_element = new_form_element(context, state, type); form_element = new_form_element(context, state, type);
@@ -1254,7 +1246,7 @@ lo_form_textarea(MWContext *context, lo_DocState *state,
PA_FREE(buff); PA_FREE(buff);
} }
#if defined(XP_MAC)&&defined(MOCHA) #if defined(XP_MAC)
keydown = lo_FetchParamValue(context, tag, PARAM_ONKEYDOWN); keydown = lo_FetchParamValue(context, tag, PARAM_ONKEYDOWN);
keypress = lo_FetchParamValue(context, tag, PARAM_ONKEYPRESS); keypress = lo_FetchParamValue(context, tag, PARAM_ONKEYPRESS);
keyup = lo_FetchParamValue(context, tag, PARAM_ONKEYUP); keyup = lo_FetchParamValue(context, tag, PARAM_ONKEYUP);
@@ -1270,7 +1262,7 @@ lo_form_textarea(MWContext *context, lo_DocState *state,
PA_FREE(keypress); PA_FREE(keypress);
if (keyup) if (keyup)
PA_FREE(keyup); PA_FREE(keyup);
#endif /* defined(XP_MAC)&&defined(MOCHA) */ #endif /* defined(XP_MAC) */
return(form_element); return(form_element);
} }
@@ -1792,10 +1784,8 @@ lo_form_select(MWContext *context, lo_DocState *state, PA_Tag *tag)
form_data->saved_tag = PA_CloneMDLTag(tag); form_data->saved_tag = PA_CloneMDLTag(tag);
} }
#ifdef MOCHA
/* needs to be moved */ /* needs to be moved */
lo_ReflectFormElement(context, state, tag, form_element); lo_ReflectFormElement(context, state, tag, form_element);
#endif
return(form_element); return(form_element);
} }
@@ -1884,7 +1874,6 @@ lo_add_element_to_form_list(MWContext *context, lo_DocState *state,
(form_list->form_ele_cnt * (form_list->form_ele_cnt *
sizeof(LO_Element *))); sizeof(LO_Element *)));
} }
#ifdef MOCHA
if (form_list->form_elements != NULL) if (form_list->form_elements != NULL)
{ {
int32 i; int32 i;
@@ -1899,7 +1888,6 @@ lo_add_element_to_form_list(MWContext *context, lo_DocState *state,
} }
PA_UNLOCK(form_list->form_elements); PA_UNLOCK(form_list->form_elements);
} }
#endif
form_list->form_ele_size = form_list->form_ele_cnt; form_list->form_ele_size = form_list->form_ele_cnt;
} }
if (form_list->form_elements == NULL) if (form_list->form_elements == NULL)
@@ -1910,7 +1898,6 @@ lo_add_element_to_form_list(MWContext *context, lo_DocState *state,
return(FALSE); return(FALSE);
} }
PA_LOCK(ele_array, LO_Element **, form_list->form_elements); PA_LOCK(ele_array, LO_Element **, form_list->form_elements);
#ifdef MOCHA
{ {
LO_FormElementStruct *old_form_ele; LO_FormElementStruct *old_form_ele;
@@ -1922,7 +1909,6 @@ lo_add_element_to_form_list(MWContext *context, lo_DocState *state,
form_element->mocha_object = old_form_ele->mocha_object; form_element->mocha_object = old_form_ele->mocha_object;
} }
} }
#endif
ele_array[form_list->form_ele_cnt - 1] = (LO_Element *)form_element; ele_array[form_list->form_ele_cnt - 1] = (LO_Element *)form_element;
PA_UNLOCK(form_list->form_elements); PA_UNLOCK(form_list->form_elements);
return(TRUE); return(TRUE);
@@ -2568,9 +2554,7 @@ lo_ProcessInputTag(MWContext *context, lo_DocState *state, PA_Tag *tag)
lo_add_form_element(context, state, form_element); lo_add_form_element(context, state, form_element);
} }
#ifdef MOCHA
lo_ReflectFormElement(context, state, tag, form_element); lo_ReflectFormElement(context, state, tag, form_element);
#endif
} }

4
mozilla/lib/layout/laygrid.c
View File

@@ -2131,9 +2131,7 @@ lo_BeginGrid(MWContext *context, lo_DocState *state, PA_Tag *tag)
return; return;
} }
#ifdef MOCHA
(void)lo_ProcessContextEventHandlers(context, state, tag); (void)lo_ProcessContextEventHandlers(context, state, tag);
#endif
grid->rows = rows; grid->rows = rows;
grid->row_percents = row_percents; grid->row_percents = row_percents;
@@ -2796,9 +2794,7 @@ lo_BeginSubgrid(MWContext *context, lo_DocState *state, PA_Tag *tag)
return; return;
} }
#ifdef MOCHA
(void)lo_ProcessContextEventHandlers(context, state, tag); (void)lo_ProcessContextEventHandlers(context, state, tag);
#endif
subgrid->rows = rows; subgrid->rows = rows;
subgrid->row_percents = row_percents; subgrid->row_percents = row_percents;

14
mozilla/lib/layout/layimage.c
View File

@@ -41,9 +41,7 @@ extern int MK_OUT_OF_MEMORY;
#define IL_CLIENT /* Defined by Image Library clients */ #define IL_CLIENT /* Defined by Image Library clients */
#include "libimg.h" /* Image Library public API. */ #include "libimg.h" /* Image Library public API. */
#ifdef MOCHA
#include "libevent.h" #include "libevent.h"
#endif /* MOCHA */
#include "timing.h" #include "timing.h"
@@ -1358,9 +1356,7 @@ lo_PartialFormatImage(MWContext *context, lo_DocState *state, PA_Tag *tag)
{ {
LO_ImageStruct *image; LO_ImageStruct *image;
int32 layer_id; int32 layer_id;
#ifdef MOCHA
LM_ImageEvent mocha_event; LM_ImageEvent mocha_event;
#endif /* MOCHA */
image = (LO_ImageStruct *)tag->lo_data; image = (LO_ImageStruct *)tag->lo_data;
if (image == NULL) if (image == NULL)
@@ -1368,7 +1364,6 @@ lo_PartialFormatImage(MWContext *context, lo_DocState *state, PA_Tag *tag)
return; return;
} }
#ifdef MOCHA
layer_id = lo_CurrentLayerId(state); layer_id = lo_CurrentLayerId(state);
image->layer_id = layer_id; image->layer_id = layer_id;
/* Reflect the image into Javascript */ /* Reflect the image into Javascript */
@@ -1393,7 +1388,6 @@ lo_PartialFormatImage(MWContext *context, lo_DocState *state, PA_Tag *tag)
mocha_event = LM_IMGERROR; mocha_event = LM_IMGERROR;
ET_SendImageEvent(context, image, mocha_event); ET_SendImageEvent(context, image, mocha_event);
} }
#endif
tag->lo_data = NULL; tag->lo_data = NULL;
@@ -2130,13 +2124,11 @@ lo_FormatImage(MWContext *context, lo_DocState *state, PA_Tag *tag)
} }
} }
#ifdef MOCHA
layer_id = lo_CurrentLayerId(state); layer_id = lo_CurrentLayerId(state);
image->layer_id = layer_id; image->layer_id = layer_id;
/* Reflect the image into Javascript */ /* Reflect the image into Javascript */
lo_ReflectImage(context, state, tag, image, FALSE, layer_id); lo_ReflectImage(context, state, tag, image, FALSE, layer_id);
#endif
if (context->compositor) { if (context->compositor) {
image->layer = lo_CreateImageLayer(context, image, NULL); image->layer = lo_CreateImageLayer(context, image, NULL);
@@ -2959,11 +2951,9 @@ lo_ImageObserver(XP_Observable observable, XP_ObservableMsg message,
{ {
IL_MessageData *data = (IL_MessageData*)message_data; IL_MessageData *data = (IL_MessageData*)message_data;
lo_ImageObsClosure *image_obs_closure = (lo_ImageObsClosure *)closure; lo_ImageObsClosure *image_obs_closure = (lo_ImageObsClosure *)closure;
MWContext *context = NULL; MWContext *context=NULL;
LO_ImageStruct *lo_image = NULL; LO_ImageStruct *lo_image;
#ifdef MOCHA
LM_ImageEvent mocha_event; LM_ImageEvent mocha_event;
#endif /* MOCHA */
if (image_obs_closure) { if (image_obs_closure) {
context = image_obs_closure->context; context = image_obs_closure->context;

3
mozilla/lib/layout/layjava.c
View File

@@ -187,10 +187,7 @@ lo_FormatJavaAppInternal(MWContext *context, lo_DocState *state, PA_Tag *tag, LO
lo_DocLists *doc_lists; lo_DocLists *doc_lists;
java_app->nextApplet = NULL; java_app->nextApplet = NULL;
#ifdef MOCHA
java_app->objTag.mocha_object = NULL; java_app->objTag.mocha_object = NULL;
#endif
java_app->objTag.FE_Data = NULL; java_app->objTag.FE_Data = NULL;
java_app->objTag.session_data = NULL; java_app->objTag.session_data = NULL;
java_app->objTag.line_height = state->line_height; java_app->objTag.line_height = state->line_height;

14
mozilla/lib/layout/layout.h
View File

@@ -133,11 +133,9 @@ typedef struct lo_NameList_struct {
LO_Element *element; LO_Element *element;
PA_Block name; /* really a (char *) */ PA_Block name; /* really a (char *) */
struct lo_NameList_struct *next; struct lo_NameList_struct *next;
#ifdef MOCHA
uint32 index; /* Needed because with nested tables, the list uint32 index; /* Needed because with nested tables, the list
is not guaranteed to be ordered. */ is not guaranteed to be ordered. */
struct JSObject *mocha_object; struct JSObject *mocha_object;
#endif
} lo_NameList; } lo_NameList;
typedef struct lo_SavedFormListData_struct { typedef struct lo_SavedFormListData_struct {
@@ -233,10 +231,8 @@ typedef struct lo_FormData_struct {
int32 form_ele_size; int32 form_ele_size;
PA_Block form_elements; /* really a (LO_Element **) */ PA_Block form_elements; /* really a (LO_Element **) */
struct lo_FormData_struct *next; struct lo_FormData_struct *next;
#ifdef MOCHA
PA_Block name; PA_Block name;
struct JSObject *mocha_object; struct JSObject *mocha_object;
#endif
} lo_FormData; } lo_FormData;
@@ -648,9 +644,7 @@ typedef struct lo_DocState_struct {
int edit_current_offset; int edit_current_offset;
Bool edit_force_offset; Bool edit_force_offset;
Bool edit_relayout_display_blocked; Bool edit_relayout_display_blocked;
#ifdef MOCHA
Bool in_relayout; /* true if we're in lo_RelayoutSubdoc */ Bool in_relayout; /* true if we're in lo_RelayoutSubdoc */
#endif
int32 tab_stop; int32 tab_stop;
int32 beginning_tag_count; /* the tag count at the beginning of this state */ int32 beginning_tag_count; /* the tag count at the beginning of this state */
@@ -706,7 +700,6 @@ typedef struct lo_SavedData {
lo_SavedFormListData* FormList; /* Data for all form elements in doc */ lo_SavedFormListData* FormList; /* Data for all form elements in doc */
lo_SavedEmbedListData* EmbedList; /* session data for all embeds and applets in doc */ lo_SavedEmbedListData* EmbedList; /* session data for all embeds and applets in doc */
lo_SavedGridData* Grid; /* saved for grid history. */ lo_SavedGridData* Grid; /* saved for grid history. */
#ifdef MOCHA
PA_Block OnLoad; /* JavaScript onload event handler source */ PA_Block OnLoad; /* JavaScript onload event handler source */
PA_Block OnUnload; /* JavaScript onunload event handler source */ PA_Block OnUnload; /* JavaScript onunload event handler source */
PA_Block OnFocus; /* JavaScript onfocus event handler source */ PA_Block OnFocus; /* JavaScript onfocus event handler source */
@@ -717,7 +710,6 @@ typedef struct lo_SavedData {
PA_Block OnDragDrop; /* JavaScript ondragdrop event handler source */ PA_Block OnDragDrop; /* JavaScript ondragdrop event handler source */
PA_Block OnMove; /* JavaScript onmove event handler source */ PA_Block OnMove; /* JavaScript onmove event handler source */
PA_Block OnResize; /* JavaScript onresize event handler source */ PA_Block OnResize; /* JavaScript onresize event handler source */
#endif
} lo_SavedData; } lo_SavedData;
/* /*
@@ -809,7 +801,6 @@ struct lo_TopState_struct {
lo_DocState *doc_state; lo_DocState *doc_state;
ED_Buffer *edit_buffer; ED_Buffer *edit_buffer;
#ifdef MOCHA
uint32 script_tag_count; /* number of script tags processed so far */ uint32 script_tag_count; /* number of script tags processed so far */
uint script_lineno; /* parser newline count at last <SCRIPT> tag */ uint script_lineno; /* parser newline count at last <SCRIPT> tag */
int8 in_script; /* script type if in script, see below */ int8 in_script; /* script type if in script, see below */
@@ -825,7 +816,6 @@ struct lo_TopState_struct {
uint32 mocha_loading_embeds_count; uint32 mocha_loading_embeds_count;
NET_StreamClass *mocha_write_stream; NET_StreamClass *mocha_write_stream;
void *scriptData; void *scriptData;
#endif
struct pa_DocData_struct *doc_data; struct pa_DocData_struct *doc_data;
PA_Tag **input_write_point[MAX_INPUT_WRITE_LEVEL]; PA_Tag **input_write_point[MAX_INPUT_WRITE_LEVEL];
@@ -872,10 +862,8 @@ struct lo_TopState_struct {
#ifdef DEBUG_ScriptPlugin #ifdef DEBUG_ScriptPlugin
#define SCRIPT_TYPE_PLUGIN 5 #define SCRIPT_TYPE_PLUGIN 5
#endif #endif
#ifdef MOCHA
extern void extern void
lo_DestroyScriptData(void *data); lo_DestroyScriptData(void *data);
#endif
/* Define to get the reload flag of the current document */ /* Define to get the reload flag of the current document */
#define FORCE_RELOAD_FLAG(top_state) \ #define FORCE_RELOAD_FLAG(top_state) \
@@ -1542,7 +1530,6 @@ lo_BumpEditablePosition(MWContext *context, lo_DocState *state,
Bool Bool
lo_IsEmptyTag(TagType type); lo_IsEmptyTag(TagType type);
#ifdef MOCHA
extern lo_TopState * extern lo_TopState *
lo_GetMochaTopState(MWContext *context); lo_GetMochaTopState(MWContext *context);
@@ -1593,7 +1580,6 @@ lo_ProcessStyleTag(MWContext *context, lo_DocState *state, PA_Tag *tag);
extern void extern void
lo_BlockScriptTag(MWContext *context, lo_DocState *state, PA_Tag *tag); lo_BlockScriptTag(MWContext *context, lo_DocState *state, PA_Tag *tag);
#endif /* MOCHA */
extern lo_DocLists * extern lo_DocLists *
lo_GetCurrentDocLists(lo_DocState *state); lo_GetCurrentDocLists(lo_DocState *state);

6
mozilla/lib/layout/laytable.c
View File

@@ -860,9 +860,7 @@ lo_reuse_current_state(MWContext *context, lo_DocState *state,
state->edit_current_offset = 0; state->edit_current_offset = 0;
state->edit_relayout_display_blocked = FALSE; state->edit_relayout_display_blocked = FALSE;
#endif #endif
#ifdef MOCHA
state->in_relayout = FALSE; state->in_relayout = FALSE;
#endif
state->cur_text_block = NULL; state->cur_text_block = NULL;
@@ -2662,26 +2660,22 @@ lo_merge_form_data(lo_FormData *new_form_list, lo_FormData *hold_form_list)
{ {
if (hold_ele_list[i] != new_ele_list[i]) if (hold_ele_list[i] != new_ele_list[i])
{ {
#ifdef MOCHA
if (new_ele_list[i]->mocha_object == NULL) if (new_ele_list[i]->mocha_object == NULL)
{ {
new_ele_list[i]->mocha_object new_ele_list[i]->mocha_object
= hold_ele_list[i]->mocha_object; = hold_ele_list[i]->mocha_object;
} }
#endif
hold_ele_list[i] = new_ele_list[i]; hold_ele_list[i] = new_ele_list[i];
} }
} }
PA_UNLOCK(hold_form_list->form_elements); PA_UNLOCK(hold_form_list->form_elements);
PA_UNLOCK(new_form_list->form_elements); PA_UNLOCK(new_form_list->form_elements);
#ifdef MOCHA
/* XXX sometimes the second pass does not reflect a form object! */ /* XXX sometimes the second pass does not reflect a form object! */
if (new_form_list->mocha_object != NULL) if (new_form_list->mocha_object != NULL)
{ {
hold_form_list->mocha_object = new_form_list->mocha_object; hold_form_list->mocha_object = new_form_list->mocha_object;
} }
#endif
return(hold_form_list); return(hold_form_list);
} }

3
mozilla/lib/layout/laytags.c
View File

@@ -7463,9 +7463,6 @@ XP_TRACE(("lo_LayoutTag(%d)\n", tag->type));
* this can result in the loss of body data! * this can result in the loss of body data!
*/ */
case P_UNKNOWN: case P_UNKNOWN:
#ifndef MOCHA
unknown:
#endif
if (state->top_state->in_head != FALSE) if (state->top_state->in_head != FALSE)
{ {
char *tdata; char *tdata;

12
mozilla/lib/layout/layutil.c
View File

@@ -27,13 +27,11 @@
#include "stystruc.h" #include "stystruc.h"
#include "stystack.h" #include "stystack.h"
#include "layers.h" #include "layers.h"
#ifdef NSPR20
#ifdef XP_MAC #ifdef XP_MAC
#include "prpriv.h" #include "prpriv.h"
#else #else
#include "private/prpriv.h" /* for PR_NewNamedMonitor */ #include "private/prpriv.h" /* for PR_NewNamedMonitor */
#endif #endif
#endif /* NSPR20 */
#include "intl_csi.h" #include "intl_csi.h"
#ifdef DOM #ifdef DOM
@@ -2193,7 +2191,6 @@ lo_SetNamedAnchor(lo_DocState *state, PA_Block name)
doc_lists = lo_GetCurrentDocLists(state); doc_lists = lo_GetCurrentDocLists(state);
#ifdef MOCHA
if (state->in_relayout) { if (state->in_relayout) {
/* Look for the old lo_NameList. Its mocha_object is still valid. */ /* Look for the old lo_NameList. Its mocha_object is still valid. */
lo_NameList *name_list = doc_lists->name_list; lo_NameList *name_list = doc_lists->name_list;
@@ -2224,7 +2221,6 @@ lo_SetNamedAnchor(lo_DocState *state, PA_Block name)
} }
} }
if (!name_rec || !state->in_relayout) { if (!name_rec || !state->in_relayout) {
#endif /* MOCHA */
name_rec = XP_NEW(lo_NameList); name_rec = XP_NEW(lo_NameList);
if (name_rec == NULL) if (name_rec == NULL)
{ {
@@ -2232,10 +2228,8 @@ lo_SetNamedAnchor(lo_DocState *state, PA_Block name)
PA_FREE(name); PA_FREE(name);
return FALSE; return FALSE;
} }
#ifdef MOCHA
name_rec->mocha_object = NULL; name_rec->mocha_object = NULL;
} }
#endif /* MOCHA */
name_rec->x = 0; name_rec->x = 0;
name_rec->y = 0; name_rec->y = 0;
name_rec->name = name; name_rec->name = name;
@@ -2338,7 +2332,6 @@ lo_SetNamedSpan(lo_DocState *state, PA_Block id)
doc_lists = lo_GetCurrentDocLists(state); doc_lists = lo_GetCurrentDocLists(state);
#ifdef MOCHA
if (state->in_relayout) { if (state->in_relayout) {
/* Look for the old lo_NameList. Its mocha_object is still valid. */ /* Look for the old lo_NameList. Its mocha_object is still valid. */
lo_NameList *span_list = doc_lists->span_list; lo_NameList *span_list = doc_lists->span_list;
@@ -2369,7 +2362,6 @@ lo_SetNamedSpan(lo_DocState *state, PA_Block id)
} }
} }
if (!name_rec || !state->in_relayout) { if (!name_rec || !state->in_relayout) {
#endif /* MOCHA */
name_rec = XP_NEW(lo_NameList); name_rec = XP_NEW(lo_NameList);
if (name_rec == NULL) if (name_rec == NULL)
{ {
@@ -2377,10 +2369,8 @@ lo_SetNamedSpan(lo_DocState *state, PA_Block id)
PA_FREE(id); PA_FREE(id);
return FALSE; return FALSE;
} }
#ifdef MOCHA
name_rec->mocha_object = NULL; name_rec->mocha_object = NULL;
} }
#endif /* MOCHA */
name_rec->x = 0; name_rec->x = 0;
name_rec->y = 0; name_rec->y = 0;
name_rec->name = id; name_rec->name = id;
@@ -2653,11 +2643,9 @@ lo_AppendToLineList(MWContext *context, lo_DocState *state,
} }
state->current_named_anchor = NULL; state->current_named_anchor = NULL;
} }
#ifdef MOCHA
else if (state->current_anchor) { else if (state->current_anchor) {
state->current_anchor->element = element; state->current_anchor->element = element;
} }
#endif /* MOCHA */
element->lo_any.next = NULL; element->lo_any.next = NULL;
element->lo_any.prev = NULL; element->lo_any.prev = NULL;