Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(26)

Side by Side Diff: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp

Issue 2778483002: Synchronize commits at end of JS task (Closed)
Patch Set: remove m_overdrawframe Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1421 matching lines...) Expand 10 before | Expand all | Expand 10 after
1432 if (layoutBox && layoutBox->hasAcceleratedCompositing()) { 1432 if (layoutBox && layoutBox->hasAcceleratedCompositing()) {
1433 layoutBox->contentChanged(changeType); 1433 layoutBox->contentChanged(changeType);
1434 } 1434 }
1435 IntSize canvasSize = clampedCanvasSize(); 1435 IntSize canvasSize = clampedCanvasSize();
1436 didDraw(SkIRect::MakeXYWH(0, 0, canvasSize.width(), canvasSize.height())); 1436 didDraw(SkIRect::MakeXYWH(0, 0, canvasSize.width(), canvasSize.height()));
1437 } 1437 }
1438 } 1438 }
1439 1439
1440 void WebGLRenderingContextBase::finalizeFrame() { 1440 void WebGLRenderingContextBase::finalizeFrame() {
1441 m_animationFrameInProgress = false; 1441 m_animationFrameInProgress = false;
1442 if (offscreenCanvas()) {
1443 offscreenCanvas()->doCommitAtEndOfTask();
1444 }
1442 } 1445 }
1443 1446
1444 void WebGLRenderingContextBase::onErrorMessage(const char* message, 1447 void WebGLRenderingContextBase::onErrorMessage(const char* message,
1445 int32_t id) { 1448 int32_t id) {
1446 if (m_synthesizedErrorsToConsole) 1449 if (m_synthesizedErrorsToConsole)
1447 printGLErrorToConsole(message); 1450 printGLErrorToConsole(message);
1448 probe::didFireWebGLErrorOrWarning(canvas(), message); 1451 probe::didFireWebGLErrorOrWarning(canvas(), message);
1449 } 1452 }
1450 1453
1451 void WebGLRenderingContextBase::notifyCanvasContextChanged() { 1454 void WebGLRenderingContextBase::notifyCanvasContextChanged() {
(...skipping 6393 matching lines...) Expand 10 before | Expand all | Expand 10 after
7845 7848
7846 void WebGLRenderingContextBase::getHTMLOrOffscreenCanvas( 7849 void WebGLRenderingContextBase::getHTMLOrOffscreenCanvas(
7847 HTMLCanvasElementOrOffscreenCanvas& result) const { 7850 HTMLCanvasElementOrOffscreenCanvas& result) const {
7848 if (canvas()) 7851 if (canvas())
7849 result.setHTMLCanvasElement(canvas()); 7852 result.setHTMLCanvasElement(canvas());
7850 else 7853 else
7851 result.setOffscreenCanvas(offscreenCanvas()); 7854 result.setOffscreenCanvas(offscreenCanvas());
7852 } 7855 }
7853 7856
7854 } // namespace blink 7857 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698