| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "content/renderer/gpu/render_widget_compositor.h" | 5 #include "content/renderer/gpu/render_widget_compositor.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/string_number_conversions.h" | 9 #include "base/string_number_conversions.h" |
| 10 #include "base/time.h" | 10 #include "base/time.h" |
| (...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 352 ret = WebKit::WebToCCInputHandlerAdapter::create(web_handler.Pass()); | 352 ret = WebKit::WebToCCInputHandlerAdapter::create(web_handler.Pass()); |
| 353 return ret.Pass(); | 353 return ret.Pass(); |
| 354 } | 354 } |
| 355 | 355 |
| 356 // TODO(jamesr): This should go through WebWidget | 356 // TODO(jamesr): This should go through WebWidget |
| 357 void RenderWidgetCompositor::willCommit() { | 357 void RenderWidgetCompositor::willCommit() { |
| 358 client_->willCommit(); | 358 client_->willCommit(); |
| 359 } | 359 } |
| 360 | 360 |
| 361 void RenderWidgetCompositor::didCommit() { | 361 void RenderWidgetCompositor::didCommit() { |
| 362 widget_->DidCommitCompositorFrame(); | 362 // TODO(jamesr): There is no chromium-side implementation of this first call, |
| 363 // remove if it's not needed. |
| 364 widget_->didCommitCompositorFrame(); |
| 363 widget_->didBecomeReadyForAdditionalInput(); | 365 widget_->didBecomeReadyForAdditionalInput(); |
| 364 } | 366 } |
| 365 | 367 |
| 366 void RenderWidgetCompositor::didCommitAndDrawFrame() { | 368 void RenderWidgetCompositor::didCommitAndDrawFrame() { |
| 367 widget_->didCommitAndDrawCompositorFrame(); | 369 widget_->didCommitAndDrawCompositorFrame(); |
| 368 } | 370 } |
| 369 | 371 |
| 370 void RenderWidgetCompositor::didCompleteSwapBuffers() { | 372 void RenderWidgetCompositor::didCompleteSwapBuffers() { |
| 371 widget_->didCompleteSwapBuffers(); | 373 widget_->didCompleteSwapBuffers(); |
| 372 } | 374 } |
| (...skipping 12 matching lines...) Expand all Loading... |
| 385 | 387 |
| 386 client_->createFontAtlas(bitmap, ascii_to_web_rect_table, font_height); | 388 client_->createFontAtlas(bitmap, ascii_to_web_rect_table, font_height); |
| 387 | 389 |
| 388 for (int i = 0; i < 128; ++i) | 390 for (int i = 0; i < 128; ++i) |
| 389 ascii_to_rect_table[i] = ascii_to_web_rect_table[i]; | 391 ascii_to_rect_table[i] = ascii_to_web_rect_table[i]; |
| 390 | 392 |
| 391 return cc::FontAtlas::create(bitmap, ascii_to_rect_table, font_height).Pass(); | 393 return cc::FontAtlas::create(bitmap, ascii_to_rect_table, font_height).Pass(); |
| 392 } | 394 } |
| 393 | 395 |
| 394 } // namespace content | 396 } // namespace content |
| OLD | NEW |