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

Side by Side Diff: Source/WebCore/html/canvas/WebKitLoseContext.cpp

Issue 6591046: Merge 78921 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/
Patch Set: Created 9 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
« no previous file with comments | « Source/WebCore/html/canvas/WebKitLoseContext.h ('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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 return WebKitLoseContextName; 48 return WebKitLoseContextName;
49 } 49 }
50 50
51 PassRefPtr<WebKitLoseContext> WebKitLoseContext::create(WebGLRenderingContext* c ontext) 51 PassRefPtr<WebKitLoseContext> WebKitLoseContext::create(WebGLRenderingContext* c ontext)
52 { 52 {
53 return adoptRef(new WebKitLoseContext(context)); 53 return adoptRef(new WebKitLoseContext(context));
54 } 54 }
55 55
56 void WebKitLoseContext::loseContext() 56 void WebKitLoseContext::loseContext()
57 { 57 {
58 m_context->forceLostContext(); 58 if (m_context)
59 m_context->forceLostContext();
59 } 60 }
60 61
61 } // namespace WebCore 62 } // namespace WebCore
62 63
63 #endif // ENABLE(3D_CANVAS) 64 #endif // ENABLE(3D_CANVAS)
OLDNEW
« no previous file with comments | « Source/WebCore/html/canvas/WebKitLoseContext.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698