Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

[core] Get rid of user-specified refs #7586

Merged
merged 3 commits into from
Jan 5, 2017
Merged

[core] Get rid of user-specified refs #7586

merged 3 commits into from
Jan 5, 2017

Conversation

jfirebaugh
Copy link
Contributor

Fixes #6900
Fixes #7572

@mention-bot
Copy link

@jfirebaugh, thanks for your PR! By analyzing this pull request, we identified @yhahn, @tmpsantos and @ansis to be potential reviewers.

}

std::vector<std::vector<std::unique_ptr<Layer>>> groupByLayout(std::vector<std::unique_ptr<Layer>> layers) {
std::unordered_map<std::string, std::vector<std::unique_ptr<Layer>>> map;
Copy link
Contributor

Choose a reason for hiding this comment

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

std::vector<std::unique_ptr<Layer>> is getting repeated quite a bit. Do you think the code would benefit from a Layout typedef or somesuch?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This method is short enough that I think it's ok.

@@ -17,4 +18,12 @@ optional<Color> Color::parse(const std::string& s) {
}};
}

std::string Color::stringify() const {
return "rgba(" +
Copy link
Contributor

Choose a reason for hiding this comment

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

Does it matter that a Color created via an hsla() string would get converted back to JSON as an rgba() string?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Named colors will also come back as rgba() strings; there are no guarantees that values are round-tripped exactly. This is consistent with GL JS and the CSSOM.

@jfirebaugh jfirebaugh merged commit 0c0064c into master Jan 5, 2017
@jfirebaugh jfirebaugh deleted the deref branch January 5, 2017 01:38
@jfirebaugh jfirebaugh mentioned this pull request Jan 5, 2017
jfirebaugh added a commit that referenced this pull request Jan 10, 2017
It should be safe to invoke GeometryTileWorker::setData multiple times without invoking GeometryTileWorker::setLayers. Therefore GeometryTileWorker::redoLayout() must not consume the layers.
jfirebaugh added a commit that referenced this pull request Jan 10, 2017
It should be safe to invoke GeometryTileWorker::setData multiple times without invoking GeometryTileWorker::setLayers. Therefore GeometryTileWorker::redoLayout() must not consume the layers.
1ec5 added a commit that referenced this pull request Jan 16, 2017
1ec5 added a commit that referenced this pull request Jan 19, 2017
Updated changelogs to mention #7446, #7356, #7465, #7616, #7445, #7444, #7526, #7586, #7574, and #7770. Also corrected the blurb about #7711.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants