Closed
Bug 1389168
Opened 7 years ago
Closed 7 years ago
nsFrameManager.cpp has some IBM license boilerplate that refers to added code that has since been removed
Categories
(Core :: General, enhancement)
Core
General
Tracking
()
RESOLVED
FIXED
mozilla57
Tracking | Status | |
---|---|---|
firefox57 | --- | fixed |
People
(Reporter: dholbert, Assigned: mkaply)
References
(Depends on 1 open bug)
Details
Attachments
(1 file)
nsFrameManager.cpp has an extra chunk of license text at the top (longer than 3-line boilerplate license blurb): > * This Original Code has been modified by IBM Corporation. Modifications made by IBM > * described herein are Copyright (c) International Business Machines Corporation, 2000. > * Modifications to Mozilla code or documentation identified per MPL Section 3.3 > * > * Date Modified by Description of modification > * 04/20/2000 IBM Corp. OS/2 VisualAge build. > */ Link to blurb: https://dxr.mozilla.org/mozilla-central/rev/4c5fbf49376351679dcc49f4cff26c3c2e055ccc/layout/base/nsFrameManager.cpp#8-14 This was added in bug 34082, for this extremely-small change to the file: http://searchfox.org/mozilla-central/diff/23620fb3295a44355ed40339662bc07706abc892/layout/base/nsFrameManager.cpp#22 The only actual code-changes there were three instances of this change to function signatures: > - static PRIntn > + static PRIntn PR_CALLBACK ...for RemoveEntry, EnumEntries, and RemoveUndisplayedEntry. These added PR_CALLBACK usages have since been removed in bug 456388 (after having been converted to "PR_STATIC_CALLBACK(PRIntn)" in another commit): https://hg.mozilla.org/mozilla-central/diff/eee86e5513ad/layout/base/nsFrameManager.cpp So the code referred to by this license boilerplate (three instances of PR_CALLBACK) no longer exists. Can we remove this license boilerplate? Intuitively I suspect we can, but I'm hoping maybe Gerv can sanity-check my logic and make sure there aren't any other licensing considerations here.
Reporter | ||
Updated•7 years ago
|
Flags: needinfo?(gerv)
Reporter | ||
Comment 1•7 years ago
|
||
(In reply to Daniel Holbert [:dholbert] from comment #0) > These added PR_CALLBACK usages have since been removed in bug 456388 (after > having been converted to "PR_STATIC_CALLBACK(PRIntn)" in another commit): > https://hg.mozilla.org/mozilla-central/diff/eee86e5513ad/layout/base/nsFrameManager.cpp Actually, that's only where the final one was removed -- the earlier two functions (RemoveEntry, EnumEntries) seem to have been removed or renamed before that point. (And even if they were preserved in some form, their PR_CALLBACK annotation (the annotation that's credited to IBM) were eventually removed in bug 456388 or similar. These days, this source file ( https://dxr.mozilla.org/mozilla-central/source/layout/base/nsFrameManager.cpp ) doesn't have *any* instances of the prefix "PR_" at all.
Assignee | ||
Comment 3•7 years ago
|
||
Ah the memories. Yes, as gerv said, any time you can see this you can remove it. When we were first contributing, IBM lawyers required it based on a reading of the MPL. We finally got them to change their minds.
Reporter | ||
Comment 4•7 years ago
|
||
Here are all the references to "OS/2 VisualAge build" FWIW (there are 8) -- presumably all from bug 34082: https://dxr.mozilla.org/mozilla-central/search?q=OS%2F2+VisualAge+build.&redirect=false
Assignee | ||
Comment 5•7 years ago
|
||
We can go farther than that and remove all the IBM Corp. references. https://dxr.mozilla.org/mozilla-central/search?q=IBM+Corp.&redirect=false Man this is making me feel old.
Reporter | ||
Comment 6•7 years ago
|
||
Great! mkaply's gonna take care of this, per IRC discussion just now. :) Assigning to him.
Assignee: nobody → mozilla
Component: Layout → General
Comment hidden (mozreview-request) |
Comment 8•7 years ago
|
||
mozreview-review |
Comment on attachment 8898006 [details] Bug 1389168 - Remove unnecessary IBM license text. https://reviewboard.mozilla.org/r/169312/#review174910
Attachment #8898006 -
Flags: review?(gerv) → review+
Pushed by mozilla@kaply.com: https://hg.mozilla.org/integration/autoland/rev/87bd94e7f685 Remove unnecessary IBM license text. r=gerv
Comment 10•7 years ago
|
||
bugherder |
https://hg.mozilla.org/mozilla-central/rev/87bd94e7f685
Status: NEW → RESOLVED
Closed: 7 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla57
You need to log in
before you can comment on or make changes to this bug.
Description
•