| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google 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 442 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 453 ASSERT_TRUE(innerCompositor->scrollLayer()); | 453 ASSERT_TRUE(innerCompositor->scrollLayer()); |
| 454 | 454 |
| 455 GraphicsLayer* scrollLayer = innerCompositor->scrollLayer(); | 455 GraphicsLayer* scrollLayer = innerCompositor->scrollLayer(); |
| 456 ASSERT_EQ(innerFrameView, scrollLayer->scrollableArea()); | 456 ASSERT_EQ(innerFrameView, scrollLayer->scrollableArea()); |
| 457 | 457 |
| 458 WebLayer* webScrollLayer = scrollLayer->platformLayer(); | 458 WebLayer* webScrollLayer = scrollLayer->platformLayer(); |
| 459 ASSERT_TRUE(webScrollLayer->scrollable()); | 459 ASSERT_TRUE(webScrollLayer->scrollable()); |
| 460 | 460 |
| 461 int expectedScrollPosition = 958 + (innerFrameView->verticalScrollbar()->isO
verlayScrollbar() ? 0 : 15); | 461 int expectedScrollPosition = 958 + (innerFrameView->verticalScrollbar()->isO
verlayScrollbar() ? 0 : 15); |
| 462 ASSERT_EQ(expectedScrollPosition, webScrollLayer->scrollPosition().x); | 462 ASSERT_EQ(expectedScrollPosition, webScrollLayer->scrollPosition().x); |
| 463 ASSERT_EQ(expectedScrollPosition, webScrollLayer->maxScrollPosition().width)
; | |
| 464 } | 463 } |
| 465 | 464 |
| 466 TEST_F(ScrollingCoordinatorChromiumTest, setupScrollbarLayerShouldNotCrash) | 465 TEST_F(ScrollingCoordinatorChromiumTest, setupScrollbarLayerShouldNotCrash) |
| 467 { | 466 { |
| 468 registerMockedHttpURLLoad("setup_scrollbar_layer_crash.html"); | 467 registerMockedHttpURLLoad("setup_scrollbar_layer_crash.html"); |
| 469 navigateTo(m_baseURL + "setup_scrollbar_layer_crash.html"); | 468 navigateTo(m_baseURL + "setup_scrollbar_layer_crash.html"); |
| 470 forceFullCompositingUpdate(); | 469 forceFullCompositingUpdate(); |
| 471 // This test document setup an iframe with scrollbars, then switch to | 470 // This test document setup an iframe with scrollbars, then switch to |
| 472 // an empty document by javascript. | 471 // an empty document by javascript. |
| 473 } | 472 } |
| 474 | 473 |
| 475 } // namespace | 474 } // namespace |
| OLD | NEW |