Changeset 165491 in webkit

Timestamp:

Mar 12, 2014, 11:52:25 AM (12 years ago)

Author:

Simon Fraser

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:]):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderLayerModelObject.cpp (modified) (1 diff)
• WebKit/ios/ChangeLog (modified) (1 diff)
• WebKit/ios/WebCoreSupport/WebFixedPositionContent.mm (modified) (7 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-12  Simon Fraser  <simon.fraser@apple.com>
+
+        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  <simon.fraser@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp

@@ -167 +167 @@
     }
 
-    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

trunk/Source/WebKit/ios/ChangeLog

@@ +1 @@
+2014-03-12  Simon Fraser  <simon.fraser@apple.com>
+
+        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  <sergio.correia@openbossa.org>
 

trunk/Source/WebKit/ios/WebCoreSupport/WebFixedPositionContent.mm

@@ -71 +71 @@
     
     WebView *m_webView;
-    LayerInfoMap m_viewportConstainedLayers;
+    LayerInfoMap m_viewportConstrainedLayers;
 };
 
@@ -104 +104 @@
     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();
@@ -143 +143 @@
     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();
@@ -176 +176 @@
     MutexLocker lock(WebFixedPositionContentDataLock());
 
-    _private->m_viewportConstainedLayers.clear();
+    _private->m_viewportConstrainedLayers.clear();
 
     HashMap<CALayer *, OwnPtr<ViewportConstraints> >::iterator end = layerMap.end();
@@ -186 +186 @@
         layerData->m_viewportConstraints = it->value.release();
 
-        _private->m_viewportConstainedLayers.set(layer, layerData.release());
+        _private->m_viewportConstrainedLayers.set(layer, layerData.release());
     }
 }
@@ -193 +193 @@
 {
     MutexLocker lock(WebFixedPositionContentDataLock());
-    return !_private->m_viewportConstainedLayers.isEmpty();
+    return !_private->m_viewportConstrainedLayers.isEmpty();
 }
 
@@ -215 +215 @@
     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();