mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Backed out 2 changesets (bug 1224374) for Windows bustage. r=bustage on a CLOSED TREE
Backed out changeset 5f458e6e4997 (bug 1224374) Backed out changeset 0dc02cb0b604 (bug 1224374)
This commit is contained in:
parent
ce54498262
commit
e687c33b0f
@ -141,7 +141,6 @@ NotificationController::IsUpdatePending()
|
|||||||
void
|
void
|
||||||
NotificationController::WillRefresh(mozilla::TimeStamp aTime)
|
NotificationController::WillRefresh(mozilla::TimeStamp aTime)
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
|
|
||||||
Telemetry::AutoTimer<Telemetry::A11Y_UPDATE_TIME> updateTimer;
|
Telemetry::AutoTimer<Telemetry::A11Y_UPDATE_TIME> updateTimer;
|
||||||
|
|
||||||
// If the document accessible that notification collector was created for is
|
// If the document accessible that notification collector was created for is
|
||||||
|
@ -781,7 +781,6 @@ bool
|
|||||||
nsFrameLoader::ShowRemoteFrame(const ScreenIntSize& size,
|
nsFrameLoader::ShowRemoteFrame(const ScreenIntSize& size,
|
||||||
nsSubDocumentFrame *aFrame)
|
nsSubDocumentFrame *aFrame)
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::GRAPHICS);
|
|
||||||
NS_ASSERTION(IsRemoteFrame(), "ShowRemote only makes sense on remote frames.");
|
NS_ASSERTION(IsRemoteFrame(), "ShowRemote only makes sense on remote frames.");
|
||||||
|
|
||||||
if (!mRemoteBrowser && !TryRemoteBrowser()) {
|
if (!mRemoteBrowser && !TryRemoteBrowser()) {
|
||||||
|
@ -1335,8 +1335,6 @@ nsJSContext::ShrinkGCBuffersNow()
|
|||||||
static void
|
static void
|
||||||
FinishAnyIncrementalGC()
|
FinishAnyIncrementalGC()
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::GC);
|
|
||||||
|
|
||||||
if (sCCLockedOut) {
|
if (sCCLockedOut) {
|
||||||
// We're in the middle of an incremental GC, so finish it.
|
// We're in the middle of an incremental GC, so finish it.
|
||||||
JS::PrepareForIncrementalGC(sRuntime);
|
JS::PrepareForIncrementalGC(sRuntime);
|
||||||
|
@ -3102,7 +3102,6 @@ nsObjectLoadingContent::DoStopPlugin(nsPluginInstanceOwner* aInstanceOwner,
|
|||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsObjectLoadingContent::StopPluginInstance()
|
nsObjectLoadingContent::StopPluginInstance()
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
|
|
||||||
// Clear any pending events
|
// Clear any pending events
|
||||||
mPendingInstantiateEvent = nullptr;
|
mPendingInstantiateEvent = nullptr;
|
||||||
mPendingCheckPluginStopEvent = nullptr;
|
mPendingCheckPluginStopEvent = nullptr;
|
||||||
|
@ -1237,8 +1237,6 @@ ContentParent::CreateBrowserOrApp(const TabContext& aContext,
|
|||||||
Element* aFrameElement,
|
Element* aFrameElement,
|
||||||
ContentParent* aOpenerContentParent)
|
ContentParent* aOpenerContentParent)
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
|
|
||||||
|
|
||||||
if (!sCanLaunchSubprocesses) {
|
if (!sCanLaunchSubprocesses) {
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
@ -2388,8 +2386,6 @@ ContentParent::InitializeMembers()
|
|||||||
bool
|
bool
|
||||||
ContentParent::LaunchSubprocess(ProcessPriority aInitialPriority /* = PROCESS_PRIORITY_FOREGROUND */)
|
ContentParent::LaunchSubprocess(ProcessPriority aInitialPriority /* = PROCESS_PRIORITY_FOREGROUND */)
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
|
|
||||||
|
|
||||||
std::vector<std::string> extraArgs;
|
std::vector<std::string> extraArgs;
|
||||||
if (mIsNuwaProcess) {
|
if (mIsNuwaProcess) {
|
||||||
extraArgs.push_back("-nuwa");
|
extraArgs.push_back("-nuwa");
|
||||||
@ -3646,8 +3642,6 @@ ContentParent::ForceKillTimerCallback(nsITimer* aTimer, void* aClosure)
|
|||||||
void
|
void
|
||||||
ContentParent::KillHard(const char* aReason)
|
ContentParent::KillHard(const char* aReason)
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
|
|
||||||
|
|
||||||
// On Windows, calling KillHard multiple times causes problems - the
|
// On Windows, calling KillHard multiple times causes problems - the
|
||||||
// process handle becomes invalid on the first call, causing a second call
|
// process handle becomes invalid on the first call, causing a second call
|
||||||
// to crash our process - more details in bug 890840.
|
// to crash our process - more details in bug 890840.
|
||||||
|
@ -196,8 +196,6 @@ SapiService::~SapiService()
|
|||||||
bool
|
bool
|
||||||
SapiService::Init()
|
SapiService::Init()
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
|
|
||||||
|
|
||||||
MOZ_ASSERT(!mInitialized);
|
MOZ_ASSERT(!mInitialized);
|
||||||
|
|
||||||
if (Preferences::GetBool("media.webspeech.synth.test") ||
|
if (Preferences::GetBool("media.webspeech.synth.test") ||
|
||||||
|
@ -1646,8 +1646,6 @@ NPObjWrapper_Resolve(JSContext *cx, JS::Handle<JSObject*> obj, JS::Handle<jsid>
|
|||||||
if (JSID_IS_SYMBOL(id))
|
if (JSID_IS_SYMBOL(id))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::JS);
|
|
||||||
|
|
||||||
NPObject *npobj = GetNPObject(cx, obj);
|
NPObject *npobj = GetNPObject(cx, obj);
|
||||||
|
|
||||||
if (!npobj || !npobj->_class || !npobj->_class->hasProperty ||
|
if (!npobj || !npobj->_class || !npobj->_class->hasProperty ||
|
||||||
@ -2112,8 +2110,6 @@ static bool
|
|||||||
NPObjectMember_GetProperty(JSContext *cx, JS::HandleObject obj, JS::HandleId id,
|
NPObjectMember_GetProperty(JSContext *cx, JS::HandleObject obj, JS::HandleId id,
|
||||||
JS::MutableHandleValue vp)
|
JS::MutableHandleValue vp)
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
|
|
||||||
|
|
||||||
if (JSID_IS_SYMBOL(id)) {
|
if (JSID_IS_SYMBOL(id)) {
|
||||||
JS::RootedSymbol sym(cx, JSID_TO_SYMBOL(id));
|
JS::RootedSymbol sym(cx, JSID_TO_SYMBOL(id));
|
||||||
if (JS::GetSymbolCode(sym) == JS::SymbolCode::toPrimitive) {
|
if (JS::GetSymbolCode(sym) == JS::SymbolCode::toPrimitive) {
|
||||||
|
@ -265,8 +265,6 @@ nsNPAPIPlugin::RunPluginOOP(const nsPluginTag *aPluginTag)
|
|||||||
inline PluginLibrary*
|
inline PluginLibrary*
|
||||||
GetNewPluginLibrary(nsPluginTag *aPluginTag)
|
GetNewPluginLibrary(nsPluginTag *aPluginTag)
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
|
|
||||||
|
|
||||||
if (!aPluginTag) {
|
if (!aPluginTag) {
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
@ -285,7 +283,6 @@ GetNewPluginLibrary(nsPluginTag *aPluginTag)
|
|||||||
nsresult
|
nsresult
|
||||||
nsNPAPIPlugin::CreatePlugin(nsPluginTag *aPluginTag, nsNPAPIPlugin** aResult)
|
nsNPAPIPlugin::CreatePlugin(nsPluginTag *aPluginTag, nsNPAPIPlugin** aResult)
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
|
|
||||||
*aResult = nullptr;
|
*aResult = nullptr;
|
||||||
|
|
||||||
if (!aPluginTag) {
|
if (!aPluginTag) {
|
||||||
|
@ -280,7 +280,6 @@ nsNPAPIPluginInstance::StopTime()
|
|||||||
|
|
||||||
nsresult nsNPAPIPluginInstance::Initialize(nsNPAPIPlugin *aPlugin, nsPluginInstanceOwner* aOwner, const nsACString& aMIMEType)
|
nsresult nsNPAPIPluginInstance::Initialize(nsNPAPIPlugin *aPlugin, nsPluginInstanceOwner* aOwner, const nsACString& aMIMEType)
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
|
|
||||||
PLUGIN_LOG(PLUGIN_LOG_NORMAL, ("nsNPAPIPluginInstance::Initialize this=%p\n",this));
|
PLUGIN_LOG(PLUGIN_LOG_NORMAL, ("nsNPAPIPluginInstance::Initialize this=%p\n",this));
|
||||||
|
|
||||||
NS_ENSURE_ARG_POINTER(aPlugin);
|
NS_ENSURE_ARG_POINTER(aPlugin);
|
||||||
@ -656,8 +655,6 @@ nsresult nsNPAPIPluginInstance::HandleEvent(void* event, int16_t* result,
|
|||||||
if (RUNNING != mRunning)
|
if (RUNNING != mRunning)
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
|
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
|
|
||||||
|
|
||||||
if (!event)
|
if (!event)
|
||||||
return NS_ERROR_FAILURE;
|
return NS_ERROR_FAILURE;
|
||||||
|
|
||||||
|
@ -286,7 +286,6 @@ nsNPAPIPluginStreamListener::CallURLNotify(NPReason reason)
|
|||||||
nsresult
|
nsresult
|
||||||
nsNPAPIPluginStreamListener::OnStartBinding(nsPluginStreamListenerPeer* streamPeer)
|
nsNPAPIPluginStreamListener::OnStartBinding(nsPluginStreamListenerPeer* streamPeer)
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
|
|
||||||
if (!mInst || !mInst->CanFireNotifications() || mStreamCleanedUp)
|
if (!mInst || !mInst->CanFireNotifications() || mStreamCleanedUp)
|
||||||
return NS_ERROR_FAILURE;
|
return NS_ERROR_FAILURE;
|
||||||
|
|
||||||
|
@ -1366,7 +1366,6 @@ nsresult nsPluginHost::EnsurePluginLoaded(nsPluginTag* aPluginTag)
|
|||||||
nsresult
|
nsresult
|
||||||
nsPluginHost::GetPluginForContentProcess(uint32_t aPluginId, nsNPAPIPlugin** aPlugin)
|
nsPluginHost::GetPluginForContentProcess(uint32_t aPluginId, nsNPAPIPlugin** aPlugin)
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
|
|
||||||
MOZ_ASSERT(XRE_IsParentProcess());
|
MOZ_ASSERT(XRE_IsParentProcess());
|
||||||
|
|
||||||
// If plugins haven't been scanned yet, do so now
|
// If plugins haven't been scanned yet, do so now
|
||||||
@ -3522,7 +3521,6 @@ nsPluginHost::AddHeadersToChannel(const char *aHeadersData,
|
|||||||
nsresult
|
nsresult
|
||||||
nsPluginHost::StopPluginInstance(nsNPAPIPluginInstance* aInstance)
|
nsPluginHost::StopPluginInstance(nsNPAPIPluginInstance* aInstance)
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
|
|
||||||
if (PluginDestructionGuard::DelayDestroy(aInstance)) {
|
if (PluginDestructionGuard::DelayDestroy(aInstance)) {
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
@ -3600,8 +3600,6 @@ nsPluginInstanceOwner::UpdateWindowVisibility(bool aVisible)
|
|||||||
void
|
void
|
||||||
nsPluginInstanceOwner::UpdateDocumentActiveState(bool aIsActive)
|
nsPluginInstanceOwner::UpdateDocumentActiveState(bool aIsActive)
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
|
|
||||||
|
|
||||||
mPluginDocumentActiveState = aIsActive;
|
mPluginDocumentActiveState = aIsActive;
|
||||||
#ifndef XP_MACOSX
|
#ifndef XP_MACOSX
|
||||||
UpdateWindowPositionAndClipRect(true);
|
UpdateWindowPositionAndClipRect(true);
|
||||||
|
@ -110,7 +110,6 @@ mozilla::plugins::SetupBridge(uint32_t aPluginId,
|
|||||||
nsresult* rv,
|
nsresult* rv,
|
||||||
uint32_t* runID)
|
uint32_t* runID)
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
|
|
||||||
if (NS_WARN_IF(!rv) || NS_WARN_IF(!runID)) {
|
if (NS_WARN_IF(!rv) || NS_WARN_IF(!runID)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -154,7 +154,6 @@ DOMStorageDBThread::Shutdown()
|
|||||||
void
|
void
|
||||||
DOMStorageDBThread::SyncPreload(DOMStorageCacheBridge* aCache, bool aForceSync)
|
DOMStorageDBThread::SyncPreload(DOMStorageCacheBridge* aCache, bool aForceSync)
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::STORAGE);
|
|
||||||
if (!aForceSync && aCache->LoadedCount()) {
|
if (!aForceSync && aCache->LoadedCount()) {
|
||||||
// Preload already started for this cache, just wait for it to finish.
|
// Preload already started for this cache, just wait for it to finish.
|
||||||
// LoadWait will exit after LoadDone on the cache has been called.
|
// LoadWait will exit after LoadDone on the cache has been called.
|
||||||
|
@ -206,7 +206,6 @@ static void DestroyTextureData(TextureData* aTextureData, ISurfaceAllocator* aAl
|
|||||||
void
|
void
|
||||||
TextureChild::ActorDestroy(ActorDestroyReason why)
|
TextureChild::ActorDestroy(ActorDestroyReason why)
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::GRAPHICS);
|
|
||||||
mWaitForRecycle = nullptr;
|
mWaitForRecycle = nullptr;
|
||||||
|
|
||||||
if (mTextureData) {
|
if (mTextureData) {
|
||||||
|
@ -524,8 +524,6 @@ gfxDWriteFontEntry::GetFontTable(uint32_t aTag)
|
|||||||
nsresult
|
nsresult
|
||||||
gfxDWriteFontEntry::ReadCMAP(FontInfoData *aFontInfoData)
|
gfxDWriteFontEntry::ReadCMAP(FontInfoData *aFontInfoData)
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::GRAPHICS);
|
|
||||||
|
|
||||||
// attempt this once, if errors occur leave a blank cmap
|
// attempt this once, if errors occur leave a blank cmap
|
||||||
if (mCharacterMap) {
|
if (mCharacterMap) {
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
|
@ -143,8 +143,6 @@ GDIFontEntry::GDIFontEntry(const nsAString& aFaceName,
|
|||||||
nsresult
|
nsresult
|
||||||
GDIFontEntry::ReadCMAP(FontInfoData *aFontInfoData)
|
GDIFontEntry::ReadCMAP(FontInfoData *aFontInfoData)
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
|
|
||||||
|
|
||||||
// attempt this once, if errors occur leave a blank cmap
|
// attempt this once, if errors occur leave a blank cmap
|
||||||
if (mCharacterMap) {
|
if (mCharacterMap) {
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
|
@ -1205,8 +1205,6 @@ InvalidateWindowForDeviceReset(HWND aWnd, LPARAM aMsg)
|
|||||||
bool
|
bool
|
||||||
gfxWindowsPlatform::UpdateForDeviceReset()
|
gfxWindowsPlatform::UpdateForDeviceReset()
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::GRAPHICS);
|
|
||||||
|
|
||||||
if (!DidRenderingDeviceReset()) {
|
if (!DidRenderingDeviceReset()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -79,7 +79,6 @@ FrameAnimator::AdvanceFrame(TimeStamp aTime)
|
|||||||
{
|
{
|
||||||
NS_ASSERTION(aTime <= TimeStamp::Now(),
|
NS_ASSERTION(aTime <= TimeStamp::Now(),
|
||||||
"Given time appears to be in the future");
|
"Given time appears to be in the future");
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::GRAPHICS);
|
|
||||||
|
|
||||||
uint32_t currentFrameIndex = mCurrentAnimationFrameIndex;
|
uint32_t currentFrameIndex = mCurrentAnimationFrameIndex;
|
||||||
uint32_t nextFrameIndex = currentFrameIndex + 1;
|
uint32_t nextFrameIndex = currentFrameIndex + 1;
|
||||||
|
@ -381,8 +381,6 @@ GeckoChildProcessHost::AsyncLaunch(std::vector<std::string> aExtraOpts,
|
|||||||
bool
|
bool
|
||||||
GeckoChildProcessHost::WaitUntilConnected(int32_t aTimeoutMs)
|
GeckoChildProcessHost::WaitUntilConnected(int32_t aTimeoutMs)
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
|
|
||||||
|
|
||||||
// NB: this uses a different mechanism than the chromium parent
|
// NB: this uses a different mechanism than the chromium parent
|
||||||
// class.
|
// class.
|
||||||
PRIntervalTime timeoutTicks = (aTimeoutMs > 0) ?
|
PRIntervalTime timeoutTicks = (aTimeoutMs > 0) ?
|
||||||
|
@ -145,7 +145,6 @@ const char CPOWProxyHandler::family = 0;
|
|||||||
const CPOWProxyHandler CPOWProxyHandler::singleton;
|
const CPOWProxyHandler CPOWProxyHandler::singleton;
|
||||||
|
|
||||||
#define FORWARD(call, args) \
|
#define FORWARD(call, args) \
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::JS); \
|
|
||||||
WrapperOwner* owner = OwnerOf(proxy); \
|
WrapperOwner* owner = OwnerOf(proxy); \
|
||||||
if (!owner->active()) { \
|
if (!owner->active()) { \
|
||||||
JS_ReportError(cx, "cannot use a CPOW whose process is gone"); \
|
JS_ReportError(cx, "cannot use a CPOW whose process is gone"); \
|
||||||
|
@ -3010,7 +3010,6 @@ nsXPCComponents_Utils::SetGCZeal(int32_t aValue, JSContext* cx)
|
|||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsXPCComponents_Utils::NukeSandbox(HandleValue obj, JSContext* cx)
|
nsXPCComponents_Utils::NukeSandbox(HandleValue obj, JSContext* cx)
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::JS);
|
|
||||||
NS_ENSURE_TRUE(obj.isObject(), NS_ERROR_INVALID_ARG);
|
NS_ENSURE_TRUE(obj.isObject(), NS_ERROR_INVALID_ARG);
|
||||||
JSObject* wrapper = &obj.toObject();
|
JSObject* wrapper = &obj.toObject();
|
||||||
NS_ENSURE_TRUE(IsWrapper(wrapper), NS_ERROR_INVALID_ARG);
|
NS_ENSURE_TRUE(IsWrapper(wrapper), NS_ERROR_INVALID_ARG);
|
||||||
|
@ -14,8 +14,6 @@
|
|||||||
#include "mozilla/dom/BindingUtils.h"
|
#include "mozilla/dom/BindingUtils.h"
|
||||||
#include "nsGlobalWindow.h"
|
#include "nsGlobalWindow.h"
|
||||||
|
|
||||||
#include "GeckoProfiler.h"
|
|
||||||
|
|
||||||
#include "nsID.h"
|
#include "nsID.h"
|
||||||
|
|
||||||
using namespace js;
|
using namespace js;
|
||||||
@ -174,8 +172,6 @@ bool
|
|||||||
AddonWrapper<Base>::get(JSContext* cx, JS::Handle<JSObject*> wrapper, JS::Handle<Value> receiver,
|
AddonWrapper<Base>::get(JSContext* cx, JS::Handle<JSObject*> wrapper, JS::Handle<Value> receiver,
|
||||||
JS::Handle<jsid> id, JS::MutableHandle<JS::Value> vp) const
|
JS::Handle<jsid> id, JS::MutableHandle<JS::Value> vp) const
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
|
|
||||||
|
|
||||||
Rooted<JSPropertyDescriptor> desc(cx);
|
Rooted<JSPropertyDescriptor> desc(cx);
|
||||||
if (!InterposeProperty(cx, wrapper, nullptr, id, &desc))
|
if (!InterposeProperty(cx, wrapper, nullptr, id, &desc))
|
||||||
return false;
|
return false;
|
||||||
|
@ -82,7 +82,6 @@ public:
|
|||||||
explicit AsyncFrameInit(nsIFrame* aFrame) : mFrame(aFrame) {}
|
explicit AsyncFrameInit(nsIFrame* aFrame) : mFrame(aFrame) {}
|
||||||
NS_IMETHOD Run()
|
NS_IMETHOD Run()
|
||||||
{
|
{
|
||||||
PROFILER_LABEL("mozilla", "AsyncFrameInit::Run", js::ProfileEntry::Category::OTHER);
|
|
||||||
if (mFrame.IsAlive()) {
|
if (mFrame.IsAlive()) {
|
||||||
static_cast<nsSubDocumentFrame*>(mFrame.GetFrame())->ShowViewer();
|
static_cast<nsSubDocumentFrame*>(mFrame.GetFrame())->ShowViewer();
|
||||||
}
|
}
|
||||||
|
@ -305,10 +305,7 @@ GetBufferFromZipArchive(nsZipArchive *zip, bool doCRC, const char* id,
|
|||||||
nsresult
|
nsresult
|
||||||
StartupCache::GetBuffer(const char* id, char** outbuf, uint32_t* length)
|
StartupCache::GetBuffer(const char* id, char** outbuf, uint32_t* length)
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
|
|
||||||
|
|
||||||
NS_ASSERTION(NS_IsMainThread(), "Startup cache only available on main thread");
|
NS_ASSERTION(NS_IsMainThread(), "Startup cache only available on main thread");
|
||||||
|
|
||||||
WaitOnWriteThread();
|
WaitOnWriteThread();
|
||||||
if (!mStartupWriteInitiated) {
|
if (!mStartupWriteInitiated) {
|
||||||
CacheEntry* entry;
|
CacheEntry* entry;
|
||||||
|
@ -1310,7 +1310,6 @@ nsUrlClassifierDBService::ClassifyLocalWithTables(nsIURI *aURI,
|
|||||||
const nsACString & aTables,
|
const nsACString & aTables,
|
||||||
nsACString & aTableResults)
|
nsACString & aTableResults)
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
|
|
||||||
MOZ_ASSERT(NS_IsMainThread(), "ClassifyLocalWithTables must be on main thread");
|
MOZ_ASSERT(NS_IsMainThread(), "ClassifyLocalWithTables must be on main thread");
|
||||||
|
|
||||||
nsCOMPtr<nsIURI> uri = NS_GetInnermostURI(aURI);
|
nsCOMPtr<nsIURI> uri = NS_GetInnermostURI(aURI);
|
||||||
|
@ -203,7 +203,6 @@ nsWindowsSystemProxySettings::PatternMatch(const nsACString& aHost,
|
|||||||
nsresult
|
nsresult
|
||||||
nsWindowsSystemProxySettings::GetPACURI(nsACString& aResult)
|
nsWindowsSystemProxySettings::GetPACURI(nsACString& aResult)
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::STORAGE);
|
|
||||||
nsresult rv;
|
nsresult rv;
|
||||||
uint32_t flags = 0;
|
uint32_t flags = 0;
|
||||||
nsAutoString buf;
|
nsAutoString buf;
|
||||||
|
@ -910,8 +910,6 @@ nsXREDirProvider::DoStartup()
|
|||||||
void
|
void
|
||||||
nsXREDirProvider::DoShutdown()
|
nsXREDirProvider::DoShutdown()
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
|
|
||||||
|
|
||||||
if (mProfileNotified) {
|
if (mProfileNotified) {
|
||||||
nsCOMPtr<nsIObserverService> obsSvc =
|
nsCOMPtr<nsIObserverService> obsSvc =
|
||||||
mozilla::services::GetObserverService();
|
mozilla::services::GetObserverService();
|
||||||
|
@ -211,8 +211,6 @@ nsBaseDragService::InvokeDragSession(nsIDOMNode *aDOMNode,
|
|||||||
nsIScriptableRegion* aDragRgn,
|
nsIScriptableRegion* aDragRgn,
|
||||||
uint32_t aActionType)
|
uint32_t aActionType)
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
|
|
||||||
|
|
||||||
NS_ENSURE_TRUE(aDOMNode, NS_ERROR_INVALID_ARG);
|
NS_ENSURE_TRUE(aDOMNode, NS_ERROR_INVALID_ARG);
|
||||||
NS_ENSURE_TRUE(mSuppressLevel == 0, NS_ERROR_FAILURE);
|
NS_ENSURE_TRUE(mSuppressLevel == 0, NS_ERROR_FAILURE);
|
||||||
|
|
||||||
|
@ -868,7 +868,6 @@ nsFilePicker::ShowXPFilePicker(const nsString& aInitialDir)
|
|||||||
bool
|
bool
|
||||||
nsFilePicker::ShowFilePicker(const nsString& aInitialDir, bool &aWasInitError)
|
nsFilePicker::ShowFilePicker(const nsString& aInitialDir, bool &aWasInitError)
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
|
|
||||||
RefPtr<IFileDialog> dialog;
|
RefPtr<IFileDialog> dialog;
|
||||||
if (mMode != modeSave) {
|
if (mMode != modeSave) {
|
||||||
if (FAILED(CoCreateInstance(CLSID_FileOpenDialog, nullptr, CLSCTX_INPROC,
|
if (FAILED(CoCreateInstance(CLSID_FileOpenDialog, nullptr, CLSCTX_INPROC,
|
||||||
|
@ -36,8 +36,6 @@ bool
|
|||||||
HandleToFilename(HANDLE aHandle, const LARGE_INTEGER& aOffset,
|
HandleToFilename(HANDLE aHandle, const LARGE_INTEGER& aOffset,
|
||||||
nsAString& aFilename)
|
nsAString& aFilename)
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::NETWORK);
|
|
||||||
|
|
||||||
aFilename.Truncate();
|
aFilename.Truncate();
|
||||||
// This implementation is nice because it uses fully documented APIs that
|
// This implementation is nice because it uses fully documented APIs that
|
||||||
// are available on all Windows versions that we support.
|
// are available on all Windows versions that we support.
|
||||||
|
@ -1070,7 +1070,6 @@ nsLocalFile::ResolveAndStat()
|
|||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
|
|
||||||
// we can't resolve/stat anything that isn't a valid NSPR addressable path
|
// we can't resolve/stat anything that isn't a valid NSPR addressable path
|
||||||
if (mWorkingPath.IsEmpty()) {
|
if (mWorkingPath.IsEmpty()) {
|
||||||
return NS_ERROR_FILE_INVALID_PATH;
|
return NS_ERROR_FILE_INVALID_PATH;
|
||||||
|
@ -383,8 +383,6 @@ NS_IMETHODIMP nsXULWindow::RemoveChildWindow(nsIXULWindow *aChild)
|
|||||||
|
|
||||||
NS_IMETHODIMP nsXULWindow::ShowModal()
|
NS_IMETHODIMP nsXULWindow::ShowModal()
|
||||||
{
|
{
|
||||||
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
|
|
||||||
|
|
||||||
// Store locally so it doesn't die on us
|
// Store locally so it doesn't die on us
|
||||||
nsCOMPtr<nsIWidget> window = mWindow;
|
nsCOMPtr<nsIWidget> window = mWindow;
|
||||||
nsCOMPtr<nsIXULWindow> tempRef = this;
|
nsCOMPtr<nsIXULWindow> tempRef = this;
|
||||||
|
Loading…
Reference in New Issue
Block a user