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 "ContentLayerChromium.h" | 8 #include "ContentLayerChromium.h" |
| 9 #include "FloatRect.h" |
| 10 #include "IntRect.h" |
9 #include "SkMatrix44.h" | 11 #include "SkMatrix44.h" |
10 #include "webcore_convert.h" | 12 #include "webcore_convert.h" |
11 #include <public/WebContentLayerClient.h> | 13 #include <public/WebContentLayerClient.h> |
12 #include <public/WebFloatPoint.h> | 14 #include <public/WebFloatPoint.h> |
13 #include <public/WebFloatRect.h> | 15 #include <public/WebFloatRect.h> |
14 #include <public/WebRect.h> | 16 #include <public/WebRect.h> |
15 #include <public/WebSize.h> | 17 #include <public/WebSize.h> |
16 | 18 |
17 using namespace WebCore; | 19 using namespace cc; |
18 | 20 |
19 namespace WebKit { | 21 namespace WebKit { |
20 | 22 |
21 WebContentLayer* WebContentLayer::create(WebContentLayerClient* client) | 23 WebContentLayer* WebContentLayer::create(WebContentLayerClient* client) |
22 { | 24 { |
23 return new WebContentLayerImpl(client); | 25 return new WebContentLayerImpl(client); |
24 } | 26 } |
25 | 27 |
26 WebContentLayerImpl::WebContentLayerImpl(WebContentLayerClient* client) | 28 WebContentLayerImpl::WebContentLayerImpl(WebContentLayerClient* client) |
27 : m_layer(adoptPtr(new WebLayerImpl(ContentLayerChromium::create(this)))) | 29 : m_layer(adoptPtr(new WebLayerImpl(ContentLayerChromium::create(this)))) |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
69 void WebContentLayerImpl::paintContents(SkCanvas* canvas, const IntRect& clip, F
loatRect& opaque) | 71 void WebContentLayerImpl::paintContents(SkCanvas* canvas, const IntRect& clip, F
loatRect& opaque) |
70 { | 72 { |
71 if (!m_client) | 73 if (!m_client) |
72 return; | 74 return; |
73 WebFloatRect webOpaque; | 75 WebFloatRect webOpaque; |
74 m_client->paintContents(canvas, convert(clip), webOpaque); | 76 m_client->paintContents(canvas, convert(clip), webOpaque); |
75 opaque = convert(webOpaque); | 77 opaque = convert(webOpaque); |
76 } | 78 } |
77 | 79 |
78 } // namespace WebKit | 80 } // namespace WebKit |
OLD | NEW |