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

[CGD2D] Merge develop from 20170125. #1824

Merged
merged 30 commits into from
Jan 25, 2017
Merged

Conversation

DHowett-MSFT
Copy link

@ms-jihua This includes a resolution for the #1705 and #1750 conflicts.

@aballway This includes a resolution for the #1692 conflict.

    Conflicts:
            Frameworks/CoreGraphics/CGContext.mm
            Frameworks/include/CGContextInternal.h
            build/CoreGraphics/dll/CoreGraphics.def
            tests/unittests/CoreGraphics.drawing/ImageComparison.cpp

pradipd and others added 29 commits January 18, 2017 15:25
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
When we changed the Core Text code to optimize out setting the font twice on a frame I forgot that kerning was also set in the loop. Updates images for post #1723 drawing.

Fixes #1696
#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
@DHowett-MSFT
Copy link
Author

Sorry @aballway, I meant "for the #1723 conflict."

@DHowett-MSFT
Copy link
Author

Sorry @aballway, I actually really meant "the #1780 conflict". Why do you have so many issues with the same name?

@msft-Jeyaram
Copy link
Contributor

:shipit:

@DHowett-MSFT
Copy link
Author

@henryfox The release build suffered an image failure:

CGPath.PathApplyDraw image

testimage cgpath pathapplydraw

CGPath.PathApplyDraw Greenline

greenline testimage cgpath pathapplydraw

@DHowett-MSFT DHowett-MSFT merged commit 5a73129 into CGD2D Jan 25, 2017
@DHowett-MSFT DHowett-MSFT deleted the 20170125-merge-develop branch January 25, 2017 23:45
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.