Bug 784131 - Cleanup some dead code from nsObjectLoadingContent. r=josh

This commit is contained in:
John Schoenick 2012-08-06 14:00:17 -07:00
Родитель 25518570a0
Коммит 413b2e3042
2 изменённых файлов: 3 добавлений и 20 удалений

Просмотреть файл

@ -671,8 +671,7 @@ nsObjectLoadingContent::nsObjectLoadingContent()
, mPlayPreviewCanceled(false)
, mIsStopping(false)
, mIsLoading(false)
, mScriptRequested(false)
, mSrcStreamLoading(false) {}
, mScriptRequested(false) {}
nsObjectLoadingContent::~nsObjectLoadingContent()
{
@ -1251,7 +1250,7 @@ nsObjectLoadingContent::UpdateObjectParameters()
// XXX(johns): Our de-facto behavior since forever was to refuse to load
// Objects who don't have a classid we support, regardless of other type
// or uri info leads to a valid plugin.
newMime.Assign("");
newMime.Truncate();
stateInvalid = true;
}
}
@ -1371,7 +1370,7 @@ nsObjectLoadingContent::UpdateObjectParameters()
if (NS_FAILED(rv)) {
NS_NOTREACHED("GetContentType failed");
stateInvalid = true;
channelType.Assign("");
channelType.Truncate();
}
LOG(("OBJLC [%p]: Channel has a content type of %s", this, channelType.get()));

Просмотреть файл

@ -26,8 +26,6 @@
class nsAsyncInstantiateEvent;
class nsStopPluginRunnable;
class AutoNotifier;
class AutoFallback;
class AutoSetInstantiatingToFalse;
class nsObjectFrame;
class nsFrameLoader;
@ -132,12 +130,6 @@ class nsObjectLoadingContent : public nsImageLoadingContent
*/
void NotifyOwnerDocumentActivityChanged();
/**
* Used by pluginHost to know if we're loading with a channel, so it
* will not open its own.
*/
bool SrcStreamLoading() { return mSrcStreamLoading; }
/**
* When a plug-in is instantiated, it can create a scriptable
* object that the page wants to interact with. We expose this
@ -526,14 +518,6 @@ class nsObjectLoadingContent : public nsImageLoadingContent
// whether content js has tried to access the plugin script object.
bool mScriptRequested : 1;
// Used to track when we might try to instantiate a plugin instance based on
// a src data stream being delivered to this object. When this is true we
// don't want plugin instance instantiation code to attempt to load src data
// again or we'll deliver duplicate streams. Should be cleared when we are
// not loading src data.
bool mSrcStreamLoading : 1;
nsWeakFrame mPrintFrame;
nsRefPtr<nsPluginInstanceOwner> mInstanceOwner;