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

[ASTextNode, ASImageNode, ASVideoNode] Use ASDisplayNode base class lock for subclass property synchronization #1877

Merged
merged 11 commits into from
Jul 10, 2016
Merged

[ASTextNode, ASImageNode, ASVideoNode] Use ASDisplayNode base class lock for subclass property synchronization #1877

merged 11 commits into from
Jul 10, 2016

Commits on Jul 7, 2016

  1. Merge remote-tracking branch 'facebook/master'

    Hannah Trosi committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    2fabd64 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'facebook/master'

    Hannah Trosi committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    224823b View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2016

  1. Merge branch 'master' of https://github.com/facebook/AsyncDisplayKit

    Hannah Trosi committed Jul 8, 2016
    Configuration menu
    Copy the full SHA
    4e265d9 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2016

  1. Merge branch 'master' of https://github.com/facebook/AsyncDisplayKit

    Hannah Trosi committed Jul 10, 2016
    Configuration menu
    Copy the full SHA
    28f497c View commit details
    Browse the repository at this point in the history

  2. [ASTextNode, ASVideoNode] Use ASDisplayNode base class lock for subcl… 

    …ass property synchronization
    Hannah Trosi committed Jul 10, 2016
    Configuration menu
    Copy the full SHA
    198cd6e View commit details
    Browse the repository at this point in the history

  3. fix headers to match master

    Hannah Trosi committed Jul 10, 2016
    Configuration menu
    Copy the full SHA
    3ab7aa0 View commit details
    Browse the repository at this point in the history

  4. address @appleguy, @maicki comments

    Hannah Trosi committed Jul 10, 2016
    Configuration menu
    Copy the full SHA
    79e3d63 View commit details
    Browse the repository at this point in the history

  5. import header

    Hannah Trosi committed Jul 10, 2016
    Configuration menu
    Copy the full SHA
    878e9bf View commit details
    Browse the repository at this point in the history

  6. Swap lock in ASNetworkImageNode as well

    Hannah Trosi committed Jul 10, 2016
    Configuration menu
    Copy the full SHA
    358cde4 View commit details
    Browse the repository at this point in the history

  7. remove invalid comment

    Hannah Trosi committed Jul 10, 2016
    Configuration menu
    Copy the full SHA
    6f0a934 View commit details
    Browse the repository at this point in the history

  8. more cleanup of locks

    Hannah Trosi committed Jul 10, 2016
    Configuration menu
    Copy the full SHA
    69a8048 View commit details
    Browse the repository at this point in the history