| OLD | NEW | 
|     1 /* |     1 /* | 
|     2  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. |     2  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. | 
|     3  * |     3  * | 
|     4  * Redistribution and use in source and binary forms, with or without |     4  * Redistribution and use in source and binary forms, with or without | 
|     5  * modification, are permitted provided that the following conditions |     5  * modification, are permitted provided that the following conditions | 
|     6  * are met: |     6  * are met: | 
|     7  * 1. Redistributions of source code must retain the above copyright |     7  * 1. Redistributions of source code must retain the above copyright | 
|     8  *    notice, this list of conditions and the following disclaimer. |     8  *    notice, this list of conditions and the following disclaimer. | 
|     9  * 2. Redistributions in binary form must reproduce the above copyright |     9  * 2. Redistributions in binary form must reproduce the above copyright | 
|    10  *    notice, this list of conditions and the following disclaimer in the |    10  *    notice, this list of conditions and the following disclaimer in the | 
| (...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   428  |   428  | 
|   429         if (!scrollbarsAreOverlay) { |   429         if (!scrollbarsAreOverlay) { | 
|   430             // If we ever turn one scrollbar off, always turn the other one off 
      too.  Never ever |   430             // If we ever turn one scrollbar off, always turn the other one off 
      too.  Never ever | 
|   431             // try to both gain/lose a scrollbar in the same pass. |   431             // try to both gain/lose a scrollbar in the same pass. | 
|   432             if (!newHasHorizontalScrollbar && hasHorizontalScrollbar && vScroll 
      != ScrollbarAlwaysOn) |   432             if (!newHasHorizontalScrollbar && hasHorizontalScrollbar && vScroll 
      != ScrollbarAlwaysOn) | 
|   433                 newHasVerticalScrollbar = false; |   433                 newHasVerticalScrollbar = false; | 
|   434             if (!newHasVerticalScrollbar && hasVerticalScrollbar && hScroll != S
      crollbarAlwaysOn) |   434             if (!newHasVerticalScrollbar && hasVerticalScrollbar && hScroll != S
      crollbarAlwaysOn) | 
|   435                 newHasHorizontalScrollbar = false; |   435                 newHasHorizontalScrollbar = false; | 
|   436         } |   436         } | 
|   437  |   437  | 
|   438         bool scrollbarIsOverlay = ScrollbarTheme::theme()->usesOverlayScrollbars
      (); |  | 
|   439         if (hasHorizontalScrollbar != newHasHorizontalScrollbar) { |   438         if (hasHorizontalScrollbar != newHasHorizontalScrollbar) { | 
|   440             scrollbarExistenceChanged = true; |   439             scrollbarExistenceChanged = true; | 
|   441             if (scrollOrigin().y() && !newHasHorizontalScrollbar && !scrollbarsA
      reOverlay) |   440             if (scrollOrigin().y() && !newHasHorizontalScrollbar && !scrollbarsA
      reOverlay) | 
|   442                 ScrollableArea::setScrollOrigin(IntPoint(scrollOrigin().x(), scr
      ollOrigin().y() - m_horizontalScrollbar->height())); |   441                 ScrollableArea::setScrollOrigin(IntPoint(scrollOrigin().x(), scr
      ollOrigin().y() - m_horizontalScrollbar->height())); | 
|   443             if (hasHorizontalScrollbar) |   442             if (hasHorizontalScrollbar) | 
|   444                 m_horizontalScrollbar->invalidate(); |   443                 m_horizontalScrollbar->invalidate(); | 
|   445             setHasHorizontalScrollbar(newHasHorizontalScrollbar); |   444             setHasHorizontalScrollbar(newHasHorizontalScrollbar); | 
|   446         } |   445         } | 
|   447  |   446  | 
|   448         if (hasVerticalScrollbar != newHasVerticalScrollbar) { |   447         if (hasVerticalScrollbar != newHasVerticalScrollbar) { | 
| (...skipping 806 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1255 { |  1254 { | 
|  1256 } |  1255 } | 
|  1257  |  1256  | 
|  1258 bool ScrollView::platformIsOffscreen() const |  1257 bool ScrollView::platformIsOffscreen() const | 
|  1259 { |  1258 { | 
|  1260     return false; |  1259     return false; | 
|  1261 } |  1260 } | 
|  1262  |  1261  | 
|  1263  |  1262  | 
|  1264 } |  1263 } | 
| OLD | NEW |