| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009 Apple 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 1140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1151 debug_info_.SetMainThreadScrollingReasons( | 1151 debug_info_.SetMainThreadScrollingReasons( |
| 1152 PlatformLayer()->MainThreadScrollingReasons()); | 1152 PlatformLayer()->MainThreadScrollingReasons()); |
| 1153 } | 1153 } |
| 1154 | 1154 |
| 1155 void GraphicsLayer::didChangeScrollbarsHidden(bool hidden) { | 1155 void GraphicsLayer::didChangeScrollbarsHidden(bool hidden) { |
| 1156 if (scrollable_area_) | 1156 if (scrollable_area_) |
| 1157 scrollable_area_->SetScrollbarsHidden(hidden); | 1157 scrollable_area_->SetScrollbarsHidden(hidden); |
| 1158 } | 1158 } |
| 1159 | 1159 |
| 1160 PaintController& GraphicsLayer::GetPaintController() { | 1160 PaintController& GraphicsLayer::GetPaintController() { |
| 1161 RELEASE_ASSERT(DrawsContent()); | 1161 CHECK(DrawsContent()); |
| 1162 if (!paint_controller_) | 1162 if (!paint_controller_) |
| 1163 paint_controller_ = PaintController::Create(); | 1163 paint_controller_ = PaintController::Create(); |
| 1164 return *paint_controller_; | 1164 return *paint_controller_; |
| 1165 } | 1165 } |
| 1166 | 1166 |
| 1167 void GraphicsLayer::SetElementId(const CompositorElementId& id) { | 1167 void GraphicsLayer::SetElementId(const CompositorElementId& id) { |
| 1168 if (WebLayer* layer = PlatformLayer()) | 1168 if (WebLayer* layer = PlatformLayer()) |
| 1169 layer->SetElementId(id); | 1169 layer->SetElementId(id); |
| 1170 } | 1170 } |
| 1171 | 1171 |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1297 void showGraphicsLayerTree(const blink::GraphicsLayer* layer) { | 1297 void showGraphicsLayerTree(const blink::GraphicsLayer* layer) { |
| 1298 if (!layer) { | 1298 if (!layer) { |
| 1299 LOG(INFO) << "Cannot showGraphicsLayerTree for (nil)."; | 1299 LOG(INFO) << "Cannot showGraphicsLayerTree for (nil)."; |
| 1300 return; | 1300 return; |
| 1301 } | 1301 } |
| 1302 | 1302 |
| 1303 String output = layer->LayerTreeAsText(blink::kLayerTreeIncludesDebugInfo); | 1303 String output = layer->LayerTreeAsText(blink::kLayerTreeIncludesDebugInfo); |
| 1304 LOG(INFO) << output.Utf8().Data(); | 1304 LOG(INFO) << output.Utf8().Data(); |
| 1305 } | 1305 } |
| 1306 #endif | 1306 #endif |
| OLD | NEW |