| 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 426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 437 GraphicsLayer* PinchViewport::layerForHorizontalScrollbar() const | 437 GraphicsLayer* PinchViewport::layerForHorizontalScrollbar() const |
| 438 { | 438 { |
| 439 return m_overlayScrollbarHorizontal.get(); | 439 return m_overlayScrollbarHorizontal.get(); |
| 440 } | 440 } |
| 441 | 441 |
| 442 GraphicsLayer* PinchViewport::layerForVerticalScrollbar() const | 442 GraphicsLayer* PinchViewport::layerForVerticalScrollbar() const |
| 443 { | 443 { |
| 444 return m_overlayScrollbarVertical.get(); | 444 return m_overlayScrollbarVertical.get(); |
| 445 } | 445 } |
| 446 | 446 |
| 447 void PinchViewport::notifyAnimationStarted(const GraphicsLayer*, double monotoni
cTime) | |
| 448 { | |
| 449 } | |
| 450 | |
| 451 void PinchViewport::paintContents(const GraphicsLayer*, GraphicsContext&, Graphi
csLayerPaintingPhase, const IntRect& inClip) | 447 void PinchViewport::paintContents(const GraphicsLayer*, GraphicsContext&, Graphi
csLayerPaintingPhase, const IntRect& inClip) |
| 452 { | 448 { |
| 453 } | 449 } |
| 454 | 450 |
| 455 LocalFrame* PinchViewport::mainFrame() const | 451 LocalFrame* PinchViewport::mainFrame() const |
| 456 { | 452 { |
| 457 return frameHost().page().mainFrame() && frameHost().page().mainFrame()->isL
ocalFrame() ? frameHost().page().deprecatedLocalMainFrame() : 0; | 453 return frameHost().page().mainFrame() && frameHost().page().mainFrame()->isL
ocalFrame() ? frameHost().page().deprecatedLocalMainFrame() : 0; |
| 458 } | 454 } |
| 459 | 455 |
| 460 FloatPoint PinchViewport::clampOffsetToBoundaries(const FloatPoint& offset) | 456 FloatPoint PinchViewport::clampOffsetToBoundaries(const FloatPoint& offset) |
| (...skipping 23 matching lines...) Expand all Loading... |
| 484 } else if (graphicsLayer == m_overlayScrollbarVertical.get()) { | 480 } else if (graphicsLayer == m_overlayScrollbarVertical.get()) { |
| 485 name = "Overlay Scrollbar Vertical Layer"; | 481 name = "Overlay Scrollbar Vertical Layer"; |
| 486 } else { | 482 } else { |
| 487 ASSERT_NOT_REACHED(); | 483 ASSERT_NOT_REACHED(); |
| 488 } | 484 } |
| 489 | 485 |
| 490 return name; | 486 return name; |
| 491 } | 487 } |
| 492 | 488 |
| 493 } // namespace blink | 489 } // namespace blink |
| OLD | NEW |