touching down layout integration branch
git-svn-id: svn://10.0.0.236/trunk@3290 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -24,6 +24,7 @@
|
||||
|
||||
#define VIEW_SOURCE_TARGET_WINDOW_NAME "%ViewSourceWindow" /* from ns/lib/libnet/cvcolor.c */
|
||||
|
||||
#ifndef MOZ_NGLAYOUT
|
||||
MWContext *FE_MakeGridWindow(MWContext *pOldContext, void *hist_list, void *pHistory,
|
||||
int32 lX, int32 lY,
|
||||
int32 lWidth, int32 lHeight, char *pUrlStr, char *pWindowName, int8 iScrollType,
|
||||
@@ -215,7 +216,11 @@ void *FE_FreeGridWindow(MWContext *pContext, XP_Bool bSaveHistory) {
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef MOZ_NGLAYOUT
|
||||
ASSERT(0);
|
||||
#else
|
||||
LO_DiscardDocument(pWinCX->GetContext());
|
||||
#endif
|
||||
XP_List *hist_list = pWinCX->GetContext()->hist.list_ptr;
|
||||
pWinCX->GetContext()->hist.list_ptr = NULL;
|
||||
|
||||
@@ -246,6 +251,7 @@ void *FE_FreeGridWindow(MWContext *pContext, XP_Bool bSaveHistory) {
|
||||
|
||||
return(pRetval);
|
||||
}
|
||||
#endif /* MOZ_NGLAYOUT */
|
||||
|
||||
void FE_GetFullWindowSize(MWContext *pContext, int32 *plWidth, int32 *plHeight) {
|
||||
|
||||
@@ -281,6 +287,7 @@ void FE_GetFullWindowSize(MWContext *pContext, int32 *plWidth, int32 *plHeight)
|
||||
}
|
||||
}
|
||||
|
||||
#ifndef MOZ_NGLAYOUT
|
||||
void FE_RestructureGridWindow(MWContext *pContext, int32 lX, int32 lY, int32 lWidth, int32 lHeight) {
|
||||
TRACE("FE_RestructureGridWindow(%p, %ld, %ld, %ld, %ld)\n", pContext, lX, lY, lWidth, lHeight);
|
||||
|
||||
@@ -304,6 +311,7 @@ void FE_RestructureGridWindow(MWContext *pContext, int32 lX, int32 lY, int32 lWi
|
||||
|
||||
// Dynamic scroll bars are handled internally, as is resize.
|
||||
}
|
||||
#endif /* MOZ_NGLAYOUT */
|
||||
|
||||
void FE_SetWindowLoading(MWContext *pContext, URL_Struct *pUrl, Net_GetUrlExitFunc **ppExitRoutine) {
|
||||
|
||||
@@ -317,6 +325,7 @@ void FE_SetWindowLoading(MWContext *pContext, URL_Struct *pUrl, Net_GetUrlExitFu
|
||||
ABSTRACTCX(pContext)->GetUrl(pUrl, FO_CACHE_AND_PRESENT, FALSE);
|
||||
}
|
||||
|
||||
#ifndef MOZ_NGLAYOUT
|
||||
void FE_GetEdgeMinSize(MWContext *pContext, int32 *pSize, Bool no_edge) {
|
||||
TRACE("FE_GetEdgeMinSize(%p, %p)\n", pContext, pSize);
|
||||
|
||||
@@ -327,6 +336,7 @@ void FE_GetEdgeMinSize(MWContext *pContext, int32 *pSize, Bool no_edge) {
|
||||
*pSize = 5;
|
||||
}
|
||||
}
|
||||
#endif /* MOZ_NGLAYOUT */
|
||||
|
||||
MWContext *FE_MakeBlankWindow(MWContext *pOldContext, URL_Struct *pUrl, char *pContextName) {
|
||||
// TRACE("FE_MakeBlankWindow(%p, %p, %s)\n", pOldContext, pUrl, pContextName);
|
||||
|
||||
Reference in New Issue
Block a user