mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
f32bf3ebba
- Bug 1268976 - Assert that the micro-task queues are empty upon destruction of CycleCollectedJSRuntime; r=mccr8 (a459a4af91) - Bug 1191354 part 1 - Clean up nsHTMLEditRules::GetHighestInlineParent; r=ehsan (a2f401887c) - Bug 1191354 part 2 - Clean up nsHTMLEditRules::CheckInterlinePosition; r=ehsan (75d3829eec) - Bug 1191354 part 3 - Clean up nsHTMLEditRules::InsertMozBRIfNeeded; r=ehsan (bedbba7c14) - Bug 772796 - Handle newlines correctly when joining <div> and <pre>. r=roc (323eaf4fe9) - Bug 1258085 - Avoid empty whitespace nodes when editing (b77825fb31) - Bug 1156062 part 4 - Clean up ns*EditRules::WillInsert; r=ehsan (f351557776) - Bug 1156062 part 5 - Make CreateBR return regular pointer; r=ehsan (8720917dee) - Bug 1156062 part 6 - Clean up nsHTMLEditRules::WillInsertBreak; r=ehsan (d71bca568f) - Bug 1156062 part 7 - Clean up nsHTMLEditRules::StandardBreakImpl; r=ehsan (625db32c02) - Bug 1156062 part 8 - Clean up nsHTMLEditRules::JoinBlocks; r=ehsan (266b6c5150) - Bug 1156062 part 9 - Clean up nsHTMLEditRules::WillAlign; r=masayuki (a6e3227001) - Bug 1156062 part 10 - Clean up MarginPropertyAtomForIndent; r=masayuki (28612e062c) - Bug 1184665 - Remove a spammy editor warning (a2db555918) - Bug 1156062 part 11 - Clean up nsHTMLEditRules::Before/AfterEdit; r=masayuki (6be722082e) - Bug 1156062 part 12 - Clean up nsHTMLEditRules::GetAlignment; r=masayuki (350be10ee8) - Bug 1190172 part 1 - Clean up nsHTMLEditor::SplitStyleAbovePoint; r=ehsan (ce5e360af6) - Bug 1145395 - Introduce an overload of nsHTMLEditor::SelElementPosition that takes an Element; r=ehsan (7ca9dfd2f8) - Bug 1190172 part 2 - Clean up nsHTMLEditor::ClearStyle; r=ehsan (84334514ad) - Bug 1190172 part 3 - Remove old method variants; r=ehsan (e042bd64d5) - Bug 1190172 part 4 - Remove unused nsHTMLEditor::HasAttr; r=ehsan (a4f1563465) - Bug 1190172 part 5 - Clean up nsHTMLEditor::NodeIsProperty; r=ehsan (98afb84bd4) - Bug 1190172 part 6 - Clean up nsHTMLEditor::RelativeFontChangeOnTextNode; r=ehsan (0bf036d206) - Bug 1190172 part 7 - Clean up nsHTMLEditor::PromoteInlineRange; r=ehsan (0a21347500) - Bug 1190172 part 8 - Clean up nsHTMLEditor::PromoteRangeIfStartsOrEndsInNamedAnchor; r=ehsan (78cf619036) - Bug 1190172 part 9 - Clean up nsHTMLEditor::ReturnInHeader; r=ehsan (1d8d151ff1) - Bug 1190172 part 10 - Clean up nsHTMLEditor::ReturnInListItem; r=ehsan (0ce94d3cb1) - Bug 1190172 part 11 - Clean up nsHTMLEditRules::IsEmptyBlock; r=ehsan (a8dc5092f8) - Bug 1190172 part 12 - Clean up nsHTMLEditRules::ExpandSelectionForDeletion; r=ehsan (3d4a87a56d) - Bug 1191354 part 4 - Clean up nsHTMLEditRules::AlignBlock; r=ehsan (b39372d726) - Bug 1191354 part 5 - Clean up nsHTMLEditRules::IsEmptyInline; r=ehsan (0b8ab19fd1) - Bug 1191354 part 6 - Clean up IsBlockNode/IsInlineNode in nsHTMLEditRules.cpp; r=ehsan (8ba8047e12) - Bug 1191354 part 7 - Clean up nsHTMLEditRules::CheckForInvisibleBR; r=ehsan (0bc61269bd) - Bug 1191354 part 8 - Typedefs in headers for readability; r=ehsan (50b43dc3e9) - Bug 1191354 part 9 - Remove old nsHTMLEditRules::ConvertListType variant; r=ehsan (871f1b30a5) - Bug 1191354 part 10 - More features for OwningNonNull; r=froydnj (8e365d079a) - Bug 1191354 part 11 - Clean up nsHTMLEditRules::WillOutdent; r=ehsan (0c59a81c10) - Bug 1191354 part 12 - Clean up nsHTMLEditRules::OutdentPartOfBlock; r=ehsan (243d7ab42f) - Bug 1191354 part 13 - Clean up nsHTMLEditRules::SplitBlock; r=ehsan (c1141ab04d) - Bug 1191356 part 1 - Clean up nsHTMLEditRules::RemoveListStructure; r=ehsan (1d2ad5faa6) - Bug 1191356 part 2 - Clean up nsHTMLEditor::RemoveBlockContainer; r=ehsan (a9d140f511) - Bug 1191356 part 3 - Clean up nsHTMLEditRules::MoveBlock; r=ehsan (6bc14cd40c) - Bug 1191356 part 4 - Clean up nsHTMLEditRules::MoveNodeSmart, MoveContents; r=ehsan (00e6536e47) - Bug 1191356 part 5 - Clean up nsHTMLEditRules::RelativeChangeIndentationOfElementNode; r=ehsan (c3139c7d90) - Bug 1191356 part 6 - Clean up nsHTMLEditRules::WillMakeBasicBlock; r=ehsan (b3f73c2e12) - Bug 1191356 part 7 - Clean up nsHTMLEditor::GetSelectionContainer; r=ehsan (091e999587) - Bug 1191356 part 8 - Clean up nsHTMLEditRules::WillAbsolutePosition; r=ehsan (9982c65a99) - Bug 1208884 - Fix a few null check ordering bugs in nsHTMLEditRules::SplitParagraph; r=roc (d04eece297) - Bug 1209037 - Eliminate some unneeded null checks; r=jdm (b35d5308c5) - Bug 1191356 part 9 - Convert nsHTMLEditRules::mNewBlock to Element; r=ehsan (f374780e22) - Bug 1253734 - Add some more editor things to CC traversal. r=mccr8. (94a0c77bb1) - Bug 1193762 part 1 - Remove nsEditor::IsBlockNode(nsIDOMNode*); r=ehsan (5e107cbdbb) - Bug 1193762 part 2 - Remove nsHTMLEditor::IsVisBreak(nsIDOMNode*); r=ehsan (5e61c27d21) - Bug 1193762 part 3 - Remove nsEditor::IsDescendantOfEditorRoot(nsIDOMNode*); r=ehsan (022a37d442) - Bug 1193762 part 4 - Avoid nsCOMPtr in ternary operator; r=froydnj (e4bc35cbe0) - Bug 1193762 part 5 - Convert DecodePool::threads to nsTArray; r=froydnj (c61f063f4d) - Bug 1193762 part 6 - Return raw pointer, not nsCOMPtr; r=froydnj (a43c30f92e) - Bug 1193762 part 7 - Use .get() when assigning to variables; r=froydnj (a61ad819f0) - Bug 1193762 part 8 - Fix things that will break; r=froydnj (40a76db662) - Bug 1193762 part 9 - Delete nsCOMPtr<T>::operator T*()&&; r=froydnj (022c1f0dba) - Bug 1168223 - Fix a crash caused by unexpected flushes under nsIEditor::SetFlags. r=ehsan (cc49d468b8) - Bug 1158837 - Ensure the start and end nodes are non-null before using them. r=roc (7c28121aa7) - Bug 1269047 - Remove chained ENSURE calls from GetStartNodeAndOffset. r=ehsan (f36c1c67aa) - Bug 1248078 - Remove the dedicated scroll acknowledgement message. r=botond (500b8d7574) - Bug 1260806: Remove some more dead MessageLoop code. r=jld (1c223cafe8) - Bug 1266595: Replace Chromium Task with Runnable. r=froydnj (5c1c056c83) - Bug 1242343 - p1. ConstructSystem32Path from LoadLibrarySystem32 - r=jimm (b28fcbc0c4) - Bug 1242343 - p2. Blacklist msmpeg2vdec.dll 12.0.9200.16426 & .17037 - r=cpearce (9a71795ab0) - Bug 1253395 - Disable msmpeg2vdec.dll blackslisting - r=cpearce (e1d4dc47be) - Bug 1242456 - Create RAIIs to manage HGLOBAL and printer HANDLE in ShowNativePrintDialog and CreateGlobalDevModeAndInit. r=jimm, r=bobowen (a22cecaebd) - Bug 1262399 - remove Impl suffixes from nsSupports* implementations; r=mccr8 (6733db9394) - Bug 1268772 (part 1) - Remove nsCheapSet::Put()'s return value. r=erahm. (5f3f553e84) - Bug 1268772 (part 2) - Make infallible nsVariant methods return |void| instead of |nsresult|. r=erahm. (22ae74fdaf) - Bug 1268772 (part 3) - Remove NS_NewWindowsRegKey()'s return value. r=erahm. (dc32bd698e) - Bug 1268772 (part 4) - Use MOZ_MUST_USE with NS_NewISupportsArray(). r=erahm. (e51ecfdf9f) - Bug 1268772 (part 5) - Use MOZ_MUST_USE in other parts of xpcom/ds/. r=erahm. (4d8a5183eb) - Bug 1266027 part 1 - make the MediaDecoderReaderWrapper as a proxy of requesting media data; r=jwwang (fbaa79019d) - Bug 1195601 - Remove MediaDecoderStateMachine::mLogicallySeeking. r=kinetik. (5ab1ff1ca0) - Bug 1266027 part 2 - make MDSM and SeekTask to adopt new MediaDecoderReaderWrapper API; r=jwwang (1961e26e80) - add mac specific dupes (4e4ff4b123) - Bug 1269262 - Unbreak build without NO_EXPAND_LIBS in js/src/moz.build after bug 1239083. r=ted (46d2dec64a) - Bug 1253215 - Initialize RequestSyncService only if its pref is enabled, r=ehsan (aec1b2f889) - Bug 1269303 - Remove RequestSync API, r=fabrice (f774336e34)
305 lines
8.1 KiB
C++
305 lines
8.1 KiB
C++
/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
|
|
/* 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/. */
|
|
|
|
#include "mozilla/plugins/BrowserStreamChild.h"
|
|
|
|
#include "mozilla/Attributes.h"
|
|
#include "mozilla/plugins/PluginInstanceChild.h"
|
|
#include "mozilla/plugins/StreamNotifyChild.h"
|
|
|
|
namespace mozilla {
|
|
namespace plugins {
|
|
|
|
BrowserStreamChild::BrowserStreamChild(PluginInstanceChild* instance,
|
|
const nsCString& url,
|
|
const uint32_t& length,
|
|
const uint32_t& lastmodified,
|
|
StreamNotifyChild* notifyData,
|
|
const nsCString& headers)
|
|
: mInstance(instance)
|
|
, mStreamStatus(kStreamOpen)
|
|
, mDestroyPending(NOT_DESTROYED)
|
|
, mNotifyPending(false)
|
|
, mStreamAsFilePending(false)
|
|
, mInstanceDying(false)
|
|
, mState(CONSTRUCTING)
|
|
, mURL(url)
|
|
, mHeaders(headers)
|
|
, mStreamNotify(notifyData)
|
|
, mDeliveryTracker(this)
|
|
{
|
|
PLUGIN_LOG_DEBUG(("%s (%s, %i, %i, %p, %s)", FULLFUNCTION,
|
|
url.get(), length, lastmodified, (void*) notifyData,
|
|
headers.get()));
|
|
|
|
AssertPluginThread();
|
|
|
|
memset(&mStream, 0, sizeof(mStream));
|
|
mStream.ndata = static_cast<AStream*>(this);
|
|
mStream.url = NullableStringGet(mURL);
|
|
mStream.end = length;
|
|
mStream.lastmodified = lastmodified;
|
|
mStream.headers = NullableStringGet(mHeaders);
|
|
if (notifyData) {
|
|
mStream.notifyData = notifyData->mClosure;
|
|
notifyData->SetAssociatedStream(this);
|
|
}
|
|
}
|
|
|
|
NPError
|
|
BrowserStreamChild::StreamConstructed(
|
|
const nsCString& mimeType,
|
|
const bool& seekable,
|
|
uint16_t* stype)
|
|
{
|
|
NPError rv = NPERR_NO_ERROR;
|
|
|
|
*stype = NP_NORMAL;
|
|
rv = mInstance->mPluginIface->newstream(
|
|
&mInstance->mData, const_cast<char*>(NullableStringGet(mimeType)),
|
|
&mStream, seekable, stype);
|
|
if (rv != NPERR_NO_ERROR) {
|
|
mState = DELETING;
|
|
if (mStreamNotify) {
|
|
mStreamNotify->SetAssociatedStream(nullptr);
|
|
mStreamNotify = nullptr;
|
|
}
|
|
}
|
|
else {
|
|
mState = ALIVE;
|
|
}
|
|
|
|
return rv;
|
|
}
|
|
|
|
BrowserStreamChild::~BrowserStreamChild()
|
|
{
|
|
NS_ASSERTION(!mStreamNotify, "Should have nulled it by now!");
|
|
}
|
|
|
|
bool
|
|
BrowserStreamChild::RecvWrite(const int32_t& offset,
|
|
const uint32_t& newlength,
|
|
const Buffer& data)
|
|
{
|
|
PLUGIN_LOG_DEBUG_FUNCTION;
|
|
|
|
AssertPluginThread();
|
|
|
|
if (ALIVE != mState)
|
|
NS_RUNTIMEABORT("Unexpected state: received data after NPP_DestroyStream?");
|
|
|
|
if (kStreamOpen != mStreamStatus)
|
|
return true;
|
|
|
|
mStream.end = newlength;
|
|
|
|
NS_ASSERTION(data.Length() > 0, "Empty data");
|
|
|
|
PendingData* newdata = mPendingData.AppendElement();
|
|
newdata->offset = offset;
|
|
newdata->data = data;
|
|
newdata->curpos = 0;
|
|
|
|
EnsureDeliveryPending();
|
|
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
BrowserStreamChild::RecvNPP_StreamAsFile(const nsCString& fname)
|
|
{
|
|
PLUGIN_LOG_DEBUG(("%s (fname=%s)", FULLFUNCTION, fname.get()));
|
|
|
|
AssertPluginThread();
|
|
|
|
if (ALIVE != mState)
|
|
NS_RUNTIMEABORT("Unexpected state: received file after NPP_DestroyStream?");
|
|
|
|
if (kStreamOpen != mStreamStatus)
|
|
return true;
|
|
|
|
mStreamAsFilePending = true;
|
|
mStreamAsFileName = fname;
|
|
EnsureDeliveryPending();
|
|
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
BrowserStreamChild::RecvNPP_DestroyStream(const NPReason& reason)
|
|
{
|
|
PLUGIN_LOG_DEBUG_METHOD;
|
|
|
|
if (ALIVE != mState)
|
|
NS_RUNTIMEABORT("Unexpected state: recevied NPP_DestroyStream twice?");
|
|
|
|
mState = DYING;
|
|
mDestroyPending = DESTROY_PENDING;
|
|
if (NPRES_DONE != reason)
|
|
mStreamStatus = reason;
|
|
|
|
EnsureDeliveryPending();
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
BrowserStreamChild::Recv__delete__()
|
|
{
|
|
AssertPluginThread();
|
|
|
|
if (DELETING != mState)
|
|
NS_RUNTIMEABORT("Bad state, not DELETING");
|
|
|
|
return true;
|
|
}
|
|
|
|
NPError
|
|
BrowserStreamChild::NPN_RequestRead(NPByteRange* aRangeList)
|
|
{
|
|
PLUGIN_LOG_DEBUG_FUNCTION;
|
|
|
|
AssertPluginThread();
|
|
|
|
if (ALIVE != mState || kStreamOpen != mStreamStatus)
|
|
return NPERR_GENERIC_ERROR;
|
|
|
|
IPCByteRanges ranges;
|
|
for (; aRangeList; aRangeList = aRangeList->next) {
|
|
IPCByteRange br = {aRangeList->offset, aRangeList->length};
|
|
ranges.AppendElement(br);
|
|
}
|
|
|
|
NPError result;
|
|
CallNPN_RequestRead(ranges, &result);
|
|
return result;
|
|
}
|
|
|
|
void
|
|
BrowserStreamChild::NPN_DestroyStream(NPReason reason)
|
|
{
|
|
mStreamStatus = reason;
|
|
if (ALIVE == mState)
|
|
SendNPN_DestroyStream(reason);
|
|
|
|
EnsureDeliveryPending();
|
|
}
|
|
|
|
void
|
|
BrowserStreamChild::EnsureDeliveryPending()
|
|
{
|
|
MessageLoop::current()->PostTask(
|
|
mDeliveryTracker.NewRunnableMethod(&BrowserStreamChild::Deliver));
|
|
}
|
|
|
|
void
|
|
BrowserStreamChild::Deliver()
|
|
{
|
|
while (kStreamOpen == mStreamStatus && mPendingData.Length()) {
|
|
if (DeliverPendingData() && kStreamOpen == mStreamStatus) {
|
|
SetSuspendedTimer();
|
|
return;
|
|
}
|
|
}
|
|
ClearSuspendedTimer();
|
|
|
|
NS_ASSERTION(kStreamOpen != mStreamStatus || 0 == mPendingData.Length(),
|
|
"Exit out of the data-delivery loop with pending data");
|
|
mPendingData.Clear();
|
|
|
|
// NPP_StreamAsFile() is documented (at MDN) to be called "when the stream
|
|
// is complete" -- i.e. after all calls to NPP_WriteReady() and NPP_Write()
|
|
// have finished. We make these calls asynchronously (from
|
|
// DeliverPendingData()). So we need to make sure all the "pending data"
|
|
// has been "delivered" before calling NPP_StreamAsFile() (also
|
|
// asynchronously). Doing this resolves bug 687610, bug 670036 and possibly
|
|
// also other bugs.
|
|
if (mStreamAsFilePending) {
|
|
if (mStreamStatus == kStreamOpen)
|
|
mInstance->mPluginIface->asfile(&mInstance->mData, &mStream,
|
|
mStreamAsFileName.get());
|
|
mStreamAsFilePending = false;
|
|
}
|
|
|
|
if (DESTROY_PENDING == mDestroyPending) {
|
|
mDestroyPending = DESTROYED;
|
|
if (mState != DYING)
|
|
NS_RUNTIMEABORT("mDestroyPending but state not DYING");
|
|
|
|
NS_ASSERTION(NPRES_DONE != mStreamStatus, "Success status set too early!");
|
|
if (kStreamOpen == mStreamStatus)
|
|
mStreamStatus = NPRES_DONE;
|
|
|
|
(void) mInstance->mPluginIface
|
|
->destroystream(&mInstance->mData, &mStream, mStreamStatus);
|
|
}
|
|
if (DESTROYED == mDestroyPending && mNotifyPending) {
|
|
NS_ASSERTION(mStreamNotify, "mDestroyPending but no mStreamNotify?");
|
|
|
|
mNotifyPending = false;
|
|
mStreamNotify->NPP_URLNotify(mStreamStatus);
|
|
delete mStreamNotify;
|
|
mStreamNotify = nullptr;
|
|
}
|
|
if (DYING == mState && DESTROYED == mDestroyPending
|
|
&& !mStreamNotify && !mInstanceDying) {
|
|
SendStreamDestroyed();
|
|
mState = DELETING;
|
|
}
|
|
}
|
|
|
|
bool
|
|
BrowserStreamChild::DeliverPendingData()
|
|
{
|
|
if (mState != ALIVE && mState != DYING)
|
|
NS_RUNTIMEABORT("Unexpected state");
|
|
|
|
NS_ASSERTION(mPendingData.Length(), "Called from Deliver with empty pending");
|
|
|
|
while (mPendingData[0].curpos < static_cast<int32_t>(mPendingData[0].data.Length())) {
|
|
int32_t r = mInstance->mPluginIface->writeready(&mInstance->mData, &mStream);
|
|
if (kStreamOpen != mStreamStatus)
|
|
return false;
|
|
if (0 == r) // plugin wants to suspend delivery
|
|
return true;
|
|
|
|
r = mInstance->mPluginIface->write(
|
|
&mInstance->mData, &mStream,
|
|
mPendingData[0].offset + mPendingData[0].curpos, // offset
|
|
mPendingData[0].data.Length() - mPendingData[0].curpos, // length
|
|
const_cast<char*>(mPendingData[0].data.BeginReading() + mPendingData[0].curpos));
|
|
if (kStreamOpen != mStreamStatus)
|
|
return false;
|
|
if (0 == r)
|
|
return true;
|
|
if (r < 0) { // error condition
|
|
NPN_DestroyStream(NPRES_NETWORK_ERR);
|
|
return false;
|
|
}
|
|
mPendingData[0].curpos += r;
|
|
}
|
|
mPendingData.RemoveElementAt(0);
|
|
return false;
|
|
}
|
|
|
|
void
|
|
BrowserStreamChild::SetSuspendedTimer()
|
|
{
|
|
if (mSuspendedTimer.IsRunning())
|
|
return;
|
|
mSuspendedTimer.Start(
|
|
base::TimeDelta::FromMilliseconds(100), // 100ms copied from Mozilla plugin host
|
|
this, &BrowserStreamChild::Deliver);
|
|
}
|
|
|
|
void
|
|
BrowserStreamChild::ClearSuspendedTimer()
|
|
{
|
|
mSuspendedTimer.Stop();
|
|
}
|
|
|
|
} /* namespace plugins */
|
|
} /* namespace mozilla */
|