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 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 if (paintingControl == WebContentLayerClient::DisplayListPaintingDisabled | 108 if (paintingControl == WebContentLayerClient::DisplayListPaintingDisabled |
109 || paintingControl == WebContentLayerClient::DisplayListConstructionDisa
bled) | 109 || paintingControl == WebContentLayerClient::DisplayListConstructionDisa
bled) |
110 disabledMode = GraphicsContext::FullyDisabled; | 110 disabledMode = GraphicsContext::FullyDisabled; |
111 GraphicsContext context(*paintController, disabledMode); | 111 GraphicsContext context(*paintController, disabledMode); |
112 | 112 |
113 IntRect interestRect = clip; | 113 IntRect interestRect = clip; |
114 m_painter->paint(context, &interestRect); | 114 m_painter->paint(context, &interestRect); |
115 | 115 |
116 paintController->commitNewDisplayItems(); | 116 paintController->commitNewDisplayItems(); |
117 paintArtifactToWebDisplayItemList(webDisplayItemList, paintController->paint
Artifact(), clip); | 117 paintArtifactToWebDisplayItemList(webDisplayItemList, paintController->paint
Artifact(), clip); |
| 118 paintController->setDisplayItemConstructionIsDisabled(false); |
118 } | 119 } |
119 | 120 |
120 size_t ContentLayerDelegate::approximateUnsharedMemoryUsage() const | 121 size_t ContentLayerDelegate::approximateUnsharedMemoryUsage() const |
121 { | 122 { |
122 return m_painter->paintController()->approximateUnsharedMemoryUsage(); | 123 return m_painter->paintController()->approximateUnsharedMemoryUsage(); |
123 } | 124 } |
124 | 125 |
125 } // namespace blink | 126 } // namespace blink |
OLD | NEW |