summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-04 21:16:27 +0000
committerkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-04 21:16:27 +0000
commit8bf1e3c2af1f946d40647fb16b7a5b5abef5386f (patch)
treec40a25261af8e8fbff86b1c10f3ac1993cf37fa0 /gpu
parent70a5c18498506ecfc224e1f8ee0f3830bf4b61d2 (diff)
downloadchromium_src-8bf1e3c2af1f946d40647fb16b7a5b5abef5386f.zip
chromium_src-8bf1e3c2af1f946d40647fb16b7a5b5abef5386f.tar.gz
chromium_src-8bf1e3c2af1f946d40647fb16b7a5b5abef5386f.tar.bz2
Suggested patch from apatrick reverting portion of r83276 (M12 merge
of r83248), which removed the child window from the GPU process. This fixes the garbage seen on Mac OS X during resizing. It only works on the M12 branch; there are more root causes on trunk still being investigated. BUG=80602 TEST=none Review URL: http://codereview.chromium.org/6931013 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84130 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/service/gpu_scheduler.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/gpu/command_buffer/service/gpu_scheduler.h b/gpu/command_buffer/service/gpu_scheduler.h
index 04784a7..2bc67a1 100644
--- a/gpu/command_buffer/service/gpu_scheduler.h
+++ b/gpu/command_buffer/service/gpu_scheduler.h
@@ -127,6 +127,10 @@ class GpuScheduler : public CommandBufferEngine {
// Get the GLES2Decoder associated with this scheduler.
gles2::GLES2Decoder* decoder() const { return decoder_.get(); }
+ // Helper which causes a call to ProcessCommands to be scheduled later.
+ // TODO(apatrick): figure out a way to make this private again.
+ void ScheduleProcessCommands();
+
protected:
// Perform common initialization. Takes ownership of GLContext.
bool InitializeCommon(
@@ -140,9 +144,6 @@ class GpuScheduler : public CommandBufferEngine {
private:
- // Helper which causes a call to ProcessCommands to be scheduled later.
- void ScheduleProcessCommands();
-
// Called via a callback just before we are supposed to call the
// user's swap buffers callback.
virtual void WillSwapBuffers();