summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-07 14:14:54 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-07 14:14:54 +0000
commit99ff9934eb0e343160b79f63d314f70012ac877f (patch)
tree17c2cab695a9f9ec96dcd587ec6b88a93f96dd65 /webkit
parent0c31a504177bf6434d191feed964c6ce7b3a700f (diff)
downloadchromium_src-99ff9934eb0e343160b79f63d314f70012ac877f.zip
chromium_src-99ff9934eb0e343160b79f63d314f70012ac877f.tar.gz
chromium_src-99ff9934eb0e343160b79f63d314f70012ac877f.tar.bz2
Use precompiled headers for most large projects where the .gyp file
is not a third party file. On my machine, this speeds up a full recompile of the 'chrome' target in Debug mode by about 18%. BUG=none TEST=it builds, existing tests pass Review URL: http://codereview.chromium.org/7706011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99949 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/gl_bindings_skia_cmd_buffer.cc192
-rw-r--r--webkit/plugins/ppapi/ppapi_plugin_instance.cc4
-rw-r--r--webkit/plugins/ppapi/url_request_info_unittest.cc18
-rw-r--r--webkit/support/webkit_support.gyp1
-rw-r--r--webkit/webkit.gyp1
5 files changed, 109 insertions, 107 deletions
diff --git a/webkit/glue/gl_bindings_skia_cmd_buffer.cc b/webkit/glue/gl_bindings_skia_cmd_buffer.cc
index bad2877..73c99e6 100644
--- a/webkit/glue/gl_bindings_skia_cmd_buffer.cc
+++ b/webkit/glue/gl_bindings_skia_cmd_buffer.cc
@@ -16,104 +16,104 @@
namespace webkit_glue {
GrGLInterface* CreateCommandBufferSkiaGLBinding() {
- GrGLInterface* interface = new GrGLInterface;
- interface->fBindingsExported = kES2_GrGLBinding;
- interface->fActiveTexture = glActiveTexture;
- interface->fAttachShader = glAttachShader;
- interface->fBindAttribLocation = glBindAttribLocation;
- interface->fBindBuffer = glBindBuffer;
- interface->fBindTexture = glBindTexture;
- interface->fBlendColor = glBlendColor;
- interface->fBlendFunc = glBlendFunc;
- interface->fBufferData = glBufferData;
- interface->fBufferSubData = glBufferSubData;
- interface->fClear = glClear;
- interface->fClearColor = glClearColor;
- interface->fClearStencil = glClearStencil;
- interface->fColorMask = glColorMask;
- interface->fCompileShader = glCompileShader;
- interface->fCompressedTexImage2D = glCompressedTexImage2D;
- interface->fCreateProgram = glCreateProgram;
- interface->fCreateShader = glCreateShader;
- interface->fCullFace = glCullFace;
- interface->fDeleteBuffers = glDeleteBuffers;
- interface->fDeleteProgram = glDeleteProgram;
- interface->fDeleteShader = glDeleteShader;
- interface->fDeleteTextures = glDeleteTextures;
- interface->fDepthMask = glDepthMask;
- interface->fDisable = glDisable;
- interface->fDisableVertexAttribArray = glDisableVertexAttribArray;
- interface->fDrawArrays = glDrawArrays;
- interface->fDrawElements = glDrawElements;
- interface->fEnable = glEnable;
- interface->fEnableVertexAttribArray = glEnableVertexAttribArray;
- interface->fFrontFace = glFrontFace;
- interface->fGenBuffers = glGenBuffers;
- interface->fGenTextures = glGenTextures;
- interface->fGetBufferParameteriv = glGetBufferParameteriv;
- interface->fGetError = glGetError;
- interface->fGetIntegerv = glGetIntegerv;
- interface->fGetProgramInfoLog = glGetProgramInfoLog;
- interface->fGetProgramiv = glGetProgramiv;
- interface->fGetShaderInfoLog = glGetShaderInfoLog;
- interface->fGetShaderiv = glGetShaderiv;
- interface->fGetString = glGetString;
- interface->fGetUniformLocation = glGetUniformLocation;
- interface->fLineWidth = glLineWidth;
- interface->fLinkProgram = glLinkProgram;
- interface->fPixelStorei = glPixelStorei;
- interface->fReadPixels = glReadPixels;
- interface->fScissor = glScissor;
- interface->fShaderSource = glShaderSource;
- interface->fStencilFunc = glStencilFunc;
- interface->fStencilFuncSeparate = glStencilFuncSeparate;
- interface->fStencilMask = glStencilMask;
- interface->fStencilMaskSeparate = glStencilMaskSeparate;
- interface->fStencilOp = glStencilOp;
- interface->fStencilOpSeparate = glStencilOpSeparate;
- interface->fTexImage2D = glTexImage2D;
- interface->fTexParameteri = glTexParameteri;
- interface->fTexSubImage2D = glTexSubImage2D;
- interface->fUniform1f = glUniform1f;
- interface->fUniform1i = glUniform1i;
- interface->fUniform1fv = glUniform1fv;
- interface->fUniform1iv = glUniform1iv;
- interface->fUniform2f = glUniform2f;
- interface->fUniform2i = glUniform2i;
- interface->fUniform2fv = glUniform2fv;
- interface->fUniform2iv = glUniform2iv;
- interface->fUniform3f = glUniform3f;
- interface->fUniform3i = glUniform3i;
- interface->fUniform3fv = glUniform3fv;
- interface->fUniform3iv = glUniform3iv;
- interface->fUniform4f = glUniform4f;
- interface->fUniform4i = glUniform4i;
- interface->fUniform4fv = glUniform4fv;
- interface->fUniform4iv = glUniform4iv;
- interface->fUniformMatrix2fv = glUniformMatrix2fv;
- interface->fUniformMatrix3fv = glUniformMatrix3fv;
- interface->fUniformMatrix4fv = glUniformMatrix4fv;
- interface->fUseProgram = glUseProgram;
- interface->fVertexAttrib4fv = glVertexAttrib4fv;
- interface->fVertexAttribPointer = glVertexAttribPointer;
- interface->fViewport = glViewport;
- interface->fBindFramebuffer = glBindFramebuffer;
- interface->fBindRenderbuffer = glBindRenderbuffer;
- interface->fCheckFramebufferStatus = glCheckFramebufferStatus;
- interface->fDeleteFramebuffers = glDeleteFramebuffers;
- interface->fDeleteRenderbuffers = glDeleteRenderbuffers;
- interface->fFramebufferRenderbuffer = glFramebufferRenderbuffer;
- interface->fFramebufferTexture2D = glFramebufferTexture2D;
- interface->fGenFramebuffers = glGenFramebuffers;
- interface->fGenRenderbuffers = glGenRenderbuffers;
- interface->fGetFramebufferAttachmentParameteriv =
+ GrGLInterface* gl_interface = new GrGLInterface;
+ gl_interface->fBindingsExported = kES2_GrGLBinding;
+ gl_interface->fActiveTexture = glActiveTexture;
+ gl_interface->fAttachShader = glAttachShader;
+ gl_interface->fBindAttribLocation = glBindAttribLocation;
+ gl_interface->fBindBuffer = glBindBuffer;
+ gl_interface->fBindTexture = glBindTexture;
+ gl_interface->fBlendColor = glBlendColor;
+ gl_interface->fBlendFunc = glBlendFunc;
+ gl_interface->fBufferData = glBufferData;
+ gl_interface->fBufferSubData = glBufferSubData;
+ gl_interface->fClear = glClear;
+ gl_interface->fClearColor = glClearColor;
+ gl_interface->fClearStencil = glClearStencil;
+ gl_interface->fColorMask = glColorMask;
+ gl_interface->fCompileShader = glCompileShader;
+ gl_interface->fCompressedTexImage2D = glCompressedTexImage2D;
+ gl_interface->fCreateProgram = glCreateProgram;
+ gl_interface->fCreateShader = glCreateShader;
+ gl_interface->fCullFace = glCullFace;
+ gl_interface->fDeleteBuffers = glDeleteBuffers;
+ gl_interface->fDeleteProgram = glDeleteProgram;
+ gl_interface->fDeleteShader = glDeleteShader;
+ gl_interface->fDeleteTextures = glDeleteTextures;
+ gl_interface->fDepthMask = glDepthMask;
+ gl_interface->fDisable = glDisable;
+ gl_interface->fDisableVertexAttribArray = glDisableVertexAttribArray;
+ gl_interface->fDrawArrays = glDrawArrays;
+ gl_interface->fDrawElements = glDrawElements;
+ gl_interface->fEnable = glEnable;
+ gl_interface->fEnableVertexAttribArray = glEnableVertexAttribArray;
+ gl_interface->fFrontFace = glFrontFace;
+ gl_interface->fGenBuffers = glGenBuffers;
+ gl_interface->fGenTextures = glGenTextures;
+ gl_interface->fGetBufferParameteriv = glGetBufferParameteriv;
+ gl_interface->fGetError = glGetError;
+ gl_interface->fGetIntegerv = glGetIntegerv;
+ gl_interface->fGetProgramInfoLog = glGetProgramInfoLog;
+ gl_interface->fGetProgramiv = glGetProgramiv;
+ gl_interface->fGetShaderInfoLog = glGetShaderInfoLog;
+ gl_interface->fGetShaderiv = glGetShaderiv;
+ gl_interface->fGetString = glGetString;
+ gl_interface->fGetUniformLocation = glGetUniformLocation;
+ gl_interface->fLineWidth = glLineWidth;
+ gl_interface->fLinkProgram = glLinkProgram;
+ gl_interface->fPixelStorei = glPixelStorei;
+ gl_interface->fReadPixels = glReadPixels;
+ gl_interface->fScissor = glScissor;
+ gl_interface->fShaderSource = glShaderSource;
+ gl_interface->fStencilFunc = glStencilFunc;
+ gl_interface->fStencilFuncSeparate = glStencilFuncSeparate;
+ gl_interface->fStencilMask = glStencilMask;
+ gl_interface->fStencilMaskSeparate = glStencilMaskSeparate;
+ gl_interface->fStencilOp = glStencilOp;
+ gl_interface->fStencilOpSeparate = glStencilOpSeparate;
+ gl_interface->fTexImage2D = glTexImage2D;
+ gl_interface->fTexParameteri = glTexParameteri;
+ gl_interface->fTexSubImage2D = glTexSubImage2D;
+ gl_interface->fUniform1f = glUniform1f;
+ gl_interface->fUniform1i = glUniform1i;
+ gl_interface->fUniform1fv = glUniform1fv;
+ gl_interface->fUniform1iv = glUniform1iv;
+ gl_interface->fUniform2f = glUniform2f;
+ gl_interface->fUniform2i = glUniform2i;
+ gl_interface->fUniform2fv = glUniform2fv;
+ gl_interface->fUniform2iv = glUniform2iv;
+ gl_interface->fUniform3f = glUniform3f;
+ gl_interface->fUniform3i = glUniform3i;
+ gl_interface->fUniform3fv = glUniform3fv;
+ gl_interface->fUniform3iv = glUniform3iv;
+ gl_interface->fUniform4f = glUniform4f;
+ gl_interface->fUniform4i = glUniform4i;
+ gl_interface->fUniform4fv = glUniform4fv;
+ gl_interface->fUniform4iv = glUniform4iv;
+ gl_interface->fUniformMatrix2fv = glUniformMatrix2fv;
+ gl_interface->fUniformMatrix3fv = glUniformMatrix3fv;
+ gl_interface->fUniformMatrix4fv = glUniformMatrix4fv;
+ gl_interface->fUseProgram = glUseProgram;
+ gl_interface->fVertexAttrib4fv = glVertexAttrib4fv;
+ gl_interface->fVertexAttribPointer = glVertexAttribPointer;
+ gl_interface->fViewport = glViewport;
+ gl_interface->fBindFramebuffer = glBindFramebuffer;
+ gl_interface->fBindRenderbuffer = glBindRenderbuffer;
+ gl_interface->fCheckFramebufferStatus = glCheckFramebufferStatus;
+ gl_interface->fDeleteFramebuffers = glDeleteFramebuffers;
+ gl_interface->fDeleteRenderbuffers = glDeleteRenderbuffers;
+ gl_interface->fFramebufferRenderbuffer = glFramebufferRenderbuffer;
+ gl_interface->fFramebufferTexture2D = glFramebufferTexture2D;
+ gl_interface->fGenFramebuffers = glGenFramebuffers;
+ gl_interface->fGenRenderbuffers = glGenRenderbuffers;
+ gl_interface->fGetFramebufferAttachmentParameteriv =
glGetFramebufferAttachmentParameteriv;
- interface->fGetRenderbufferParameteriv = glGetRenderbufferParameteriv;
- interface->fRenderbufferStorage = glRenderbufferStorage;
- interface->fRenderbufferStorageMultisample =
+ gl_interface->fGetRenderbufferParameteriv = glGetRenderbufferParameteriv;
+ gl_interface->fRenderbufferStorage = glRenderbufferStorage;
+ gl_interface->fRenderbufferStorageMultisample =
glRenderbufferStorageMultisampleEXT;
- interface->fBlitFramebuffer = glBlitFramebufferEXT;
- return interface;
+ gl_interface->fBlitFramebuffer = glBlitFramebufferEXT;
+ return gl_interface;
}
} // namespace webkit_glue
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
index c8359f9..a896e06 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
@@ -199,12 +199,12 @@ void RectToPPRect(const gfx::Rect& input, PP_Rect* output) {
PluginInstance* PluginInstance::Create1_0(PluginDelegate* delegate,
PluginModule* module,
const void* ppp_instance_if_1_0) {
- const PPP_Instance_1_0* interface =
+ const PPP_Instance_1_0* instance =
static_cast<const PPP_Instance_1_0*>(ppp_instance_if_1_0);
return new PluginInstance(
delegate,
module,
- new ::ppapi::PPP_Instance_Combined(*interface));
+ new ::ppapi::PPP_Instance_Combined(*instance));
}
PluginInstance::PluginInstance(
diff --git a/webkit/plugins/ppapi/url_request_info_unittest.cc b/webkit/plugins/ppapi/url_request_info_unittest.cc
index dd8d0f7..f34d448 100644
--- a/webkit/plugins/ppapi/url_request_info_unittest.cc
+++ b/webkit/plugins/ppapi/url_request_info_unittest.cc
@@ -119,16 +119,16 @@ WebView* URLRequestInfoTest::web_view_;
WebFrame* URLRequestInfoTest::frame_;
TEST_F(URLRequestInfoTest, GetInterface) {
- const PPB_URLRequestInfo* interface =
+ const PPB_URLRequestInfo* request_info =
::ppapi::thunk::GetPPB_URLRequestInfo_Thunk();
- EXPECT_TRUE(interface);
- EXPECT_TRUE(interface->Create);
- EXPECT_TRUE(interface->IsURLRequestInfo);
- EXPECT_TRUE(interface->SetProperty);
- EXPECT_TRUE(interface->AppendDataToBody);
- EXPECT_TRUE(interface->AppendFileToBody);
- EXPECT_TRUE(interface->Create);
- EXPECT_TRUE(interface->Create);
+ EXPECT_TRUE(request_info);
+ EXPECT_TRUE(request_info->Create);
+ EXPECT_TRUE(request_info->IsURLRequestInfo);
+ EXPECT_TRUE(request_info->SetProperty);
+ EXPECT_TRUE(request_info->AppendDataToBody);
+ EXPECT_TRUE(request_info->AppendFileToBody);
+ EXPECT_TRUE(request_info->Create);
+ EXPECT_TRUE(request_info->Create);
}
TEST_F(URLRequestInfoTest, AsURLRequestInfo) {
diff --git a/webkit/support/webkit_support.gyp b/webkit/support/webkit_support.gyp
index 211725a..a6d99cd 100644
--- a/webkit/support/webkit_support.gyp
+++ b/webkit/support/webkit_support.gyp
@@ -4,6 +4,7 @@
{
'includes': [
+ '../../build/win_precompile.gypi',
'../appcache/webkit_appcache.gypi',
'../blob/webkit_blob.gypi',
'../database/webkit_database.gypi',
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index e7fdfc0..d696016 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -4,6 +4,7 @@
{
'includes': [
+ '../build/win_precompile.gypi',
'../third_party/WebKit/Source/WebKit/chromium/features.gypi',
'tools/test_shell/test_shell.gypi',
],