wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out 2 changesets (bug 1224374) for Windows bustage. r=bustage on a CLOSED TREE

Browse Source 
Backed out changeset 5f458e6e4997 (bug 1224374)
Backed out changeset 0dc02cb0b604 (bug 1224374)
This commit is contained in:
Sebastian Hengst 2016-01-19 21:30:41 +01:00
parent 389e5b8642
commit 1eb13214bf
33 changed files with 0 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
accessible/base/NotificationController.cpp
View File

@ -141,7 +141,6 @@ NotificationController::IsUpdatePending()
void
NotificationController::WillRefresh(mozilla::TimeStamp aTime)
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
Telemetry::AutoTimer<Telemetry::A11Y_UPDATE_TIME> updateTimer;
// If the document accessible that notification collector was created for is

1
dom/base/nsFrameLoader.cpp
View File

@ -781,7 +781,6 @@ bool
nsFrameLoader::ShowRemoteFrame(const ScreenIntSize& size,
nsSubDocumentFrame *aFrame)
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::GRAPHICS);
NS_ASSERTION(IsRemoteFrame(), "ShowRemote only makes sense on remote frames.");
if (!mRemoteBrowser && !TryRemoteBrowser()) {

2
dom/base/nsJSEnvironment.cpp
View File

@ -1335,8 +1335,6 @@ nsJSContext::ShrinkGCBuffersNow()
static void
FinishAnyIncrementalGC()
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::GC);
if (sCCLockedOut) {
// We're in the middle of an incremental GC, so finish it.
JS::PrepareForIncrementalGC(sRuntime);

1
dom/base/nsObjectLoadingContent.cpp
View File

@ -3102,7 +3102,6 @@ nsObjectLoadingContent::DoStopPlugin(nsPluginInstanceOwner* aInstanceOwner,
NS_IMETHODIMP
nsObjectLoadingContent::StopPluginInstance()
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
// Clear any pending events
mPendingInstantiateEvent = nullptr;
mPendingCheckPluginStopEvent = nullptr;

6
dom/ipc/ContentParent.cpp
View File

@ -1237,8 +1237,6 @@ ContentParent::CreateBrowserOrApp(const TabContext& aContext,
Element* aFrameElement,
ContentParent* aOpenerContentParent)
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
if (!sCanLaunchSubprocesses) {
return nullptr;
}
@ -2388,8 +2386,6 @@ ContentParent::InitializeMembers()
bool
ContentParent::LaunchSubprocess(ProcessPriority aInitialPriority /* = PROCESS_PRIORITY_FOREGROUND */)
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
std::vector<std::string> extraArgs;
if (mIsNuwaProcess) {
extraArgs.push_back("-nuwa");
@ -3646,8 +3642,6 @@ ContentParent::ForceKillTimerCallback(nsITimer* aTimer, void* aClosure)
void
ContentParent::KillHard(const char* aReason)
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
// On Windows, calling KillHard multiple times causes problems - the
// process handle becomes invalid on the first call, causing a second call
// to crash our process - more details in bug 890840.

2
dom/media/webspeech/synth/windows/SapiService.cpp
View File

@ -196,8 +196,6 @@ SapiService::~SapiService()
bool
SapiService::Init()
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
MOZ_ASSERT(!mInitialized);
if (Preferences::GetBool("media.webspeech.synth.test") ||

4
dom/plugins/base/nsJSNPRuntime.cpp
View File

@ -1646,8 +1646,6 @@ NPObjWrapper_Resolve(JSContext *cx, JS::Handle<JSObject*> obj, JS::Handle<jsid>
if (JSID_IS_SYMBOL(id))
return true;
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::JS);
NPObject *npobj = GetNPObject(cx, obj);
if (!npobj || !npobj->_class || !npobj->_class->hasProperty ||
@ -2112,8 +2110,6 @@ static bool
NPObjectMember_GetProperty(JSContext *cx, JS::HandleObject obj, JS::HandleId id,
JS::MutableHandleValue vp)
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
if (JSID_IS_SYMBOL(id)) {
JS::RootedSymbol sym(cx, JSID_TO_SYMBOL(id));
if (JS::GetSymbolCode(sym) == JS::SymbolCode::toPrimitive) {

3
dom/plugins/base/nsNPAPIPlugin.cpp
View File

@ -265,8 +265,6 @@ nsNPAPIPlugin::RunPluginOOP(const nsPluginTag *aPluginTag)
inline PluginLibrary*
GetNewPluginLibrary(nsPluginTag *aPluginTag)
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
if (!aPluginTag) {
return nullptr;
}
@ -285,7 +283,6 @@ GetNewPluginLibrary(nsPluginTag *aPluginTag)
nsresult
nsNPAPIPlugin::CreatePlugin(nsPluginTag *aPluginTag, nsNPAPIPlugin** aResult)
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
*aResult = nullptr;
if (!aPluginTag) {

3
dom/plugins/base/nsNPAPIPluginInstance.cpp
View File

@ -280,7 +280,6 @@ nsNPAPIPluginInstance::StopTime()
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));
NS_ENSURE_ARG_POINTER(aPlugin);
@ -656,8 +655,6 @@ nsresult nsNPAPIPluginInstance::HandleEvent(void* event, int16_t* result,
if (RUNNING != mRunning)
return NS_OK;
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
if (!event)
return NS_ERROR_FAILURE;

1
dom/plugins/base/nsNPAPIPluginStreamListener.cpp
View File

@ -286,7 +286,6 @@ nsNPAPIPluginStreamListener::CallURLNotify(NPReason reason)
nsresult
nsNPAPIPluginStreamListener::OnStartBinding(nsPluginStreamListenerPeer* streamPeer)
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
if (!mInst || !mInst->CanFireNotifications() || mStreamCleanedUp)
return NS_ERROR_FAILURE;

2
dom/plugins/base/nsPluginHost.cpp
View File

@ -1366,7 +1366,6 @@ nsresult nsPluginHost::EnsurePluginLoaded(nsPluginTag* aPluginTag)
nsresult
nsPluginHost::GetPluginForContentProcess(uint32_t aPluginId, nsNPAPIPlugin** aPlugin)
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
MOZ_ASSERT(XRE_IsParentProcess());
// If plugins haven't been scanned yet, do so now
@ -3522,7 +3521,6 @@ nsPluginHost::AddHeadersToChannel(const char *aHeadersData,
nsresult
nsPluginHost::StopPluginInstance(nsNPAPIPluginInstance* aInstance)
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
if (PluginDestructionGuard::DelayDestroy(aInstance)) {
return NS_OK;
}

2
dom/plugins/base/nsPluginInstanceOwner.cpp
View File

@ -3600,8 +3600,6 @@ nsPluginInstanceOwner::UpdateWindowVisibility(bool aVisible)
void
nsPluginInstanceOwner::UpdateDocumentActiveState(bool aIsActive)
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
mPluginDocumentActiveState = aIsActive;
#ifndef XP_MACOSX
UpdateWindowPositionAndClipRect(true);

1
dom/plugins/ipc/PluginModuleParent.cpp
View File

@ -110,7 +110,6 @@ mozilla::plugins::SetupBridge(uint32_t aPluginId,
nsresult* rv,
uint32_t* runID)
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
if (NS_WARN_IF(!rv) || NS_WARN_IF(!runID)) {
return false;
}

1
dom/storage/DOMStorageDBThread.cpp
View File

@ -154,7 +154,6 @@ DOMStorageDBThread::Shutdown()
void
DOMStorageDBThread::SyncPreload(DOMStorageCacheBridge* aCache, bool aForceSync)
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::STORAGE);
if (!aForceSync && aCache->LoadedCount()) {
// Preload already started for this cache, just wait for it to finish.
// LoadWait will exit after LoadDone on the cache has been called.

1
gfx/layers/client/TextureClient.cpp
View File

@ -206,7 +206,6 @@ static void DestroyTextureData(TextureData* aTextureData, ISurfaceAllocator* aAl
void
TextureChild::ActorDestroy(ActorDestroyReason why)
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::GRAPHICS);
mWaitForRecycle = nullptr;
if (mTextureData) {

2
gfx/thebes/gfxDWriteFontList.cpp
View File

@ -524,8 +524,6 @@ gfxDWriteFontEntry::GetFontTable(uint32_t aTag)
nsresult
gfxDWriteFontEntry::ReadCMAP(FontInfoData *aFontInfoData)
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::GRAPHICS);
// attempt this once, if errors occur leave a blank cmap
if (mCharacterMap) {
return NS_OK;

2
gfx/thebes/gfxGDIFontList.cpp
View File

@ -143,8 +143,6 @@ GDIFontEntry::GDIFontEntry(const nsAString& aFaceName,
nsresult
GDIFontEntry::ReadCMAP(FontInfoData *aFontInfoData)
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
// attempt this once, if errors occur leave a blank cmap
if (mCharacterMap) {
return NS_OK;

2
gfx/thebes/gfxWindowsPlatform.cpp
View File

@ -1205,8 +1205,6 @@ InvalidateWindowForDeviceReset(HWND aWnd, LPARAM aMsg)
bool
gfxWindowsPlatform::UpdateForDeviceReset()
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::GRAPHICS);
if (!DidRenderingDeviceReset()) {
return false;
}

1
image/FrameAnimator.cpp
View File

@ -79,7 +79,6 @@ FrameAnimator::AdvanceFrame(TimeStamp aTime)
{
NS_ASSERTION(aTime <= TimeStamp::Now(),
"Given time appears to be in the future");
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::GRAPHICS);
uint32_t currentFrameIndex = mCurrentAnimationFrameIndex;
uint32_t nextFrameIndex = currentFrameIndex + 1;

2
ipc/glue/GeckoChildProcessHost.cpp
View File

@ -381,8 +381,6 @@ GeckoChildProcessHost::AsyncLaunch(std::vector<std::string> aExtraOpts,
bool
GeckoChildProcessHost::WaitUntilConnected(int32_t aTimeoutMs)
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
// NB: this uses a different mechanism than the chromium parent
// class.
PRIntervalTime timeoutTicks = (aTimeoutMs > 0) ?

1
js/ipc/WrapperOwner.cpp
View File

@ -145,7 +145,6 @@ const char CPOWProxyHandler::family = 0;
const CPOWProxyHandler CPOWProxyHandler::singleton;
#define FORWARD(call, args) \
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::JS); \
WrapperOwner* owner = OwnerOf(proxy); \
if (!owner->active()) { \
JS_ReportError(cx, "cannot use a CPOW whose process is gone"); \

1
js/xpconnect/src/XPCComponents.cpp
View File

@ -3010,7 +3010,6 @@ nsXPCComponents_Utils::SetGCZeal(int32_t aValue, JSContext* cx)
NS_IMETHODIMP
nsXPCComponents_Utils::NukeSandbox(HandleValue obj, JSContext* cx)
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::JS);
NS_ENSURE_TRUE(obj.isObject(), NS_ERROR_INVALID_ARG);
JSObject* wrapper = &obj.toObject();
NS_ENSURE_TRUE(IsWrapper(wrapper), NS_ERROR_INVALID_ARG);

4
js/xpconnect/wrappers/AddonWrapper.cpp
View File

@ -14,8 +14,6 @@
#include "mozilla/dom/BindingUtils.h"
#include "nsGlobalWindow.h"
#include "GeckoProfiler.h"
#include "nsID.h"
using namespace js;
@ -174,8 +172,6 @@ bool
AddonWrapper<Base>::get(JSContext* cx, JS::Handle<JSObject*> wrapper, JS::Handle<Value> receiver,
JS::Handle<jsid> id, JS::MutableHandle<JS::Value> vp) const
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
Rooted<JSPropertyDescriptor> desc(cx);
if (!InterposeProperty(cx, wrapper, nullptr, id, &desc))
return false;

1
layout/generic/nsSubDocumentFrame.cpp
View File

@ -82,7 +82,6 @@ public:
explicit AsyncFrameInit(nsIFrame* aFrame) : mFrame(aFrame) {}
NS_IMETHOD Run()
{
PROFILER_LABEL("mozilla", "AsyncFrameInit::Run", js::ProfileEntry::Category::OTHER);
if (mFrame.IsAlive()) {
static_cast<nsSubDocumentFrame*>(mFrame.GetFrame())->ShowViewer();
}

3
startupcache/StartupCache.cpp
View File

@ -305,10 +305,7 @@ GetBufferFromZipArchive(nsZipArchive *zip, bool doCRC, const char* id,
nsresult
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");
WaitOnWriteThread();
if (!mStartupWriteInitiated) {
CacheEntry* entry;

1
toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
View File

@ -1310,7 +1310,6 @@ nsUrlClassifierDBService::ClassifyLocalWithTables(nsIURI *aURI,
const nsACString & aTables,
nsACString & aTableResults)
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
MOZ_ASSERT(NS_IsMainThread(), "ClassifyLocalWithTables must be on main thread");
nsCOMPtr<nsIURI> uri = NS_GetInnermostURI(aURI);

1
toolkit/system/windowsproxy/nsWindowsSystemProxySettings.cpp
View File

@ -203,7 +203,6 @@ nsWindowsSystemProxySettings::PatternMatch(const nsACString& aHost,
nsresult
nsWindowsSystemProxySettings::GetPACURI(nsACString& aResult)
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::STORAGE);
nsresult rv;
uint32_t flags = 0;
nsAutoString buf;

2
toolkit/xre/nsXREDirProvider.cpp
View File

@ -910,8 +910,6 @@ nsXREDirProvider::DoStartup()
void
nsXREDirProvider::DoShutdown()
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
if (mProfileNotified) {
nsCOMPtr<nsIObserverService> obsSvc =
mozilla::services::GetObserverService();

2
widget/nsBaseDragService.cpp
View File

@ -211,8 +211,6 @@ nsBaseDragService::InvokeDragSession(nsIDOMNode *aDOMNode,
nsIScriptableRegion* aDragRgn,
uint32_t aActionType)
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
NS_ENSURE_TRUE(aDOMNode, NS_ERROR_INVALID_ARG);
NS_ENSURE_TRUE(mSuppressLevel == 0, NS_ERROR_FAILURE);

1
widget/windows/nsFilePicker.cpp
View File

@ -868,7 +868,6 @@ nsFilePicker::ShowXPFilePicker(const nsString& aInitialDir)
bool
nsFilePicker::ShowFilePicker(const nsString& aInitialDir, bool &aWasInitError)
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
RefPtr<IFileDialog> dialog;
if (mMode != modeSave) {
if (FAILED(CoCreateInstance(CLSID_FileOpenDialog, nullptr, CLSCTX_INPROC,

2
xpcom/io/FileUtilsWin.cpp
View File

@ -36,8 +36,6 @@ bool
HandleToFilename(HANDLE aHandle, const LARGE_INTEGER& aOffset,
nsAString& aFilename)
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::NETWORK);
aFilename.Truncate();
// This implementation is nice because it uses fully documented APIs that
// are available on all Windows versions that we support.

1
xpcom/io/nsLocalFileWin.cpp
View File

@ -1070,7 +1070,6 @@ nsLocalFile::ResolveAndStat()
return NS_OK;
}
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
// we can't resolve/stat anything that isn't a valid NSPR addressable path
if (mWorkingPath.IsEmpty()) {
return NS_ERROR_FILE_INVALID_PATH;

2
xpfe/appshell/nsXULWindow.cpp
View File

@ -383,8 +383,6 @@ NS_IMETHODIMP nsXULWindow::RemoveChildWindow(nsIXULWindow *aChild)
NS_IMETHODIMP nsXULWindow::ShowModal()
{
PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
// Store locally so it doesn't die on us
nsCOMPtr<nsIWidget> window = mWindow;
nsCOMPtr<nsIXULWindow> tempRef = this;