Title: [165491] trunk/Source
- Revision
- 165491
- Author
- [email protected]
- Date
- 2014-03-12 11:52:25 -0700 (Wed, 12 Mar 2014)
Log Message
Spelling is hard
https://bugs.webkit.org/show_bug.cgi?id=130146
Source/WebCore:
Reviewed by Beth Dakin.
Fix spelling (constained -> constrained).
* rendering/RenderLayerModelObject.cpp:
(WebCore::RenderLayerModelObject::styleDidChange):
Source/WebKit/ios:
Reviewed by Beth Dakin.
Fix spelling (constained -> constrained).
* WebCoreSupport/WebFixedPositionContent.mm:
(-[WebFixedPositionContent scrollOrZoomChanged:]):
(-[WebFixedPositionContent overflowScrollPositionForLayer:changedTo:]):
(-[WebFixedPositionContent setViewportConstrainedLayers:WTF::WebCore::stickyContainerMap:WTF::]):
(-[WebFixedPositionContent hasFixedOrStickyPositionLayers]):
(-[WebFixedPositionContent minimumOffsetFromFixedPositionLayersToAnchorEdge:ofRect:inLayer:]):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (165490 => 165491)
--- trunk/Source/WebCore/ChangeLog 2014-03-12 18:29:00 UTC (rev 165490)
+++ trunk/Source/WebCore/ChangeLog 2014-03-12 18:52:25 UTC (rev 165491)
@@ -1,5 +1,17 @@
2014-03-12 Simon Fraser <[email protected]>
+ Spelling is hard
+ https://bugs.webkit.org/show_bug.cgi?id=130146
+
+ Reviewed by Beth Dakin.
+
+ Fix spelling (constained -> constrained).
+
+ * rendering/RenderLayerModelObject.cpp:
+ (WebCore::RenderLayerModelObject::styleDidChange):
+
+2014-03-12 Simon Fraser <[email protected]>
+
Change scrollOffsetForFixedPosition() to do LayoutUnit math
https://bugs.webkit.org/show_bug.cgi?id=129981
Modified: trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp (165490 => 165491)
--- trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp 2014-03-12 18:29:00 UTC (rev 165490)
+++ trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp 2014-03-12 18:52:25 UTC (rev 165491)
@@ -166,10 +166,10 @@
setChildNeedsLayout();
}
- bool newStyleIsViewportConstained = style().hasViewportConstrainedPosition();
+ bool newStyleIsViewportConstrained = style().hasViewportConstrainedPosition();
bool oldStyleIsViewportConstrained = oldStyle && oldStyle->hasViewportConstrainedPosition();
- if (newStyleIsViewportConstained != oldStyleIsViewportConstrained) {
- if (newStyleIsViewportConstained && layer())
+ if (newStyleIsViewportConstrained != oldStyleIsViewportConstrained) {
+ if (newStyleIsViewportConstrained && layer())
view().frameView().addViewportConstrainedObject(this);
else
view().frameView().removeViewportConstrainedObject(this);
Modified: trunk/Source/WebKit/ios/ChangeLog (165490 => 165491)
--- trunk/Source/WebKit/ios/ChangeLog 2014-03-12 18:29:00 UTC (rev 165490)
+++ trunk/Source/WebKit/ios/ChangeLog 2014-03-12 18:52:25 UTC (rev 165491)
@@ -1,3 +1,19 @@
+2014-03-12 Simon Fraser <[email protected]>
+
+ Spelling is hard
+ https://bugs.webkit.org/show_bug.cgi?id=130146
+
+ Reviewed by Beth Dakin.
+
+ Fix spelling (constained -> constrained).
+
+ * WebCoreSupport/WebFixedPositionContent.mm:
+ (-[WebFixedPositionContent scrollOrZoomChanged:]):
+ (-[WebFixedPositionContent overflowScrollPositionForLayer:changedTo:]):
+ (-[WebFixedPositionContent setViewportConstrainedLayers:WTF::WebCore::stickyContainerMap:WTF::]):
+ (-[WebFixedPositionContent hasFixedOrStickyPositionLayers]):
+ (-[WebFixedPositionContent minimumOffsetFromFixedPositionLayersToAnchorEdge:ofRect:inLayer:]):
+
2014-02-17 Sergio Correia <[email protected]>
Replace uses of PassOwnPtr/OwnPtr with std::unique_ptr in WebCore/inspector
Modified: trunk/Source/WebKit/ios/WebCoreSupport/WebFixedPositionContent.mm (165490 => 165491)
--- trunk/Source/WebKit/ios/WebCoreSupport/WebFixedPositionContent.mm 2014-03-12 18:29:00 UTC (rev 165490)
+++ trunk/Source/WebKit/ios/WebCoreSupport/WebFixedPositionContent.mm 2014-03-12 18:52:25 UTC (rev 165491)
@@ -70,7 +70,7 @@
~WebFixedPositionContentData();
WebView *m_webView;
- LayerInfoMap m_viewportConstainedLayers;
+ LayerInfoMap m_viewportConstrainedLayers;
};
@@ -103,8 +103,8 @@
{
MutexLocker lock(WebFixedPositionContentDataLock());
- LayerInfoMap::const_iterator end = _private->m_viewportConstainedLayers.end();
- for (LayerInfoMap::const_iterator it = _private->m_viewportConstainedLayers.begin(); it != end; ++it) {
+ LayerInfoMap::const_iterator end = _private->m_viewportConstrainedLayers.end();
+ for (LayerInfoMap::const_iterator it = _private->m_viewportConstrainedLayers.begin(); it != end; ++it) {
CALayer *layer = it->key.get();
ViewportConstrainedLayerData* constraintData = it->value.get();
const ViewportConstraints& constraints = *(constraintData->m_viewportConstraints.get());
@@ -142,8 +142,8 @@
{
MutexLocker lock(WebFixedPositionContentDataLock());
- LayerInfoMap::const_iterator end = _private->m_viewportConstainedLayers.end();
- for (LayerInfoMap::const_iterator it = _private->m_viewportConstainedLayers.begin(); it != end; ++it) {
+ LayerInfoMap::const_iterator end = _private->m_viewportConstrainedLayers.end();
+ for (LayerInfoMap::const_iterator it = _private->m_viewportConstrainedLayers.begin(); it != end; ++it) {
CALayer *layer = it->key.get();
ViewportConstrainedLayerData* constraintData = it->value.get();
@@ -175,7 +175,7 @@
{
MutexLocker lock(WebFixedPositionContentDataLock());
- _private->m_viewportConstainedLayers.clear();
+ _private->m_viewportConstrainedLayers.clear();
HashMap<CALayer *, OwnPtr<ViewportConstraints> >::iterator end = layerMap.end();
for (HashMap<CALayer *, OwnPtr<ViewportConstraints> >::iterator it = layerMap.begin(); it != end; ++it) {
@@ -185,14 +185,14 @@
layerData->m_enclosingAcceleratedScrollLayer = stickyContainers.get(layer);
layerData->m_viewportConstraints = it->value.release();
- _private->m_viewportConstainedLayers.set(layer, layerData.release());
+ _private->m_viewportConstrainedLayers.set(layer, layerData.release());
}
}
- (BOOL)hasFixedOrStickyPositionLayers
{
MutexLocker lock(WebFixedPositionContentDataLock());
- return !_private->m_viewportConstainedLayers.isEmpty();
+ return !_private->m_viewportConstrainedLayers.isEmpty();
}
static ViewportConstraints::AnchorEdgeFlags anchorEdgeFlagsForAnchorEdge(WebFixedPositionAnchorEdge edge)
@@ -214,8 +214,8 @@
MutexLocker lock(WebFixedPositionContentDataLock());
ViewportConstraints::AnchorEdgeFlags anchorEdgeFlags = anchorEdgeFlagsForAnchorEdge(anchorEdge);
CGFloat minimumOffset = CGFLOAT_MAX;
- LayerInfoMap::const_iterator end = _private->m_viewportConstainedLayers.end();
- for (LayerInfoMap::const_iterator it = _private->m_viewportConstainedLayers.begin(); it != end; ++it) {
+ LayerInfoMap::const_iterator end = _private->m_viewportConstrainedLayers.end();
+ for (LayerInfoMap::const_iterator it = _private->m_viewportConstrainedLayers.begin(); it != end; ++it) {
CALayer *fixedLayer = it->key.get();
ViewportConstrainedLayerData* constraintData = it->value.get();
const ViewportConstraints& constraints = *(constraintData->m_viewportConstraints.get());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
