mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
75dd89485e
- Bug 1176414 - Clean up/rename various column index variables in nsTableRowFrame and nsTableFrame. r=dholbert (d8e33d549) - Bug 1176105 - Remove the (largely gutted) nsTableIterator class, and replace with simple frame-list iteration. r=dholbert (46a15df19) - Bug 1176555 - Replace explicit bit-twiddling of frame state flags by human-readable nsIFrame state-manipulation methods in table layout code. r=dholbert (aef9fb035) - Bug 1176354 - Rename nsTableRowFrame::GetBSize to differentiate better from nsIFrame::BSize. r=dholbert (9b67203a0) - Bug 1177600 - Properly adjust table row and cell positions when their containing block-size changes in vertical-rl writing mode. r=dholbert (413148d55) - Bug 1177925: Use range-based for loops for nsFrameList iteration, in various places in layout. r=tn (6db450285) - Bug 1148582 - Recycle mask layers attached to FrameMetrics. r=mattwoodrow (91360fbd8) - Bug 1148582 - Apply async transforms to (ancestor) mask layers correctly. r=botond (d6fca66fb) - Bug 1143575. Add some #includes to avoid unified-build issues on Windows. r=nical (ff78b76a3) - Bug 1143575. Add some #includes to avoid more unified-build issues on Windows. r=nical (99e0548f4) - Bug 1181832 - Keep gfxPrefs.h out of header files. r=kats (341f0aea0) - Bug 1181832 - Include gfxPrefs.h from nsImageLoadingContet.cpp to fix bustage on a CLOSED TREE. r=bustage (d61a18ab9) - Bug 1137557 - Part 0: TextEventDispatcher shouldn't forward keyboard events coming from TextInputProcessor to the parent process. r=smaug (87f70fcc4) - Bug 1172405 - Fix build error when adding files to dom/workers and gfx/layers. r=nical (8e114b8bb) - Bug 1061393 - Export display list info to layer scope viewer. r=kamidphish (60fd247f0) - Bug 1072313 - Check for more leaks in the layers code. r=mstange (aacbb2e1c) - Bug 1198979 - GC unused IPDL struct member. r=jmuizelaar (79c3113fb) - add missing semicolon (17ba58b45) - Bug 1153348 - Add an analysis to prohibit operator bools which aren't marked as either explicit or MOZ_IMPLICIT; r=jrmuizel (903dca970) - Bug 1170388 - Restrict the static analysis error given about raw pointers to refcounted objects inside a lambda, to the case where the raw pointer is captured. r=ehsan (cbbd3174c) - Bug 1180993 - Part 1: Add an analysis to help catch unused return values of specific types. r=ehsan (2420face4) - Bug 1180993 - Part 2: Add the MOZ_MUST_USE attribute to mfbt, and use it to verify usage of already_AddRefed. r=ehsan (b72785a60) - Bug 1123907 - Part 1: Add an analysis to ensure that a class marked MOZ_NEEDS_NO_VTABLE_TYPE cannot be instantiated by a class with a VTable; r=ehsan (0f5730c04) - Bug 1123907 - Part 2: Add MOZ_NEEDS_NO_VTABLE_TYPE to Attributes.h, and use it to verify the EntryType argument of nsTHashtable; r=ehsan (2e80fc581) - Bug 1159433 - Part 1: Add an analysis to ensure that some template arguments cannot be non-memmovable types; r=ehsan (3602e950f) - uniform MOZ_MUST_USE, it will be renamed in patch 1267550 (3b5ebd4c5) - add missing part of Bug 1187073 - Use MOZ_INHERIT_TYPE_ANNOTATIONS_FROM_TEMPLATE_ARGS to validate the usage of AlignedStorage2. r=ehsan (3b451bfb7) - Bug 1159433 - Part 2: Add the MOZ_NON_MEMMOVABLE and MOZ_NEEDS_MEMMOVABLE_TYPE macros to MFBT; r=froydnj (171c23ec4) - Bug 1159433 - Part 3: Make nsTArray_CopyChooser only accept memmovable argument types by default; r=froydnj (40cb4aa67) - Bug 1159433 - Part 4: Mark nsTAutoString_CharT and nsAutoArrayBase as non-memmovable; r=froydnj (7dc6bd220)
307 lines
7.4 KiB
C++
307 lines
7.4 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
|
* vim: sw=2 ts=2 et :
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#ifndef dom_plugins_PluginScriptableObjectUtils_h
|
|
#define dom_plugins_PluginScriptableObjectUtils_h
|
|
|
|
#include "PluginModuleParent.h"
|
|
#include "PluginModuleChild.h"
|
|
#include "PluginInstanceParent.h"
|
|
#include "PluginInstanceChild.h"
|
|
#include "PluginScriptableObjectParent.h"
|
|
#include "PluginScriptableObjectChild.h"
|
|
|
|
#include "npapi.h"
|
|
#include "npfunctions.h"
|
|
#include "npruntime.h"
|
|
|
|
#include "nsDebug.h"
|
|
|
|
namespace mozilla {
|
|
namespace plugins {
|
|
|
|
inline PluginInstanceParent*
|
|
GetInstance(NPObject* aObject)
|
|
{
|
|
NS_ASSERTION(aObject->_class == PluginScriptableObjectParent::GetClass(),
|
|
"Bad class!");
|
|
|
|
ParentNPObject* object = reinterpret_cast<ParentNPObject*>(aObject);
|
|
if (object->invalidated) {
|
|
NS_WARNING("Calling method on an invalidated object!");
|
|
return nullptr;
|
|
}
|
|
if (!object->parent) {
|
|
return nullptr;
|
|
}
|
|
return object->parent->GetInstance();
|
|
}
|
|
|
|
inline NPObject*
|
|
NPObjectFromVariant(const Variant& aRemoteVariant)
|
|
{
|
|
switch (aRemoteVariant.type()) {
|
|
case Variant::TPPluginScriptableObjectParent: {
|
|
PluginScriptableObjectParent* actor =
|
|
const_cast<PluginScriptableObjectParent*>(
|
|
reinterpret_cast<const PluginScriptableObjectParent*>(
|
|
aRemoteVariant.get_PPluginScriptableObjectParent()));
|
|
return actor->GetObject(true);
|
|
}
|
|
|
|
case Variant::TPPluginScriptableObjectChild: {
|
|
PluginScriptableObjectChild* actor =
|
|
const_cast<PluginScriptableObjectChild*>(
|
|
reinterpret_cast<const PluginScriptableObjectChild*>(
|
|
aRemoteVariant.get_PPluginScriptableObjectChild()));
|
|
return actor->GetObject(true);
|
|
}
|
|
|
|
default:
|
|
NS_NOTREACHED("Shouldn't get here!");
|
|
return nullptr;
|
|
}
|
|
}
|
|
|
|
inline NPObject*
|
|
NPObjectFromVariant(const NPVariant& aVariant)
|
|
{
|
|
NS_ASSERTION(NPVARIANT_IS_OBJECT(aVariant), "Wrong variant type!");
|
|
return NPVARIANT_TO_OBJECT(aVariant);
|
|
}
|
|
|
|
inline const NPNetscapeFuncs*
|
|
GetNetscapeFuncs(PluginInstanceParent* aInstance)
|
|
{
|
|
PluginModuleParent* module = aInstance->Module();
|
|
if (!module) {
|
|
NS_WARNING("Null module?!");
|
|
return nullptr;
|
|
}
|
|
return module->GetNetscapeFuncs();
|
|
}
|
|
|
|
inline const NPNetscapeFuncs*
|
|
GetNetscapeFuncs(NPObject* aObject)
|
|
{
|
|
NS_ASSERTION(aObject->_class == PluginScriptableObjectParent::GetClass(),
|
|
"Bad class!");
|
|
|
|
PluginInstanceParent* instance = GetInstance(aObject);
|
|
if (!instance) {
|
|
return nullptr;
|
|
}
|
|
|
|
return GetNetscapeFuncs(instance);
|
|
}
|
|
|
|
inline void
|
|
ReleaseRemoteVariant(Variant& aVariant)
|
|
{
|
|
switch (aVariant.type()) {
|
|
case Variant::TPPluginScriptableObjectParent: {
|
|
PluginScriptableObjectParent* actor =
|
|
const_cast<PluginScriptableObjectParent*>(
|
|
reinterpret_cast<const PluginScriptableObjectParent*>(
|
|
aVariant.get_PPluginScriptableObjectParent()));
|
|
actor->Unprotect();
|
|
break;
|
|
}
|
|
|
|
case Variant::TPPluginScriptableObjectChild: {
|
|
NS_ASSERTION(XRE_GetProcessType() == GeckoProcessType_Plugin,
|
|
"Should only be running in the child!");
|
|
PluginScriptableObjectChild* actor =
|
|
const_cast<PluginScriptableObjectChild*>(
|
|
reinterpret_cast<const PluginScriptableObjectChild*>(
|
|
aVariant.get_PPluginScriptableObjectChild()));
|
|
actor->Unprotect();
|
|
break;
|
|
}
|
|
|
|
default:
|
|
break; // Intentional fall-through for other variant types.
|
|
}
|
|
|
|
aVariant = mozilla::void_t();
|
|
}
|
|
|
|
bool
|
|
ConvertToVariant(const Variant& aRemoteVariant,
|
|
NPVariant& aVariant,
|
|
PluginInstanceParent* aInstance = nullptr);
|
|
|
|
template <class InstanceType>
|
|
bool
|
|
ConvertToRemoteVariant(const NPVariant& aVariant,
|
|
Variant& aRemoteVariant,
|
|
InstanceType* aInstance,
|
|
bool aProtectActors = false);
|
|
|
|
class ProtectedVariant
|
|
{
|
|
public:
|
|
ProtectedVariant(const NPVariant& aVariant,
|
|
PluginInstanceParent* aInstance)
|
|
{
|
|
mOk = ConvertToRemoteVariant(aVariant, mVariant, aInstance, true);
|
|
}
|
|
|
|
ProtectedVariant(const NPVariant& aVariant,
|
|
PluginInstanceChild* aInstance)
|
|
{
|
|
mOk = ConvertToRemoteVariant(aVariant, mVariant, aInstance, true);
|
|
}
|
|
|
|
~ProtectedVariant() {
|
|
ReleaseRemoteVariant(mVariant);
|
|
}
|
|
|
|
bool IsOk() {
|
|
return mOk;
|
|
}
|
|
|
|
operator const Variant&() {
|
|
return mVariant;
|
|
}
|
|
|
|
private:
|
|
Variant mVariant;
|
|
bool mOk;
|
|
};
|
|
|
|
class ProtectedVariantArray
|
|
{
|
|
public:
|
|
ProtectedVariantArray(const NPVariant* aArgs,
|
|
uint32_t aCount,
|
|
PluginInstanceParent* aInstance)
|
|
: mUsingShadowArray(false)
|
|
{
|
|
for (uint32_t index = 0; index < aCount; index++) {
|
|
Variant* remoteVariant = mArray.AppendElement();
|
|
if (!(remoteVariant &&
|
|
ConvertToRemoteVariant(aArgs[index], *remoteVariant, aInstance,
|
|
true))) {
|
|
mOk = false;
|
|
return;
|
|
}
|
|
}
|
|
mOk = true;
|
|
}
|
|
|
|
ProtectedVariantArray(const NPVariant* aArgs,
|
|
uint32_t aCount,
|
|
PluginInstanceChild* aInstance)
|
|
: mUsingShadowArray(false)
|
|
{
|
|
for (uint32_t index = 0; index < aCount; index++) {
|
|
Variant* remoteVariant = mArray.AppendElement();
|
|
if (!(remoteVariant &&
|
|
ConvertToRemoteVariant(aArgs[index], *remoteVariant, aInstance,
|
|
true))) {
|
|
mOk = false;
|
|
return;
|
|
}
|
|
}
|
|
mOk = true;
|
|
}
|
|
|
|
~ProtectedVariantArray()
|
|
{
|
|
InfallibleTArray<Variant>& vars = EnsureAndGetShadowArray();
|
|
uint32_t count = vars.Length();
|
|
for (uint32_t index = 0; index < count; index++) {
|
|
ReleaseRemoteVariant(vars[index]);
|
|
}
|
|
}
|
|
|
|
operator const InfallibleTArray<Variant>&()
|
|
{
|
|
return EnsureAndGetShadowArray();
|
|
}
|
|
|
|
bool IsOk()
|
|
{
|
|
return mOk;
|
|
}
|
|
|
|
private:
|
|
InfallibleTArray<Variant>&
|
|
EnsureAndGetShadowArray()
|
|
{
|
|
if (!mUsingShadowArray) {
|
|
mShadowArray.SwapElements(mArray);
|
|
mUsingShadowArray = true;
|
|
}
|
|
return mShadowArray;
|
|
}
|
|
|
|
// We convert the variants fallibly, but pass them to Call*()
|
|
// methods as an infallible array
|
|
nsTArray<Variant> mArray;
|
|
InfallibleTArray<Variant> mShadowArray;
|
|
bool mOk;
|
|
bool mUsingShadowArray;
|
|
};
|
|
|
|
template<class ActorType>
|
|
struct ProtectedActorTraits
|
|
{
|
|
static bool Nullable();
|
|
};
|
|
|
|
template<class ActorType, class Traits=ProtectedActorTraits<ActorType> >
|
|
class ProtectedActor
|
|
{
|
|
public:
|
|
explicit ProtectedActor(ActorType* aActor) : mActor(aActor)
|
|
{
|
|
if (!Traits::Nullable()) {
|
|
NS_ASSERTION(mActor, "This should never be null!");
|
|
}
|
|
}
|
|
|
|
~ProtectedActor()
|
|
{
|
|
if (Traits::Nullable() && !mActor)
|
|
return;
|
|
mActor->Unprotect();
|
|
}
|
|
|
|
ActorType* operator->()
|
|
{
|
|
return mActor;
|
|
}
|
|
|
|
explicit operator bool()
|
|
{
|
|
return !!mActor;
|
|
}
|
|
|
|
private:
|
|
ActorType* mActor;
|
|
};
|
|
|
|
template<>
|
|
struct ProtectedActorTraits<PluginScriptableObjectParent>
|
|
{
|
|
static bool Nullable() { return true; }
|
|
};
|
|
|
|
template<>
|
|
struct ProtectedActorTraits<PluginScriptableObjectChild>
|
|
{
|
|
static bool Nullable() { return false; }
|
|
};
|
|
|
|
} /* namespace plugins */
|
|
} /* namespace mozilla */
|
|
|
|
#include "PluginScriptableObjectUtils-inl.h"
|
|
|
|
#endif /* dom_plugins_PluginScriptableObjectUtils_h */
|