| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 525 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 536 IntSize VisualViewport::contentsSize() const | 536 IntSize VisualViewport::contentsSize() const |
| 537 { | 537 { |
| 538 LocalFrame* frame = mainFrame(); | 538 LocalFrame* frame = mainFrame(); |
| 539 | 539 |
| 540 if (!frame || !frame->view()) | 540 if (!frame || !frame->view()) |
| 541 return IntSize(); | 541 return IntSize(); |
| 542 | 542 |
| 543 return frame->view()->visibleContentRect(IncludeScrollbars).size(); | 543 return frame->view()->visibleContentRect(IncludeScrollbars).size(); |
| 544 } | 544 } |
| 545 | 545 |
| 546 void VisualViewport::invalidateScrollbarRect(Scrollbar*, const IntRect&) |
| 547 { |
| 548 // Do nothing. Visual scrollbars live on the compositor thread and will |
| 549 // be updated when the viewport is synced to the CC. |
| 550 } |
| 551 |
| 546 void VisualViewport::setScrollOffset(const IntPoint& offset, ScrollType scrollTy
pe) | 552 void VisualViewport::setScrollOffset(const IntPoint& offset, ScrollType scrollTy
pe) |
| 547 { | 553 { |
| 548 setScrollOffset(DoublePoint(offset), scrollType); | 554 setScrollOffset(DoublePoint(offset), scrollType); |
| 549 } | 555 } |
| 550 | 556 |
| 551 void VisualViewport::setScrollOffset(const DoublePoint& offset, ScrollType) | 557 void VisualViewport::setScrollOffset(const DoublePoint& offset, ScrollType) |
| 552 { | 558 { |
| 553 setLocation(toFloatPoint(offset)); | 559 setLocation(toFloatPoint(offset)); |
| 554 } | 560 } |
| 555 | 561 |
| (...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 731 } else if (graphicsLayer == m_rootTransformLayer) { | 737 } else if (graphicsLayer == m_rootTransformLayer) { |
| 732 name = "Root Transform Layer"; | 738 name = "Root Transform Layer"; |
| 733 } else { | 739 } else { |
| 734 ASSERT_NOT_REACHED(); | 740 ASSERT_NOT_REACHED(); |
| 735 } | 741 } |
| 736 | 742 |
| 737 return name; | 743 return name; |
| 738 } | 744 } |
| 739 | 745 |
| 740 } // namespace blink | 746 } // namespace blink |
| OLD | NEW |