 
 		return unless @content
 
-		contentFrame = @calculateContentSize()
-		contentFrame.x = 0 + @_contentInset.left
-		contentFrame.y = 0 + @_contentInset.top
+		contentFrame = @calculateContentFrame()
+		contentFrame.x = contentFrame.x + @_contentInset.left
+		contentFrame.y = contentFrame.x + @_contentInset.top
 		@content.frame = contentFrame
 
-		constraintsFrame = @calculateContentSize()
+		constraintsFrame = @calculateContentFrame()
 		constraintsFrame =
 			x: -constraintsFrame.width  + @width - @_contentInset.right
 			y: -constraintsFrame.height + @height - @_contentInset.bottom

	closestContentLayerForScrollPoint: (scrollPoint, originX=0, originY=0) ->
		return _.first(@_contentLayersSortedByDistanceForScrollPoint(scrollPoint, originX, originY))

	contentLayersAbove: (point) -> _.filter @content.subLayers, (l) => 
			Utils.framePointForOrigin(l.frame, @originX, @originY).y > point.y

	contentLayersBelow: (point) -> _.filter @content.subLayers, (l) => 
			Utils.framePointForOrigin(l.frame, @originX, @originY).y < point.y

	contentLayersLeft: (point) -> _.filter @content.subLayers, (l) => 
			Utils.framePointForOrigin(l.frame, @originX, @originY).x < point.x

	contentLayersRight: (point) -> _.filter @content.subLayers, (l) => 
			Utils.framePointForOrigin(l.frame, @originX, @originY).x > point.x

	_scrollPointForLayer: (layer, originX=0, originY=0, clamp=true) ->
		return Utils.framePointForOrigin(layer, originX, originY)


		@_applyOptionsAndDefaults(options)
		@_enableMouseWheelHandling()

	calculateContentFrame: ->

		# Calculates the size of the content. By default this returns the total
		# size of all the content layers based on width and height. You can override
