| 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 "SkMatrix44.h" | 9 #include "SkMatrix44.h" |
| 10 #include "webcore_convert.h" |
| 10 #include <public/WebContentLayerClient.h> | 11 #include <public/WebContentLayerClient.h> |
| 11 #include <public/WebFloatPoint.h> | 12 #include <public/WebFloatPoint.h> |
| 12 #include <public/WebFloatRect.h> | 13 #include <public/WebFloatRect.h> |
| 13 #include <public/WebRect.h> | 14 #include <public/WebRect.h> |
| 14 #include <public/WebSize.h> | 15 #include <public/WebSize.h> |
| 15 | 16 |
| 16 using namespace WebCore; | 17 using namespace WebCore; |
| 17 | 18 |
| 18 namespace WebKit { | 19 namespace WebKit { |
| 19 | 20 |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 { | 64 { |
| 64 m_layer->layer()->setDrawCheckerboardForMissingTiles(enable); | 65 m_layer->layer()->setDrawCheckerboardForMissingTiles(enable); |
| 65 } | 66 } |
| 66 | 67 |
| 67 | 68 |
| 68 void WebContentLayerImpl::paintContents(SkCanvas* canvas, const IntRect& clip, F
loatRect& opaque) | 69 void WebContentLayerImpl::paintContents(SkCanvas* canvas, const IntRect& clip, F
loatRect& opaque) |
| 69 { | 70 { |
| 70 if (!m_client) | 71 if (!m_client) |
| 71 return; | 72 return; |
| 72 WebFloatRect webOpaque; | 73 WebFloatRect webOpaque; |
| 73 m_client->paintContents(canvas, WebRect(clip), webOpaque); | 74 m_client->paintContents(canvas, convert(clip), webOpaque); |
| 74 opaque = webOpaque; | 75 opaque = convert(webOpaque); |
| 75 } | 76 } |
| 76 | 77 |
| 77 } // namespace WebKit | 78 } // namespace WebKit |
| OLD | NEW |