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

Side by Side Diff: webkit/tools/pepper_test_plugin/plugin_object.cc

Issue 548133: Revert 36399 - linux: enable pepper_test_plugin ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp ('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) 2006, 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008 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 17 matching lines...) Expand all
28 #include <stdio.h> 28 #include <stdio.h>
29 #include <cmath> 29 #include <cmath>
30 #include <limits> 30 #include <limits>
31 #include <string> 31 #include <string>
32 32
33 #if defined(INDEPENDENT_PLUGIN) 33 #if defined(INDEPENDENT_PLUGIN)
34 #define CHECK(x) 34 #define CHECK(x)
35 #else 35 #else
36 #include "base/logging.h" 36 #include "base/logging.h"
37 #include "gpu/command_buffer/client/gles2_demo_cc.h" 37 #include "gpu/command_buffer/client/gles2_demo_cc.h"
38 #include "gpu/command_buffer/common/GLES2/gl2.h" 38 #include "gpu/command_buffer/common/gles2/gl2.h"
39 #include "third_party/skia/include/core/SkBitmap.h" 39 #include "third_party/skia/include/core/SkBitmap.h"
40 #include "third_party/skia/include/core/SkCanvas.h" 40 #include "third_party/skia/include/core/SkCanvas.h"
41 #include "third_party/skia/include/effects/SkGradientShader.h" 41 #include "third_party/skia/include/effects/SkGradientShader.h"
42 #endif 42 #endif
43 #include "webkit/tools/pepper_test_plugin/event_handler.h" 43 #include "webkit/tools/pepper_test_plugin/event_handler.h"
44 #include "webkit/tools/pepper_test_plugin/test_object.h" 44 #include "webkit/tools/pepper_test_plugin/test_object.h"
45 45
46 NPNetscapeFuncs* browser; 46 NPNetscapeFuncs* browser;
47 47
48 namespace { 48 namespace {
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 // Render some stuff. 408 // Render some stuff.
409 pglMakeCurrent(pgl_context_); 409 pglMakeCurrent(pgl_context_);
410 GLFromCPPTestFunction(); 410 GLFromCPPTestFunction();
411 pglSwapBuffers(); 411 pglSwapBuffers();
412 pglMakeCurrent(NULL); 412 pglMakeCurrent(NULL);
413 413
414 // Schedule another call to Draw. 414 // Schedule another call to Draw.
415 browser->pluginthreadasynccall(npp_, Draw3DCallback, this); 415 browser->pluginthreadasynccall(npp_, Draw3DCallback, this);
416 #endif 416 #endif
417 } 417 }
OLDNEW
« no previous file with comments | « webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698