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

Side by Side Diff: WebCore/platform/graphics/chromium/LayerChromium.cpp

Issue 5639006: Merge 73479 - 2010-12-07 Alexey Marinichev <amarinichev@chromium.org>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/597/
Patch Set: Created 10 years 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
« no previous file with comments | « WebCore/ChangeLog ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 // setNeedsCommit will schedule a fresh compositing pass. 376 // setNeedsCommit will schedule a fresh compositing pass.
377 // For the root layer, setNeedsCommit has no effect. 377 // For the root layer, setNeedsCommit has no effect.
378 m_contentsDirty = true; 378 m_contentsDirty = true;
379 379
380 m_dirtyRect.unite(dirtyRect); 380 m_dirtyRect.unite(dirtyRect);
381 setNeedsCommit(); 381 setNeedsCommit();
382 } 382 }
383 383
384 void LayerChromium::setNeedsDisplay() 384 void LayerChromium::setNeedsDisplay()
385 { 385 {
386 m_dirtyRect.setLocation(FloatPoint());
386 m_dirtyRect.setSize(m_bounds); 387 m_dirtyRect.setSize(m_bounds);
387 m_contentsDirty = true; 388 m_contentsDirty = true;
388 setNeedsCommit(); 389 setNeedsCommit();
389 } 390 }
390 391
391 void LayerChromium::resetNeedsDisplay() 392 void LayerChromium::resetNeedsDisplay()
392 { 393 {
393 m_dirtyRect = FloatRect(); 394 m_dirtyRect = FloatRect();
394 m_contentsDirty = false; 395 m_contentsDirty = false;
395 } 396 }
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 unsigned offset = 0; 511 unsigned offset = 0;
511 GLC(context, context->vertexAttribPointer(s_positionAttribLocation, 3, Graph icsContext3D::FLOAT, false, 5 * sizeof(float), offset)); 512 GLC(context, context->vertexAttribPointer(s_positionAttribLocation, 3, Graph icsContext3D::FLOAT, false, 5 * sizeof(float), offset));
512 offset += 3 * sizeof(float); 513 offset += 3 * sizeof(float);
513 GLC(context, context->vertexAttribPointer(s_texCoordAttribLocation, 2, Graph icsContext3D::FLOAT, false, 5 * sizeof(float), offset)); 514 GLC(context, context->vertexAttribPointer(s_texCoordAttribLocation, 2, Graph icsContext3D::FLOAT, false, 5 * sizeof(float), offset));
514 GLC(context, context->enableVertexAttribArray(s_positionAttribLocation)); 515 GLC(context, context->enableVertexAttribArray(s_positionAttribLocation));
515 GLC(context, context->enableVertexAttribArray(s_texCoordAttribLocation)); 516 GLC(context, context->enableVertexAttribArray(s_texCoordAttribLocation));
516 } 517 }
517 518
518 } 519 }
519 #endif // USE(ACCELERATED_COMPOSITING) 520 #endif // USE(ACCELERATED_COMPOSITING)
OLDNEW
« no previous file with comments | « WebCore/ChangeLog ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698