Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Miscellaneous e10s fixes #5305

Merged
merged 4 commits into from
Sep 18, 2014
Merged

Miscellaneous e10s fixes #5305

merged 4 commits into from
Sep 18, 2014

Conversation

Snuffleupagus
Copy link
Collaborator

No description provided.

* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think changing the license of the file should be explained in the commit. changing license under the covers of "misc fixes" is dubious. I have read the bugzilla where the license change was discussed and it should be referenced.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The relevant commit message already said: Update the license header in extensions/firefox/content/pdfjschildbootstrap.js, so I'm not really sure how this can be considered dubious.
"Miscellaneous e10s fixes" is the title of the PR, not the indiviual commits. Anyway, I've amended the commit with a link to the relevant Bugzilla comment.

The PDF.js project uses the Apache v2 license, but unfortunately the file didn't land with the correct license header. Hence I figured I would address that in this PR.
Since I needed to submit a few other e10s fixes, in this case, it seemed reasonable to submit a few different commits in the same PR to speed up the merging process.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here you go -- reference to the license-to-license-change:

https://bugzilla.mozilla.org/show_bug.cgi?id=942707#c99

@@ -176,7 +178,9 @@ let PdfjsChromeUtils = {
},

_isPrefAllowed: function (aPrefName) {
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The name _isPrefAllowed seems somewhat misleading to me, since it suggests that the method should return a boolean value.
@yurydelendik, @brendandahl Would it make sense to rename this to e.g. _throwIfPrefIsNotAllowed instead?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you rename it to _ensurePreferenceAllowed ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

@yurydelendik
Copy link
Contributor

Looks good after the change above... or as is

yurydelendik added a commit that referenced this pull request Sep 18, 2014
@yurydelendik yurydelendik merged commit d66314c into mozilla:master Sep 18, 2014
@yurydelendik
Copy link
Contributor

Thank you

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants