Merge in 'release/3.1' changes

Author: dotnet-bot

src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Controls/WebBrowserEvent.cs

@@ -24,8 +24,8 @@
 using MS.Internal.AppModel;
 using MS.Internal.Interop;
 
-//In order to avoid generating warnings about unknown message numbers and 
-//unknown pragmas when compiling your C# source code with the actual C# compiler, 
+//In order to avoid generating warnings about unknown message numbers and
+//unknown pragmas when compiling your C# source code with the actual C# compiler,
 //you need to disable warnings 1634 and 1691. (Presharp Documentation)
 #pragma warning disable 1634, 1691
 
@@ -72,15 +72,15 @@ public void BeforeNavigate2(object pDisp, ref object url, ref object flags, ref
 
                 UnsafeNativeMethods.IWebBrowser2 axIWebBrowser2 = (UnsafeNativeMethods.IWebBrowser2)pDisp;
                 // If _parent.AxIWebBrowser2 != axIWebBrowser2, navigation happens in a nested [i]frame.
-                // in that case we do not want to enforce site locking as we want the default IE behavior to take 
-                // over. 
+                // in that case we do not want to enforce site locking as we want the default IE behavior to take
+                // over.
                 if (_parent.AxIWebBrowser2 == axIWebBrowser2)
                 {
                     // The NavigatingToAboutBlank property indicates whether we are navigating to "about:blank"
                     // as a result of navigating to null or stream/string navigation.
                     // We set the NavigatingToAboutBlank bit to true in the WebBrowser DoNavigate method. When the above
-                    // conditions occur, the NavigatingToAboutBlank is true and the source must be "about:blank". 
-                    // 
+                    // conditions occur, the NavigatingToAboutBlank is true and the source must be "about:blank".
+                    //
                     // But when end user navigates away from the current about:blank page (by clicking
                     // on a hyperlink, Goback/Forward), or programmatically call GoBack and Forward,
                     // When we get the navigating event, NavigatingToAboutBlank is true, but the source is not "about:blank".
@@ -174,11 +174,11 @@ public void NavigateComplete2(object pDisp, ref object url)
         {
             Debug.Assert(url == null || url is string, "invalid url type");
 
-            // Events only fired for top level navigation. 
+            // Events only fired for top level navigation.
             UnsafeNativeMethods.IWebBrowser2 axIWebBrowser2 = (UnsafeNativeMethods.IWebBrowser2)pDisp;
-            if (_parent.AxIWebBrowser2 == axIWebBrowser2)
+            if (_parent.AxIWebBrowser2 == axIWebBrowser2 && !ShouldIgnoreCompletionEvent(ref url))
             {
-                // If we are loading from stream.                
+                // If we are loading from stream.
                 if (_parent.DocumentStream != null)
                 {
                     Invariant.Assert(_parent.NavigatingToAboutBlank &&
@@ -207,7 +207,7 @@ public void NavigateComplete2(object pDisp, ref object url)
                 {
                     string urlString = (string)url;
                     // When source set to null or navigating to stream/string, we navigate to "about:blank"
-                    // internally. Make sure we pass null in the event args. 
+                    // internally. Make sure we pass null in the event args.
                     if (_parent.NavigatingToAboutBlank)
                     {
                         Invariant.Assert(String.Compare(urlString, WebBrowser.AboutBlankUriString, StringComparison.OrdinalIgnoreCase) == 0);
@@ -229,13 +229,13 @@ public void DocumentComplete(object pDisp, ref object url)
         {
             Debug.Assert(url == null || url is string, "invalid url type");
 
-            // Events only fired for top level navigation. 
+            // Events only fired for top level navigation.
             UnsafeNativeMethods.IWebBrowser2 axIWebBrowser2 = (UnsafeNativeMethods.IWebBrowser2)pDisp;
-            if (_parent.AxIWebBrowser2 == axIWebBrowser2)
+            if (_parent.AxIWebBrowser2 == axIWebBrowser2 && !ShouldIgnoreCompletionEvent(ref url))
             {
                 string urlString = (string)url;
                 // When source set to null or navigating to stream/string, we navigate to "about:blank"
-                // internally. Make sure we pass null in the event args. 
+                // internally. Make sure we pass null in the event args.
                 if (_parent.NavigatingToAboutBlank)
                 {
                     Invariant.Assert(String.Compare(urlString, WebBrowser.AboutBlankUriString, StringComparison.OrdinalIgnoreCase) == 0);
@@ -248,6 +248,17 @@ public void DocumentComplete(object pDisp, ref object url)
             }
         }
 
+        // if we are navigating to "about:blank", ignore completion events
+        // for any other url.  These can happen despite our attempt to cancel
+        // outstanding navigations (see WebBrowser.DoNavigate), due to race
+        // conditions between the browser and us.
+        private bool ShouldIgnoreCompletionEvent(ref object url)
+        {
+            string urlString = url as string;
+            return (_parent.NavigatingToAboutBlank &&
+                    String.Compare(urlString, WebBrowser.AboutBlankUriString, StringComparison.OrdinalIgnoreCase) != 0);
+        }
+
         public void CommandStateChange(long command, bool enable)
         {
             if (command == NativeMethods.CSC_NAVIGATEBACK)

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/ScrollViewer.cs

@@ -246,7 +246,7 @@ public void InvalidateScrollInfo()
             // We also don't invalidate measure if we are in the middle of the
             // measure pass, as the ScrollViewer will already be updating the
             // visibility of the autoscrollbars.
-            if(!MeasureInProgress && 
+            if(!MeasureInProgress &&
                (!ArrangeInProgress || !InvalidatedMeasureFromArrange))
             {
                 //
@@ -892,7 +892,7 @@ public event ScrollChangedEventHandler ScrollChanged
         protected override void OnStylusSystemGesture(StylusSystemGestureEventArgs e)
         {
             // DevDiv:1139804
-            // Keep track of seeing a tap gesture so that we can use this information to 
+            // Keep track of seeing a tap gesture so that we can use this information to
             // make decisions about panning.
             _seenTapGesture = e.SystemGesture == SystemGesture.Tap;
         }
@@ -1175,7 +1175,7 @@ protected override Size MeasureOverride(Size constraint)
             ScrollBarVisibility vsbv = VerticalScrollBarVisibility;
             ScrollBarVisibility hsbv = HorizontalScrollBarVisibility;
             Size desiredSize = new Size();
-            
+
             if (child != null)
             {
                 bool etwTracingEnabled = EventTrace.IsEnabled(EventTrace.Keyword.KeywordGeneral, EventTrace.Level.Info);
@@ -1511,7 +1511,7 @@ private void OnPanningModeChanged()
             PanningMode mode = PanningMode;
 
             // Call InvalidateProperty for IsManipulationEnabledProperty
-            // to reset previous SetCurrentValueInternal if any. 
+            // to reset previous SetCurrentValueInternal if any.
             // Then call SetCurrentValueInternal to
             // set the value of these properties if needed.
             InvalidateProperty(IsManipulationEnabledProperty);
@@ -1742,7 +1742,7 @@ protected override void OnManipulationDelta(ManipulationDeltaEventArgs e)
                     // High precision touch devices can trigger a panning manipulation
                     // due to the low threshold we set for pan initiation.  This may be
                     // undesirable since we may enter pan for what the system considers a
-                    // tap.  Panning should be contingent on a drag gesture as that is the 
+                    // tap.  Panning should be contingent on a drag gesture as that is the
                     // most consistent with the system at large.  So if we have seen a tap
                     // on our main input, we should cancel any panning.
                     if (_seenTapGesture)
@@ -1831,7 +1831,7 @@ private void ManipulateScroll(double delta, double cumulativeTranslation, bool i
 
             if (DoubleUtil.AreClose(scrollableLength, 0))
             {
-                // If the Scrollable length in this direction is 0, 
+                // If the Scrollable length in this direction is 0,
                 // then we should neither scroll nor report the boundary feedback
                 unused = 0;
                 delta = 0;
@@ -1846,7 +1846,7 @@ private void ManipulateScroll(double delta, double cumulativeTranslation, bool i
             }
             else if (DoubleUtil.LessThan(delta, 0) && DoubleUtil.GreaterThan(unused, 0))
             {
-                // If we are past the boundary in positive direction 
+                // If we are past the boundary in positive direction
                 // and the delta is in negative direction,
                 // then compensate the delta from unused vector.
                 double newUnused = Math.Max(unused + delta, 0);
@@ -1855,7 +1855,7 @@ private void ManipulateScroll(double delta, double cumulativeTranslation, bool i
             }
             else if (DoubleUtil.GreaterThan(delta, 0) && DoubleUtil.LessThan(unused, 0))
             {
-                // If we are past the boundary in negative direction 
+                // If we are past the boundary in negative direction
                 // and the delta is in positive direction,
                 // then compensate the delta from unused vector.
                 double newUnused = Math.Min(unused + delta, 0);
@@ -1878,7 +1878,7 @@ private void ManipulateScroll(double delta, double cumulativeTranslation, bool i
                 if (!DoubleUtil.AreClose(delta, 0))
                 {
                     // if there is any delta left, then re-evalute the vertical offset
-                    ScrollToVerticalOffset(_panningInfo.OriginalVerticalOffset - 
+                    ScrollToVerticalOffset(_panningInfo.OriginalVerticalOffset -
                         Math.Round(PanningRatio * cumulativeTranslation / _panningInfo.DeltaPerVerticalOffset));
                 }
                 _panningInfo.UnusedTranslation = new Vector(_panningInfo.UnusedTranslation.X, unused);
@@ -1903,7 +1903,7 @@ private bool IsPastInertialLimit()
 
         /// <summary>
         ///     Scrolling due to manipulation can start only if there is a considerable delta
-        ///     in the direction based on the mode. This method makes sure that the delta is 
+        ///     in the direction based on the mode. This method makes sure that the delta is
         ///     considerable.
         /// </summary>
         private bool CanStartScrollManipulation(Vector translation, out bool cancelManipulation)
@@ -2312,6 +2312,15 @@ private bool ExecuteNextCommand()
 
                         if (!rcNew.IsEmpty)
                         {
+                            // clip the new rect to isi's bounds, in case isi didn't.
+                            // The ancestor's scroll should only depend on the visible
+                            // portion of the new rect.
+                            UIElement uie = visi as UIElement;
+                            if (uie != null)
+                            {
+                                rcNew.Intersect(new Rect(uie.RenderSize));
+                            }
+
                             GeneralTransform t = visi.TransformToAncestor(this);
                             rcNew = t.TransformBounds(rcNew);
                         }
@@ -2609,7 +2618,7 @@ private static void OnScrollCommand(object target, ExecutedRoutedEventArgs args)
             ScrollViewer sv = target as ScrollViewer;
             if (sv != null)
             {
-                // If any of the ScrollBar scroll commands are raised while 
+                // If any of the ScrollBar scroll commands are raised while
                 // scroll manipulation is in its inertia, then the manipualtion
                 // should be completed.
                 sv.CompleteScrollManipulation = true;
@@ -2636,8 +2645,8 @@ private static void OnQueryScrollCommand(object target, CanExecuteRoutedEventArg
                 {
                     args.CanExecute = false;
                     args.ContinueRouting = true;
-                    
-                    // It is important to handle this event to prevent any 
+
+                    // It is important to handle this event to prevent any
                     // other ScrollViewers in the ancestry from claiming it.
                     args.Handled = true;
                 }
@@ -2654,7 +2663,7 @@ private static void OnQueryScrollCommand(object target, CanExecuteRoutedEventArg
                 {
                     args.CanExecute = false;
 
-                    // It is important to handle this event to prevent any 
+                    // It is important to handle this event to prevent any
                     // other ScrollViewers in the ancestry from claiming it.
                     args.Handled = true;
                 }
@@ -2933,7 +2942,7 @@ internal bool InChildMeasurePass3
 
         private PanningInfo _panningInfo = null;
         private Flags _flags = Flags.HandlesMouseWheelScrolling;
-        
+
         #endregion
 
         //-------------------------------------------------------------------

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/VirtualizingStackPanel.cs

@@ -11139,32 +11139,23 @@ private void MakeVisiblePhysicalHelper(Rect r, ref Vector newOffset, ref Rect ne
                 viewportOffset, viewportOffset + viewportSize, targetRectOffset, targetRectOffset + targetRectSize, ref alignTop, ref alignBottom);
 
             // Compute the visible rectangle of the child relative to the viewport.
+            double start = targetRectOffset - minPhysicalOffset;
+            double end = start + targetRectSize;
 
-            if (alignTop)
-            {
-                targetRectOffset = viewportOffset;
-            }
-            else if (alignBottom)
-            {
-                targetRectOffset = viewportOffset + viewportSize - targetRectSize;
-            }
-
-            double left = Math.Max(targetRectOffset, minPhysicalOffset);
-            targetRectSize = Math.Max(Math.Min(targetRectSize + targetRectOffset, minPhysicalOffset + viewportSize) - left, 0);
-            targetRectOffset = left;
-            targetRectOffset -= viewportOffset;
+            double visibleStart = Math.Max(start, 0);
+            double visibleEnd = Math.Max(Math.Min(end, viewportSize), visibleStart);
 
             if (isHorizontal)
             {
                 newOffset.X = minPhysicalOffset;
-                newRect.X = targetRectOffset;
-                newRect.Width = targetRectSize;
+                newRect.X = visibleStart;
+                newRect.Width = visibleEnd - visibleStart;
             }
             else
             {
                 newOffset.Y = minPhysicalOffset;
-                newRect.Y = targetRectOffset;
-                newRect.Height = targetRectSize;
+                newRect.Y = visibleStart;
+                newRect.Height = visibleEnd - visibleStart;
             }
         }