-
Notifications
You must be signed in to change notification settings - Fork 808
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
[CGD2D] Merge develop from 20170125. #1824
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fixed issue that CPathMapper() receives null as path when trying to get data from NSUserDefaults #1613 changed manual convertion of mutable string to charactes into using of native representation of url's path
In a recent update to Windows it became necessary to return the identity matrix from our custom text renderer's GetCurrentTransform or a garbage value could potentially persist, incorrectly placing all line origins near 0 or INF on ARM. It also seems that, on ARM, DWrite is rounding the baselineOrigin values to the nearest integer, causing tests expecting certain values to fail. Fixes #1597 Fixes #1673
#1705) * CoreText Performance: Call ID2D1RenderTarget::BeginDraw()/EndDraw() fewer times Fixes #1620 * - Added Begin/EndDraw pairs to a few more places - Mitigated an issue with cairo where ID2D1RenderTarget would sometimes cache a before state during begin draw, and wipe out any changes cairo made, breaking APIs like CGContextFillRect. - Changed implementation/naming of the 'escape the current begin/end draw stack' functions
* Add additional UIControl events: TouchUpOutside TouchDragInside TouchDragOutside TouchDragEnter TouchDragExit Test added in ButtonsViewController in WOCCatalog. * Pulling in additional required changes from internal CR (Dave's PR didn't contain everything needed to compile), and did a bit more cleanup in UIControl.mm. Also removed the button sample from WoCCatalog and added this sample to XamlCatalog's UIButton scene instead. * Incorporating CR feedback; no longer modifying _curState directly from within UIButton and instead leveraging UIControl's setHighlighted method. Also ensuring UIControl invalidates autoLayout as needed when transitioning between states.
…box (#1582) Implementation of planned AudioConverter Services set of APIs from AudioToolbox Added preprocessor definitions to AudioToolbox Unit tests
…n phone and crash on iOS in TextDislayView Controller. (#1773)
#1795) * getNetworkConnectivityLevel can throw under some circumstances. Handle these and treat the connection status as 'not connected'.
* Fix leak in NSRunLoop _statesForMode: helper * just use autorelease for helper; remove additional unused method from NSRunLoop (which would double release if called)
…#1801) specifies a different queue. This fixes a crash in reachability sample.
Need to be explicit about stealing the deltaImage when doing a move of our ImageDelta Fixes #1805
… within a functional test (#1771) CHANGES: 1. Created a new XAMLCatalog UIViewController with 2 controls (slider, UITextField) to manipulate a UIButton's label 2. This UIViewController's exposes a public UIButton property that can be manipulated from a functional test (UIButtonTests) 3. Created UX helper class, ViewControllerTestHelper, to display visuals using pushVC/dismissVC 4. Created UX helper class, XamlEventSubscription, to register/unregister XAML property change events 5. Updated FunctionalTest VCXPROJ to move external VCs into its own folder TODO: 1. Migrate NSCondition to Win32 event mechanism
Fixes #1798 * Change parameterized test to use custom font (thanks Dustin :D)
Conflicts: Frameworks/CoreGraphics/CGContext.mm Frameworks/include/CGContextInternal.h build/CoreGraphics/dll/CoreGraphics.def tests/unittests/CoreGraphics.drawing/ImageComparison.cpp
aballway
approved these changes
Jan 25, 2017
ms-jihua
approved these changes
Jan 25, 2017
msft-Jeyaram
approved these changes
Jan 25, 2017
@henryfox The release build suffered an image failure:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@ms-jihua This includes a resolution for the #1705 and #1750 conflicts.
@aballway This includes a resolution for the #1692 conflict.