Port bug Bug 1188745 [Rename nsTArray::SizeOfExcludingThis() as ShallowSizeOfExcludingThis() ] to comm-central

RESOLVED FIXED in Firefox 42

Status

MailNews Core
Build Config
RESOLVED FIXED
2 years ago
2 years ago

People

(Reporter: Misak Khachatryan, Assigned: Misak Khachatryan)

Tracking

Trunk
Thunderbird 42.0
x86_64
Linux

Firefox Tracking Flags

(firefox42 fixed, seamonkey2.39 fixed)

Details

Attachments

(1 attachment, 1 obsolete attachment)

(Assignee)

Description

2 years ago
We should make changes for comm-central part of bug 1188745 in order to able to build.
(Assignee)

Comment 1

2 years ago
Created attachment 8641526 [details] [diff] [review]
Replace nsTArray SizeOfIncludingThis with ShallowSizeOfIncludingThis

This patch allows to build on my Fedora 22 x64
Attachment #8641526 - Flags: review?(Pidgeot18)

Updated

2 years ago
Component: MailNews: Backend → Build Config
Product: SeaMonkey → MailNews Core
Comment hidden (Treeherder Robot)
Comment hidden (Treeherder Robot)
Comment hidden (Treeherder Robot)
Comment hidden (Treeherder Robot)
Comment hidden (Treeherder Robot)
Comment hidden (Treeherder Robot)

Comment 8

2 years ago
Comment on attachment 8641526 [details] [diff] [review]
Replace nsTArray SizeOfIncludingThis with ShallowSizeOfIncludingThis

Sorry, this looks wrong:

>+++ b/mailnews/db/msgdb/public/nsDBFolderInfo.h

>   virtual size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const
>   {
>-    return m_lateredKeys.SizeOfExcludingThis(aMallocSizeOf);
>+    return m_lateredKeys.ShallowSizeOfIncludingThis(aMallocSizeOf);
Changing from Excluding to Including?!?

>+++ b/mailnews/db/msgdb/public/nsMsgHdr.h

>     size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOfFun) const
>     {
>-      return m_references.SizeOfExcludingThis(aMallocSizeOfFun);
>+      return m_references.ShallowSizeOfIncludingThis(aMallocSizeOfFun);
Changing from Excluding to Including?!?

>+++ b/mailnews/db/msgdb/src/nsMsgDatabase.cpp

>-  totalSize += m_newSet.SizeOfExcludingThis(aMallocSizeOf);
>-  totalSize += m_ChangeListeners.SizeOfExcludingThis(aMallocSizeOf);
>-  totalSize += m_threads.SizeOfExcludingThis(aMallocSizeOf);
>+  totalSize += m_newSet.ShallowSizeOfIncludingThis(aMallocSizeOf);
>+  totalSize += m_ChangeListeners.ShallowSizeOfExcludingThis(aMallocSizeOf);
>+  totalSize += m_threads.ShallowSizeOfIncludingThis(aMallocSizeOf);
Changing from Excluding to Including?!?
Attachment #8641526 - Flags: feedback-
(Assignee)

Comment 9

2 years ago
Created attachment 8641639 [details] [diff] [review]
nsTArray

Sorry, my first patch after 2 years :(
Attachment #8641526 - Attachment is obsolete: true
Attachment #8641526 - Flags: review?(Pidgeot18)
Attachment #8641639 - Flags: review?(Pidgeot18)
Attachment #8641639 - Flags: feedback?(iann_bugzilla)
Comment hidden (Treeherder Robot)
Comment hidden (Treeherder Robot)
Comment hidden (Treeherder Robot)
Comment hidden (Treeherder Robot)
Comment hidden (Treeherder Robot)
Comment hidden (Treeherder Robot)
Comment hidden (Treeherder Robot)
Comment hidden (Treeherder Robot)
Comment hidden (Treeherder Robot)
Comment hidden (Treeherder Robot)
Comment hidden (Treeherder Robot)
Comment hidden (Treeherder Robot)
Attachment #8641639 - Flags: review?(Pidgeot18)
Attachment #8641639 - Flags: review+
Attachment #8641639 - Flags: feedback?(iann_bugzilla)

Comment 22

2 years ago
http://hg.mozilla.org/comm-central/rev/2a3f11bc96aa
Status: NEW → RESOLVED
Last Resolved: 2 years ago
status-firefox42: affected → fixed
status-seamonkey2.39: --- → fixed
Resolution: --- → FIXED
Target Milestone: --- → Thunderbird 42.0
You need to log in before you can comment on or make changes to this bug.