1964 Commits

Author SHA1 Message Date
Adlai Holler
253692df65 [ASMultiplexImageNode] Do not request already-loaded images from data source to avoid loop 2016-05-06 21:45:31 -07:00
Erekle
c46547ac5f prototype
Added duration detection in ASVideoNode.
2016-05-06 21:41:54 +04:00
Michael Schneider
d1054d6ed9 Move from ASSentinel to a atomic int 2016-05-05 20:25:07 -07:00
Michael Schneider
dc6d2e7660 Improve Transition ID handling 2016-05-05 20:25:07 -07:00
Michael Schneider
cac4ed5626 Move layout of ASVideoNode to layout specs
- This should fix adjusting a custom play button position
- Fix sample project use of ASVideoNode
2016-05-05 16:49:01 -07:00
Erekle
e87fd7a998 first steps 2016-05-06 02:42:17 +04:00
appleguy
62a853b3e9 Merge pull request #1618 from garrettmoon/fixLayoutDeadlock
[ASDisplayNode] Fix rare deadlock when performing layout on multiple threads with the same node.
2016-05-05 12:47:08 -07:00
Garrett Moon
dc56c060d0 Add comment for why lock is added. 2016-05-05 10:02:29 -07:00
Michael Schneider
bc8489528e Fix crash in delegate / dataSource proxies for ASCollectionView and ASTableView 2016-05-04 21:03:43 -07:00
Michael Schneider
90c3dbc324 Add better comments for deprecated ASTextNode properties 2016-05-04 21:03:31 -07:00
Michael Schneider
29ab87a1e4 Fix API ASTextNode API inconsistencies
- Deprecate attributedString in ASTextNode in favor of attributedText to be aligned with UILabel
- Deprecate truncationAttributedString in ASTextNode in favor of truncationAttributedText to be aligned with attributedText
2016-05-04 21:03:31 -07:00
Michael Schneider
cad221007e Remove extending NSObject protocol in ASPagerDelegate as ASCollectionDelegate already extends it 2016-05-04 21:03:13 -07:00
Michael Schneider
298b9a2be7 Fix ASPagerNode data source and delegate inconsistencies
- Change ASPagerNodeDataSource -> ASPagerDataSource
- Add ASPagerDelegate
2016-05-04 21:03:13 -07:00
appleguy
3ee6c88ae4 Merge pull request #1608 from Eke/master
[ASVideoNode] Several new delegate methods and ASVideoNodePlayerState to monitor and control playback
2016-05-04 20:33:23 -07:00
Adlai Holler
646797e335 [ASMapNode: Snapshotting] Cancel on dealloc, avoid retaining self 2016-05-04 18:25:22 -07:00
Erekle
5c3770e543 fixes 2016-05-05 02:03:03 +04:00
Erekle
82cc6f49f2 coding style fixes 2016-05-05 01:49:52 +04:00
Garrett Moon
025dd55312 Dang, message local var, not ivar 2016-05-03 15:59:21 -07:00
Garrett Moon
938ecd9b6f Fix deadlock when laying out on multiple threads
Summary:
We observed a deadlock which occurred when two threads were laying out the same set of nodes.

On one thread, layout would occur on a leaf node. It would lock and as part of this layout
process, ASDK walks up the node tree and calls __setNeedsLayout on its supernode until it
reaches the supernode with no supernode. When the supernode gets its call to __setNeedsLayout
it also locks. So leaf node locks and then awaits supernode lock.

On another thread, we're doing a layout pass on the supernode in the above thread. This locks
the supernode and attempts to lock the leaf node. This deadlocks (remember the above thread
is holding onto the leaf lock and awaiting the supernode lock. This thread is holding onto
the supernode lock and awaiting the leaf lock).

This is all exacerbated by the use of recursive locks.
2016-05-03 15:56:38 -07:00
Erekle
b3af10d4ad Merge remote-tracking branch
# Conflicts:
#	AsyncDisplayKit/ASVideoNode.mm
2016-05-03 22:59:54 +04:00
appleguy
a9e742c92f Merge pull request #1606 from wendylu/render_fix
[ASNetworkImageNode] Fix threading issue in current image quality
2016-05-02 18:02:29 -07:00
Erekle
34e6238391 _delegateFlags
added _delegateFlags like in ASCollectionView
2016-05-01 17:11:40 +04:00
Robin Chou
b700eeb32c Use ASPerformOnMainThread helper. -fetchData improvements. 2016-04-30 17:22:11 -04:00
Wendy
fd4d18259e Use dispatch_async for setting currentImageQuality to ensure current order 2016-04-29 22:30:56 -07:00
Erekle
2c2a73dc83 playbackBufferEmpty and spinner
added playbackBufferEmpty logic, moved spinner show/hide to separate
methods.
2016-04-29 20:49:14 +04:00
Erekle
399703dbb2 new delegate methods
Added new delegate methods; updated Videos example project
2016-04-29 12:59:15 +04:00
Robin Chou
75b55974b5 Loads asset values with -loadValuesAsync. 2016-04-28 20:02:15 -04:00
Wendy
492d0d7ad6 [ASNetworkImageNode] Fix threading issue in current image quality
Summary:
Because we trampoline to main when setting _currentImageQuality, there would be situations where displayWillStart was called, we get a cached image and set currentImageQuality to 1.0, and then a background thread calling setDefaultImage would enqueue an operation that sets currentImageQuality to 0 and overwrites the correct value
2016-04-28 14:52:31 -07:00
appleguy
1a2184db98 Merge pull request #1599 from ejensen/video-ui-blocking
[ASVideoNode] Fix UI thread blocking with remote assets
2016-04-26 23:26:15 -07:00
Eric Jensen
f2ab6ca6dd Restructure conditional logic 2016-04-26 23:15:14 -07:00
Eric Jensen
fcf4a4d112 Prevent unnecessary locking when generating a placeholder image on a background thread 2016-04-26 19:44:53 -07:00
Eric Jensen
e3817ac42d Prevent UI blocking caused by accessing the AVAsset's 'tracks' property on the UI thread 2016-04-26 19:42:05 -07:00
Wendy
fe5c4caf90 Lock properly when setting currentImageQuality 2016-04-26 18:35:03 -07:00
Wendy
0b55df9649 Add the ability for ASNetworkImageNodes to keep track of their progressive image quality 2016-04-26 18:33:59 -07:00
Michael Schneider
2ab82f5995 Move to fast enumeration for iterating through an array
We move from block based enumeration for the array to fast enumeration as from a benchmark perspective this is faster. For the dictionary we stay with block based enumeration as looking up the value for the key in e.g. fast enumeration would be slower as using the block based API where we get the key and value for passed in
2016-04-26 10:45:35 -07:00
Michael Schneider
32f35d9d54 Use visibleNodeIndexPathsForRangeController: to base on visibleNodes in ASTableView 2016-04-26 10:37:32 -07:00
Michael Schneider
28cfd60900 Fix Assertion on cell deallocation due visibility not being cleared
Further information:
- We mark every node as visible in the ASRangeController which NSIndexPath is returned from visibleNodeIndexPathsForRangeController:
- In visibleNodeIndexPathsForRangeController: we get the visible index path's via a call to UITableView's "indexPathsForVisibleRows" method.
- Unfortunately in this case we cannot use indexPathsForVisibleRows to get all the visible index paths as apparently in a grouped UITableView it would return index paths for cells that are just a bit over the edge of the visible area.
- But this edge cells will never get a call for -tableView:cellForRowAtIndexPath:, but we will mark them as visible in the range controller
- In tableView:cellForRowAtIndexPath: we call -configureContentView:forCellNode
- Because we never get a -configureContentView:forCellNode call for the edge cells, the _ASDisplayView of the nodes will never be added to the window and get a willMoveToWindow and didMoveToWindow call and it's never get's added to the window for now and so the node is NOT marked as "in the hirarchy"
- If the deallocation of the views are happening without the UITableView ever scrolled, the cells don't get a call to __exitHierarchy as they were never added to the window and stay in the interface state "visible" and an exception will be raised within the dealloc method of the ASDisplayNode
2016-04-26 10:37:06 -07:00
Michael Schneider
ce6e11c6d2 Fix deadlock in ASNetworkImageNode
Calling _updateProgressImageBlockOnDownloaderIfNeeded should be called without _lock held. We will lock super to read our interface state and it's best to avoid acquiring both locks.
2016-04-25 13:15:11 -07:00
appleguy
2adc616e93 Merge pull request #1526 from Adlai-Holler/ImageNodeImprovements
[ASImageNode] Improvements to progressive decoding and cache accesses.
2016-04-23 23:05:41 -07:00
Michael Schneider
bcd91f18ce Remove ASLayoutOptions locking 2016-04-22 19:54:40 -07:00
appleguy
77713019d2 Merge pull request #1575 from aaronschubert0/tvOS
[tvOS] Improve tvOS code based upon comments.
2016-04-22 19:47:43 -07:00
appleguy
d968094778 Merge pull request #1583 from maicki/AddLayoutSpecBlockFollowUp
[ASDisplayNode] Add layout spec block follow up
2016-04-22 19:45:00 -07:00
Adlai Holler
05b22531e6 Include necessary header 2016-04-22 19:12:38 -05:00
Michael Schneider
5cfc16733a Add node as parameter in ASLayoutSpecBlock 2016-04-22 11:22:20 -07:00
Michael Schneider
79e5337948 Fix setter override for setLayoutSpecBlock: 2016-04-22 11:22:01 -07:00
Michael Schneider
fde8f1af0e Change layoutSpecBlock against NULL 2016-04-22 11:21:42 -07:00
Michael Schneider
f3c48805e0 Add better comments for layoutSpecBlock 2016-04-22 11:08:13 -07:00
Adlai Holler
a216b17b01 Merge branch 'master' into ImageNodeImprovements
Conflicts:
	AsyncDisplayKit/ASNetworkImageNode.mm
2016-04-22 12:36:58 -05:00
Adlai Holler
bc8a2b19ef [ASNetworkImageNode] Carry recent progress image block changes over from multiplex image node 2016-04-22 12:34:13 -05:00
Adlai Holler
f5adc7999b [ASMultiplexImageNode] Reduce lockage in visibilityDidChange 2016-04-22 12:23:02 -05:00