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

Side by Side Diff: Source/WebCore/platform/graphics/gpu/qt/DrawingBufferQt.cpp

Issue 7671031: Merge 92520 - [chromium] Accelerated canvas breaks when moving canvases or resources between Pages (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/
Patch Set: Created 9 years, 4 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) 2011 Andrew Wason (rectalogic@rectalogic.com) 2 * Copyright (C) 2011 Andrew Wason (rectalogic@rectalogic.com)
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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
65 createSecondaryBuffers(); 65 createSecondaryBuffers();
66 reset(size); 66 reset(size);
67 } 67 }
68 68
69 DrawingBuffer::~DrawingBuffer() 69 DrawingBuffer::~DrawingBuffer()
70 { 70 {
71 clear(); 71 clear();
72 } 72 }
73 73
74 void DrawingBuffer::didReset()
75 {
76 }
77
78 #if USE(ACCELERATED_COMPOSITING) 74 #if USE(ACCELERATED_COMPOSITING)
79 PlatformLayer* DrawingBuffer::platformLayer() 75 PlatformLayer* DrawingBuffer::platformLayer()
80 { 76 {
81 return 0; 77 return 0;
82 } 78 }
83 #endif 79 #endif
84 80
85 Platform3DObject DrawingBuffer::platformColorBuffer() const 81 Platform3DObject DrawingBuffer::platformColorBuffer() const
86 { 82 {
87 return m_colorBuffer; 83 return m_colorBuffer;
88 } 84 }
89 85
90 } 86 }
91 87
92 #endif 88 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698