Changeset 25142 in webkit

Timestamp:

Aug 17, 2007, 8:48:59 PM (18 years ago)

Author:

mjs

Message:

WebCore:

Reviewed by Darin.

• WebCore part of fix to scrollbar suppression hack for Leopard

• loader/FrameLoader.cpp: (WebCore::FrameLoader::transitionToCommitted): Suppress scrollbars earlier, so it happens before any potential view swap.

WebKit:

Reviewed by Darin.

• WebKit part of fix to scrollbar suppression hack for Leopard

• WebView/WebDynamicScrollBarsView.m: (-[WebDynamicScrollBarsView reflectScrolledClipView:]): Don't call the superclass method when scrollbars are suppressed. (-[WebDynamicScrollBarsView setScrollBarsSuppressed:repaintOnUnsuppress:]): Instead call it here, when unsuppressing.

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/FrameLoader.cpp (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebView/WebDynamicScrollBarsView.m (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-08-17  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Darin.
+
+        - WebCore part of fix to scrollbar suppression hack for Leopard
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::transitionToCommitted): Suppress scrollbars earlier, so it happens
+        before any potential view swap.
+
 2007-08-17  Antti Koivisto  <antti@apple.com>
 

trunk/WebCore/loader/FrameLoader.cpp

@@ -2506 +2506 @@
         case FrameLoadTypeStandard:
             updateHistoryForStandardLoad();
+            if (m_frame->view())
+                m_frame->view()->suppressScrollbars(true);
             m_client->makeDocumentView();
             break;

trunk/WebKit/ChangeLog

@@ +1 @@
+2007-08-17  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Darin.
+
+        - WebKit part of fix to scrollbar suppression hack for Leopard
+
+        * WebView/WebDynamicScrollBarsView.m:
+        (-[WebDynamicScrollBarsView reflectScrolledClipView:]): Don't call the superclass method
+        when scrollbars are suppressed.
+        (-[WebDynamicScrollBarsView setScrollBarsSuppressed:repaintOnUnsuppress:]): Instead call it
+        here, when unsuppressing.
+
 2007-08-17  Darin Adler  <darin@apple.com>
 

trunk/WebKit/WebView/WebDynamicScrollBarsView.m

@@ -42 +42 @@
 {
     suppressScrollers = suppressed;
-    if (suppressed || repaint) {
-        [[self verticalScroller] setNeedsDisplay: !suppressed];
-        [[self horizontalScroller] setNeedsDisplay: !suppressed];
-    }
+    if (suppressed) {
+        [[self verticalScroller] setNeedsDisplay:NO];
+        [[self horizontalScroller] setNeedsDisplay:NO];
+    }
+        
+    if (!suppressed && repaint)
+        [super reflectScrolledClipView:[self contentView]];
 }
 
@@ -132 +135 @@
             [self updateScrollers];
     }
-    [super reflectScrolledClipView:clipView];
-
-    // Validate the scrollers if they're being suppressed.
-    if (suppressScrollers) {
-        [[self verticalScroller] setNeedsDisplay: NO];
-        [[self horizontalScroller] setNeedsDisplay: NO];
-    }
+
+    // Update the scrollers if they're not being suppressed.
+    if (!suppressScrollers)
+        [super reflectScrolledClipView:clipView];
 }