| 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 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 , m_currentGraphicsLayer(0) | 67 , m_currentGraphicsLayer(0) |
| 68 , m_geometryNeedsUpdate(false) | 68 , m_geometryNeedsUpdate(false) |
| 69 , m_isAnimating(false) | 69 , m_isAnimating(false) |
| 70 , m_startTime(monotonicallyIncreasingTime()) | 70 , m_startTime(monotonicallyIncreasingTime()) |
| 71 { | 71 { |
| 72 ASSERT(m_node); | 72 ASSERT(m_node); |
| 73 ASSERT(owningWebViewImpl); | 73 ASSERT(owningWebViewImpl); |
| 74 WebCompositorSupport* compositorSupport = Platform::current()->compositorSup
port(); | 74 WebCompositorSupport* compositorSupport = Platform::current()->compositorSup
port(); |
| 75 m_contentLayer = adoptPtr(compositorSupport->createContentLayer(this)); | 75 m_contentLayer = adoptPtr(compositorSupport->createContentLayer(this)); |
| 76 m_clipLayer = adoptPtr(compositorSupport->createLayer()); | 76 m_clipLayer = adoptPtr(compositorSupport->createLayer()); |
| 77 m_clipLayer->setAnchorPoint(WebFloatPoint()); | |
| 78 m_clipLayer->setTransformOrigin(WebFloatPoint3D()); | 77 m_clipLayer->setTransformOrigin(WebFloatPoint3D()); |
| 79 m_clipLayer->addChild(m_contentLayer->layer()); | 78 m_clipLayer->addChild(m_contentLayer->layer()); |
| 80 m_contentLayer->layer()->setAnimationDelegate(this); | 79 m_contentLayer->layer()->setAnimationDelegate(this); |
| 81 m_contentLayer->layer()->setDrawsContent(true); | 80 m_contentLayer->layer()->setDrawsContent(true); |
| 82 m_contentLayer->layer()->setOpacity(1); | 81 m_contentLayer->layer()->setOpacity(1); |
| 83 m_geometryNeedsUpdate = true; | 82 m_geometryNeedsUpdate = true; |
| 84 updateGeometry(); | 83 updateGeometry(); |
| 85 } | 84 } |
| 86 | 85 |
| 87 LinkHighlight::~LinkHighlight() | 86 LinkHighlight::~LinkHighlight() |
| (...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 355 // Make sure we update geometry on the next callback from WebViewImpl::layou
t(). | 354 // Make sure we update geometry on the next callback from WebViewImpl::layou
t(). |
| 356 m_geometryNeedsUpdate = true; | 355 m_geometryNeedsUpdate = true; |
| 357 } | 356 } |
| 358 | 357 |
| 359 WebLayer* LinkHighlight::layer() | 358 WebLayer* LinkHighlight::layer() |
| 360 { | 359 { |
| 361 return clipLayer(); | 360 return clipLayer(); |
| 362 } | 361 } |
| 363 | 362 |
| 364 } // namespace WeKit | 363 } // namespace WeKit |
| OLD | NEW |