mirror of
https://github.com/classilla/tenfourfox.git
synced 2024-06-08 05:29:36 +00:00
#478: M1434580 M1261175 M1426087 M1426988
This commit is contained in:
parent
8d28701d4b
commit
fd45dec140
|
@ -4109,9 +4109,10 @@ EventStateManager::NotifyMouseOver(WidgetMouseEvent* aMouseEvent,
|
||||||
// content associated with our subdocument.
|
// content associated with our subdocument.
|
||||||
EnsureDocument(mPresContext);
|
EnsureDocument(mPresContext);
|
||||||
if (nsIDocument *parentDoc = mDocument->GetParentDocument()) {
|
if (nsIDocument *parentDoc = mDocument->GetParentDocument()) {
|
||||||
if (nsIContent *docContent = parentDoc->FindContentForSubDocument(mDocument)) {
|
if (nsCOMPtr<nsIContent> docContent =
|
||||||
|
parentDoc->FindContentForSubDocument(mDocument)) {
|
||||||
if (nsIPresShell *parentShell = parentDoc->GetShell()) {
|
if (nsIPresShell *parentShell = parentDoc->GetShell()) {
|
||||||
EventStateManager* parentESM =
|
RefPtr<EventStateManager> parentESM =
|
||||||
parentShell->GetPresContext()->EventStateManager();
|
parentShell->GetPresContext()->EventStateManager();
|
||||||
parentESM->NotifyMouseOver(aMouseEvent, docContent);
|
parentESM->NotifyMouseOver(aMouseEvent, docContent);
|
||||||
}
|
}
|
||||||
|
|
|
@ -517,6 +517,12 @@ nsDocumentViewer::~nsDocumentViewer()
|
||||||
mDocument->Destroy();
|
mDocument->Destroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (mPrintEngine) {
|
||||||
|
mPrintEngine->Destroy();
|
||||||
|
mPrintEngine = nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
MOZ_RELEASE_ASSERT(mDestroyRefCount == 0);
|
||||||
NS_ASSERTION(!mPresShell && !mPresContext,
|
NS_ASSERTION(!mPresShell && !mPresContext,
|
||||||
"User did not call nsIContentViewer::Destroy");
|
"User did not call nsIContentViewer::Destroy");
|
||||||
if (mPresShell || mPresContext) {
|
if (mPresShell || mPresContext) {
|
||||||
|
@ -1564,7 +1570,6 @@ nsDocumentViewer::Destroy()
|
||||||
// We also keep the viewer from being cached in session history, since
|
// We also keep the viewer from being cached in session history, since
|
||||||
// we require all documents there to be sanitized.
|
// we require all documents there to be sanitized.
|
||||||
if (mDestroyRefCount != 0) {
|
if (mDestroyRefCount != 0) {
|
||||||
--mDestroyRefCount;
|
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4209,6 +4214,12 @@ nsDocumentViewer::IncrementDestroyRefCount()
|
||||||
++mDestroyRefCount;
|
++mDestroyRefCount;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
nsDocumentViewer::DecrementDestroyRefCount()
|
||||||
|
{
|
||||||
|
--mDestroyRefCount;
|
||||||
|
}
|
||||||
|
|
||||||
//------------------------------------------------------------
|
//------------------------------------------------------------
|
||||||
|
|
||||||
#if defined(NS_PRINTING) && defined(NS_PRINT_PREVIEW)
|
#if defined(NS_PRINTING) && defined(NS_PRINT_PREVIEW)
|
||||||
|
|
|
@ -39,6 +39,7 @@ public:
|
||||||
virtual nsresult CreateStyleSet(nsIDocument* aDocument, nsStyleSet** aStyleSet) = 0;
|
virtual nsresult CreateStyleSet(nsIDocument* aDocument, nsStyleSet** aStyleSet) = 0;
|
||||||
|
|
||||||
virtual void IncrementDestroyRefCount() = 0;
|
virtual void IncrementDestroyRefCount() = 0;
|
||||||
|
virtual void DecrementDestroyRefCount() = 0;
|
||||||
|
|
||||||
virtual void ReturnToGalleyPresentation() = 0;
|
virtual void ReturnToGalleyPresentation() = 0;
|
||||||
|
|
||||||
|
@ -73,6 +74,7 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsIDocumentViewerPrint,
|
||||||
virtual bool GetIsPrintPreview() override; \
|
virtual bool GetIsPrintPreview() override; \
|
||||||
virtual nsresult CreateStyleSet(nsIDocument* aDocument, nsStyleSet** aStyleSet) override; \
|
virtual nsresult CreateStyleSet(nsIDocument* aDocument, nsStyleSet** aStyleSet) override; \
|
||||||
virtual void IncrementDestroyRefCount() override; \
|
virtual void IncrementDestroyRefCount() override; \
|
||||||
|
virtual void DecrementDestroyRefCount() override; \
|
||||||
virtual void ReturnToGalleyPresentation() override; \
|
virtual void ReturnToGalleyPresentation() override; \
|
||||||
virtual void OnDonePrinting() override; \
|
virtual void OnDonePrinting() override; \
|
||||||
virtual bool IsInitializedForPrintPreview() override; \
|
virtual bool IsInitializedForPrintPreview() override; \
|
||||||
|
|
|
@ -12,14 +12,8 @@ NS_IMPL_ISUPPORTS_INHERITED(nsPagePrintTimer, nsRunnable, nsITimerCallback)
|
||||||
|
|
||||||
nsPagePrintTimer::~nsPagePrintTimer()
|
nsPagePrintTimer::~nsPagePrintTimer()
|
||||||
{
|
{
|
||||||
// "Destroy" the document viewer; this normally doesn't actually
|
// This matches the IncrementDestroyRefCount call in the constructor.
|
||||||
// destroy it because of the IncrementDestroyRefCount call below
|
mDocViewerPrint->DecrementDestroyRefCount();
|
||||||
// XXX This is messy; the document viewer should use a single approach
|
|
||||||
// to keep itself alive during printing
|
|
||||||
nsCOMPtr<nsIContentViewer> cv(do_QueryInterface(mDocViewerPrint));
|
|
||||||
if (cv) {
|
|
||||||
cv->Destroy();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
nsresult
|
nsresult
|
||||||
|
|
|
@ -13,8 +13,11 @@
|
||||||
* \brief Provides the high level interface to wrap encoder algorithms.
|
* \brief Provides the high level interface to wrap encoder algorithms.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
#include <assert.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include "vp8/common/blockd.h"
|
||||||
#include "vpx_config.h"
|
#include "vpx_config.h"
|
||||||
#include "vpx/internal/vpx_codec_internal.h"
|
#include "vpx/internal/vpx_codec_internal.h"
|
||||||
|
|
||||||
|
@ -89,6 +92,8 @@ vpx_codec_err_t vpx_codec_enc_init_multi_ver(vpx_codec_ctx_t *ctx,
|
||||||
int i;
|
int i;
|
||||||
void *mem_loc = NULL;
|
void *mem_loc = NULL;
|
||||||
|
|
||||||
|
if (iface->enc.mr_get_mem_loc == NULL) return VPX_CODEC_INCAPABLE;
|
||||||
|
|
||||||
if (!(res = iface->enc.mr_get_mem_loc(cfg, &mem_loc))) {
|
if (!(res = iface->enc.mr_get_mem_loc(cfg, &mem_loc))) {
|
||||||
for (i = 0; i < num_enc; i++) {
|
for (i = 0; i < num_enc; i++) {
|
||||||
vpx_codec_priv_enc_mr_cfg_t mr_cfg;
|
vpx_codec_priv_enc_mr_cfg_t mr_cfg;
|
||||||
|
@ -98,28 +103,29 @@ vpx_codec_err_t vpx_codec_enc_init_multi_ver(vpx_codec_ctx_t *ctx,
|
||||||
dsf->den > dsf->num) {
|
dsf->den > dsf->num) {
|
||||||
res = VPX_CODEC_INVALID_PARAM;
|
res = VPX_CODEC_INVALID_PARAM;
|
||||||
break;
|
break;
|
||||||
|
} else {
|
||||||
|
|
||||||
|
mr_cfg.mr_low_res_mode_info = mem_loc;
|
||||||
|
mr_cfg.mr_total_resolutions = num_enc;
|
||||||
|
mr_cfg.mr_encoder_id = num_enc - 1 - i;
|
||||||
|
mr_cfg.mr_down_sampling_factor.num = dsf->num;
|
||||||
|
mr_cfg.mr_down_sampling_factor.den = dsf->den;
|
||||||
|
|
||||||
|
/* Force Key-frame synchronization. Namely, encoder at higher
|
||||||
|
* resolution always use the same frame_type chosen by the
|
||||||
|
* lowest-resolution encoder.
|
||||||
|
*/
|
||||||
|
if (mr_cfg.mr_encoder_id)
|
||||||
|
cfg->kf_mode = VPX_KF_DISABLED;
|
||||||
|
|
||||||
|
ctx->iface = iface;
|
||||||
|
ctx->name = iface->name;
|
||||||
|
ctx->priv = NULL;
|
||||||
|
ctx->init_flags = flags;
|
||||||
|
ctx->config.enc = cfg;
|
||||||
|
res = ctx->iface->init(ctx, &mr_cfg);
|
||||||
}
|
}
|
||||||
|
|
||||||
mr_cfg.mr_low_res_mode_info = mem_loc;
|
|
||||||
mr_cfg.mr_total_resolutions = num_enc;
|
|
||||||
mr_cfg.mr_encoder_id = num_enc - 1 - i;
|
|
||||||
mr_cfg.mr_down_sampling_factor.num = dsf->num;
|
|
||||||
mr_cfg.mr_down_sampling_factor.den = dsf->den;
|
|
||||||
|
|
||||||
/* Force Key-frame synchronization. Namely, encoder at higher
|
|
||||||
* resolution always use the same frame_type chosen by the
|
|
||||||
* lowest-resolution encoder.
|
|
||||||
*/
|
|
||||||
if (mr_cfg.mr_encoder_id)
|
|
||||||
cfg->kf_mode = VPX_KF_DISABLED;
|
|
||||||
|
|
||||||
ctx->iface = iface;
|
|
||||||
ctx->name = iface->name;
|
|
||||||
ctx->priv = NULL;
|
|
||||||
ctx->init_flags = flags;
|
|
||||||
ctx->config.enc = cfg;
|
|
||||||
res = ctx->iface->init(ctx, &mr_cfg);
|
|
||||||
|
|
||||||
if (res) {
|
if (res) {
|
||||||
const char *error_detail =
|
const char *error_detail =
|
||||||
ctx->priv ? ctx->priv->err_detail : NULL;
|
ctx->priv ? ctx->priv->err_detail : NULL;
|
||||||
|
@ -134,11 +140,14 @@ vpx_codec_err_t vpx_codec_enc_init_multi_ver(vpx_codec_ctx_t *ctx,
|
||||||
vpx_codec_destroy(ctx);
|
vpx_codec_destroy(ctx);
|
||||||
i--;
|
i--;
|
||||||
}
|
}
|
||||||
|
#if CONFIG_MULTI_RES_ENCODING
|
||||||
|
assert(mem_loc);
|
||||||
|
free(((LOWER_RES_FRAME_INFO *)mem_loc)->mb_info);
|
||||||
|
free(mem_loc);
|
||||||
|
#endif
|
||||||
|
return SAVE_STATUS(ctx, res);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (res)
|
|
||||||
break;
|
|
||||||
|
|
||||||
ctx++;
|
ctx++;
|
||||||
cfg++;
|
cfg++;
|
||||||
dsf++;
|
dsf++;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user