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

Uplift to 0.71.x: Rewards button icon pre-opt-in gets correct scaling (#3830) #3835

Merged
merged 1 commit into from
Nov 1, 2019

Conversation

petemill
Copy link
Member

Rewards button icon pre-opt-in gets correct scaling

Original #3830

Sets the scale of the image compared to the size we want to display it, so that the underlying Draw function can work out if the image needs to be re-sized or not. Previously this was only happening (coincidentally) when the display was not using a scaling factor of 1 since this would not match the default scaling factor of the gfx::Image. Resize is done here: https://github.com/chromium/chromium/blob/0aa1854a269704ce0dd45641cfb9d440666e54bc/chrome/browser/ui/extensions/icon_with_badge_image_source.cc#L147-L148

Fix: brave/brave-browser#6663

This should be uplifted to wherever #3698 is uplifted to (currently 0.71.x).

Rewards button icon pre-opt-in gets correct scaling
@petemill petemill added this to the 0.71.x - Beta milestone Oct 31, 2019
@petemill petemill requested a review from a team October 31, 2019 06:14
@petemill petemill self-assigned this Oct 31, 2019
@kjozwiak
Copy link
Member

Restrating macOS as npm run test -- brave_unit_tests Release --output brave_unit_tests.xml failed due to the following error as per https://ci.brave.com/job/brave-browser-build-pr/job/fix-6663-bat-icon-scale-71/1/execution/node/711/log/:

07:20:36  [252/257] CXX obj/brave/test/brave_browser_tests/brave_content_browser_client_browsertest.o
07:22:13  Sending interrupt signal to process
07:22:28  ninja: error: remove(brave_browser_tests.dSYM): Directory not empty
07:22:28  ninja: build stopped: interrupted by user.
07:22:28  ninja: error: remove(brave_browser_tests.dSYM): Directory not empty
07:22:28  script returned exit code 143

@kjozwiak kjozwiak added CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS CI/skip-linux labels Oct 31, 2019
@petemill
Copy link
Member Author

@kjozwiak CI is successful now

Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

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

Uplift into 0.71.x approved after deliberating with @brave/uplift-approvers. Both CI/Jenkins and CI/Travis passed without any issues.

Please make sure that all the correct labels are being used and the associated issue is moved into the correct milestone.

@bsclifton bsclifton merged commit 7df4354 into 0.71.x Nov 1, 2019
@bsclifton bsclifton deleted the fix-6663-bat-icon-scale-71 branch November 1, 2019 15:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants