| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 #include "WebContentLayerImpl.h" | 6 #include "WebContentLayerImpl.h" |
| 7 | 7 |
| 8 #include "SkMatrix44.h" | 8 #include "SkMatrix44.h" |
| 9 #include "cc/content_layer.h" | 9 #include "cc/content_layer.h" |
| 10 #include "cc/stubs/float_rect.h" | 10 #include "cc/stubs/float_rect.h" |
| 11 #include "cc/stubs/int_rect.h" | 11 #include "cc/stubs/int_rect.h" |
| 12 #include "third_party/WebKit/Source/Platform/chromium/public/WebContentLayerClie
nt.h" | 12 #include "third_party/WebKit/Source/Platform/chromium/public/WebContentLayerClie
nt.h" |
| 13 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" | 13 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" |
| 14 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h" | 14 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h" |
| 15 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" | 15 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" |
| 16 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" | 16 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" |
| 17 #include "webcore_convert.h" | 17 #include "webcore_convert.h" |
| 18 | 18 |
| 19 using namespace cc; | 19 using namespace cc; |
| 20 | 20 |
| 21 namespace WebKit { | 21 namespace WebKit { |
| 22 | 22 |
| 23 WebContentLayer* WebContentLayer::create(WebContentLayerClient* client) | 23 WebContentLayer* WebContentLayer::create(WebContentLayerClient* client) |
| 24 { | 24 { |
| 25 return new WebContentLayerImpl(client); | 25 return new WebContentLayerImpl(client); |
| 26 } | 26 } |
| 27 | 27 |
| 28 WebContentLayerImpl::WebContentLayerImpl(WebContentLayerClient* client) | 28 WebContentLayerImpl::WebContentLayerImpl(WebContentLayerClient* client) |
| 29 : m_layer(new WebLayerImpl(ContentLayerChromium::create(this))) | 29 : m_layer(new WebLayerImpl(ContentLayer::create(this))) |
| 30 , m_client(client) | 30 , m_client(client) |
| 31 { | 31 { |
| 32 m_layer->layer()->setIsDrawable(true); | 32 m_layer->layer()->setIsDrawable(true); |
| 33 } | 33 } |
| 34 | 34 |
| 35 WebContentLayerImpl::~WebContentLayerImpl() | 35 WebContentLayerImpl::~WebContentLayerImpl() |
| 36 { | 36 { |
| 37 static_cast<ContentLayerChromium*>(m_layer->layer())->clearClient(); | 37 static_cast<ContentLayer*>(m_layer->layer())->clearClient(); |
| 38 } | 38 } |
| 39 | 39 |
| 40 WebLayer* WebContentLayerImpl::layer() | 40 WebLayer* WebContentLayerImpl::layer() |
| 41 { | 41 { |
| 42 return m_layer.get(); | 42 return m_layer.get(); |
| 43 } | 43 } |
| 44 | 44 |
| 45 void WebContentLayerImpl::setDoubleSided(bool doubleSided) | 45 void WebContentLayerImpl::setDoubleSided(bool doubleSided) |
| 46 { | 46 { |
| 47 m_layer->layer()->setDoubleSided(doubleSided); | 47 m_layer->layer()->setDoubleSided(doubleSided); |
| (...skipping 23 matching lines...) Expand all Loading... |
| 71 void WebContentLayerImpl::paintContents(SkCanvas* canvas, const IntRect& clip, F
loatRect& opaque) | 71 void WebContentLayerImpl::paintContents(SkCanvas* canvas, const IntRect& clip, F
loatRect& opaque) |
| 72 { | 72 { |
| 73 if (!m_client) | 73 if (!m_client) |
| 74 return; | 74 return; |
| 75 WebFloatRect webOpaque; | 75 WebFloatRect webOpaque; |
| 76 m_client->paintContents(canvas, convert(clip), webOpaque); | 76 m_client->paintContents(canvas, convert(clip), webOpaque); |
| 77 opaque = convert(webOpaque); | 77 opaque = convert(webOpaque); |
| 78 } | 78 } |
| 79 | 79 |
| 80 } // namespace WebKit | 80 } // namespace WebKit |
| OLD | NEW |