diff options
30 files changed, 301 insertions, 128 deletions
@@ -95,7 +95,7 @@ deps = { (Var("googlecode_url") % "snappy") + "/trunk@37", "src/tools/gyp": - (Var("googlecode_url") % "gyp") + "/trunk@1032", + (Var("googlecode_url") % "gyp") + "/trunk@1033", "src/v8": (Var("googlecode_url") % "v8") + "/trunk@" + Var("v8_revision"), diff --git a/base/base.gyp b/base/base.gyp index 623e6da..c55e8e5 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -7,6 +7,7 @@ 'chromium_code': 1, }, 'includes': [ + '../build/win_precompile.gypi', 'base.gypi', ], 'targets': [ diff --git a/build/precompile.cc b/build/precompile.cc new file mode 100644 index 0000000..db1ef6d --- /dev/null +++ b/build/precompile.cc @@ -0,0 +1,7 @@ +// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Precompiled header generator for Windows builds. No include is needed +// in this file as the PCH include is forced via the "Forced Include File" +// flag in the projects generated by GYP. diff --git a/build/precompile.h b/build/precompile.h new file mode 100644 index 0000000..940d7302 --- /dev/null +++ b/build/precompile.h @@ -0,0 +1,100 @@ +// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Precompiled header for Chromium project on Windows, not used by +// other build configurations. Using precompiled headers speeds the +// build up significantly, around 1/4th on VS 2010 on an HP Z600 with 12 +// GB of memory. +// +// Numeric comments beside includes are the number of times they were +// included under src/chrome/browser on 2011/8/20, which was used as a +// baseline for deciding what to include in the PCH. It may be +// possible to tweak the speed of the build by commenting out or +// removing some of the less frequently used headers. + +#if defined(BUILD_PRECOMPILE_H_) +#error You shouldn't include the precompiled header file more than once. +#endif + +#define BUILD_PRECOMPILE_H_ + +// The Windows header needs to come before almost all the other +// Windows-specific headers. +#include <Windows.h> + +// TODO(joi): Defines in atlbase.h cause conflicts; need to figure out +// if/how this family of headers can be included in the PCH; several +// of them are used quite frequently. +/* +#include <atlbase.h> +#include <atlapp.h> +#include <atlcom.h> +#include <atlcrack.h> // 2 +#include <atlctrls.h> // 2 +#include <atlmisc.h> // 2 +#include <atlsafe.h> // 1 +#include <atltheme.h> // 1 +#include <atlwin.h> // 2 +*/ + +#include <commctrl.h> // 2 +#include <commdlg.h> // 3 +#include <cryptuiapi.h> // 2 +#include <dwmapi.h> +#include <Objbase.h> // 2 +#include <objidl.h> // 1 +#include <ole2.h> // 1 +#include <oleacc.h> // 2 +#include <oleauto.h> // 1 +#include <oleidl.h> // 1 +#include <propkey.h> // 2 +#include <propvarutil.h> // 2 +#include <pstore.h> // 2 +#include <shellapi.h> +#include <shlguid.h> // 1 +//#include <shlobj.h> TODO(joi): Caused conflicts, see if they can be resolved. +#include <shlwapi.h> // 1 +#include <shobjidl.h> // 4 +#include <urlhist.h> // 2 +#include <wincrypt.h> // 4 +#include <wtypes.h> // 2 + +#include <errno.h> +#include <fcntl.h> +#include <limits.h> // 4 +#include <math.h> +#include <memory.h> // 1 +#include <signal.h> +#include <stdarg.h> // 1 +#include <stddef.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> // 4 + +#include <algorithm> +#include <bitset> // 3 +#include <cmath> +#include <cstddef> +#include <cstdio> // 3 +#include <cstdlib> // 2 +#include <cstring> +#include <deque> +#include <fstream> // 3 +#include <functional> +#include <iomanip> // 2 +#include <iosfwd> // 2 +#include <iterator> +#include <limits> +#include <list> +#include <map> +#include <numeric> // 2 +#include <ostream> +#include <queue> +#include <set> +#include <sstream> +#include <stack> +#include <string> +#include <utility> +#include <vector> diff --git a/build/win_precompile.gypi b/build/win_precompile.gypi new file mode 100644 index 0000000..90bcdff --- /dev/null +++ b/build/win_precompile.gypi @@ -0,0 +1,20 @@ +# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# Include this file to make targets in your .gyp use the default +# precompiled header on Windows. + +{ + 'conditions': [ + # Restricted to VS 2010 until GYP also supports suppressing + # precompiled headers on .c files in VS 2008. + ['OS=="win" and (MSVS_VERSION=="2010" or MSVS_VERSION=="2010e")', { + 'target_defaults': { + 'msvs_precompiled_header': '<(DEPTH)/build/precompile.h', + 'msvs_precompiled_source': '<(DEPTH)/build/precompile.cc', + 'sources': ['<(DEPTH)/build/precompile.cc'], + }, + }], + ], +} diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 522560c..61beaa7 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -125,6 +125,7 @@ # Note on Win64 targets: targets that end with win64 be used # on 64-bit Windows only. Targets that end with nacl_win64 should be used # by Native Client only. + '../build/win_precompile.gypi', 'app/policy/policy_templates.gypi', 'chrome_browser.gypi', 'chrome_common.gypi', diff --git a/chrome/default_plugin/default_plugin.gyp b/chrome/default_plugin/default_plugin.gyp index bb73479..25f9a4a 100644 --- a/chrome/default_plugin/default_plugin.gyp +++ b/chrome/default_plugin/default_plugin.gyp @@ -5,7 +5,10 @@ { 'variables': { 'chromium_code': 1, - }, + }, + 'includes': [ + '../../build/win_precompile.gypi', + ], 'targets': [ { 'target_name': 'default_plugin', @@ -33,7 +36,7 @@ 'plugin_impl_win.cc', 'plugin_impl_win.h', 'plugin_installer_base.cc', - 'plugin_installer_base.h', + 'plugin_installer_base.h', 'plugin_main.cc', 'plugin_main.h', ], diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp index 4295fb4..2854633 100644 --- a/chrome/installer/mini_installer.gyp +++ b/chrome/installer/mini_installer.gyp @@ -7,6 +7,9 @@ 'msvs_use_common_release': 0, 'msvs_use_common_linker_extras': 0, }, + 'includes': [ + '../../build/win_precompile.gypi', + ], 'conditions': [ ['OS=="win"', { 'target_defaults': { diff --git a/chrome/installer/upgrade_test.gyp b/chrome/installer/upgrade_test.gyp index 50bcfd9..5a610dd 100644 --- a/chrome/installer/upgrade_test.gyp +++ b/chrome/installer/upgrade_test.gyp @@ -11,6 +11,9 @@ 'msvs_use_common_release': 0, 'msvs_use_common_linker_extras': 0, }, + 'includes': [ + '../../build/win_precompile.gypi', + ], 'conditions': [ ['OS=="win"', { 'targets': [ diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index c772913..7a8dd10 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -29,6 +29,9 @@ }], ], }, + 'includes': [ + '../build/win_precompile.gypi', + ], 'target_defaults': { 'dependencies': [ '../chrome/chrome.gyp:chrome_resources', @@ -132,7 +135,7 @@ 'conditions': [ ['OS=="win"', { 'dependencies': [ - '../breakpad/breakpad.gyp:breakpad_handler', + '../breakpad/breakpad.gyp:breakpad_handler', # TODO(slightlyoff): Get automation targets working on OS X '../chrome/chrome.gyp:automation', ], diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc index f87c1aa..22d4f49 100644 --- a/content/browser/renderer_host/render_widget_host_view_win.cc +++ b/content/browser/renderer_host/render_widget_host_view_win.cc @@ -2,13 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Need Win 7 headers for WM_GESTURE and ChangeWindowMessageFilterEx +// Need a few defines from Win 7 headers for WM_GESTURE and +// ChangeWindowMessageFilterEx. // TODO(jschuh): See crbug.com/92941 for longterm fix. -#undef WINVER -#define WINVER _WIN32_WINNT_WIN7 -#undef _WIN32_WINNT -#define _WIN32_WINNT _WIN32_WINNT_WIN7 #include <windows.h> +#if(WINVER < 0x0601) +typedef struct tagCHANGEFILTERSTRUCT { + DWORD cbSize; + DWORD ExtStatus; +} CHANGEFILTERSTRUCT, *PCHANGEFILTERSTRUCT; +#define MSGFLT_ALLOW (1) +#define WM_GESTURE 0x0119 +#endif // WINVER < 0x0601 #include "content/browser/renderer_host/render_widget_host_view_win.h" diff --git a/content/content.gyp b/content/content.gyp index bb977db..08367e6 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -7,6 +7,7 @@ 'chromium_code': 1, # Use higher warning level. }, 'includes': [ + '../build/win_precompile.gypi', 'content_app.gypi', 'content_browser.gypi', 'content_common.gypi', diff --git a/content/gpu/gpu_dx_diagnostics_win.cc b/content/gpu/gpu_dx_diagnostics_win.cc index c36ea8f..9d9125c 100644 --- a/content/gpu/gpu_dx_diagnostics_win.cc +++ b/content/gpu/gpu_dx_diagnostics_win.cc @@ -13,6 +13,9 @@ #include "base/utf_string_conversions.h" #include "content/gpu/gpu_info_collector.h" +// Functions in this file depend on functions exported from dxguid.dll. +#pragma comment(lib, "dxguid.lib") + namespace { // Traverses the IDxDiagContainer tree and populates a tree of DxDiagNode diff --git a/net/net.gyp b/net/net.gyp index bd6bbd2..cf8c4eb 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -17,6 +17,9 @@ }], ], }, + 'includes': [ + '../build/win_precompile.gypi', + ], 'targets': [ { 'target_name': 'net', diff --git a/ppapi/proxy/host_dispatcher.cc b/ppapi/proxy/host_dispatcher.cc index 858b17b..c5bf08f 100644 --- a/ppapi/proxy/host_dispatcher.cc +++ b/ppapi/proxy/host_dispatcher.cc @@ -198,25 +198,27 @@ void HostDispatcher::OnChannelError() { ppb_proxy_->PluginCrashed(pp_module()); } -const void* HostDispatcher::GetProxiedInterface(const std::string& interface) { +const void* HostDispatcher::GetProxiedInterface( + const std::string& proxied_interface) { // First see if we even have a proxy for this interface. - const InterfaceProxy::Info* info = GetPPPInterfaceInfo(interface); + const InterfaceProxy::Info* info = GetPPPInterfaceInfo(proxied_interface); if (!info) return NULL; - PluginIFSupportedMap::iterator iter(plugin_if_supported_.find(interface)); + PluginIFSupportedMap::iterator iter(plugin_if_supported_.find( + proxied_interface)); if (iter == plugin_if_supported_.end()) { // Need to query. Cache the result so we only do this once. bool supported = false; bool previous_reentrancy_value = allow_plugin_reentrancy_; allow_plugin_reentrancy_ = true; - Send(new PpapiMsg_SupportsInterface(interface, &supported)); + Send(new PpapiMsg_SupportsInterface(proxied_interface, &supported)); allow_plugin_reentrancy_ = previous_reentrancy_value; std::pair<PluginIFSupportedMap::iterator, bool> iter_success_pair; iter_success_pair = plugin_if_supported_.insert( - PluginIFSupportedMap::value_type(interface, supported)); + PluginIFSupportedMap::value_type(proxied_interface, supported)); iter = iter_success_pair.first; } if (iter->second) diff --git a/ppapi/proxy/host_dispatcher.h b/ppapi/proxy/host_dispatcher.h index 57ba120..623aa26 100644 --- a/ppapi/proxy/host_dispatcher.h +++ b/ppapi/proxy/host_dispatcher.h @@ -80,7 +80,7 @@ class PPAPI_PROXY_EXPORT HostDispatcher : public Dispatcher { // if the plugin supports the given interface (with caching) and returns the // pointer to the proxied interface if it is supported. Returns NULL if the // given interface isn't supported by the plugin or the proxy. - const void* GetProxiedInterface(const std::string& interface); + const void* GetProxiedInterface(const std::string& proxied_interface); // Returns the proxy object associated with the given interface ID, creating // it if necessary. This is used in cases where a proxy needs to access code diff --git a/ppapi/proxy/plugin_dispatcher.cc b/ppapi/proxy/plugin_dispatcher.cc index 58a1017..6aa6653 100644 --- a/ppapi/proxy/plugin_dispatcher.cc +++ b/ppapi/proxy/plugin_dispatcher.cc @@ -80,9 +80,9 @@ PluginDispatcher* PluginDispatcher::GetForResource(const Resource* resource) { // static const void* PluginDispatcher::GetInterfaceFromDispatcher( - const char* interface) { + const char* dispatcher_interface) { // All interfaces the plugin requests of the browser are "PPB". - const InterfaceProxy::Info* info = GetPPBInterfaceInfo(interface); + const InterfaceProxy::Info* info = GetPPBInterfaceInfo(dispatcher_interface); if (!info) return NULL; return info->interface_ptr; diff --git a/ppapi/proxy/plugin_dispatcher.h b/ppapi/proxy/plugin_dispatcher.h index 896689e..6634c52 100644 --- a/ppapi/proxy/plugin_dispatcher.h +++ b/ppapi/proxy/plugin_dispatcher.h @@ -88,7 +88,8 @@ class PPAPI_PROXY_EXPORT PluginDispatcher : public Dispatcher { // object as a convenience. Returns NULL on failure. static PluginDispatcher* GetForResource(const Resource* resource); - static const void* GetInterfaceFromDispatcher(const char* interface); + static const void* GetInterfaceFromDispatcher( + const char* dispatcher_interface); // You must call this function before anything else. Returns true on success. // The delegate pointer must outlive this class, ownership is not diff --git a/ppapi/proxy/ppapi_proxy_test.cc b/ppapi/proxy/ppapi_proxy_test.cc index 89ffa9f..76034d7 100644 --- a/ppapi/proxy/ppapi_proxy_test.cc +++ b/ppapi/proxy/ppapi_proxy_test.cc @@ -105,8 +105,8 @@ const void* ProxyTestHarnessBase::GetInterface(const char* name) { } void ProxyTestHarnessBase::RegisterTestInterface(const char* name, - const void* interface) { - registered_interfaces_[name] = interface; + const void* test_interface) { + registered_interfaces_[name] = test_interface; } bool ProxyTestHarnessBase::SupportsInterface(const char* name) { diff --git a/ppapi/proxy/ppapi_proxy_test.h b/ppapi/proxy/ppapi_proxy_test.h index 0d3d506..03ec57d 100644 --- a/ppapi/proxy/ppapi_proxy_test.h +++ b/ppapi/proxy/ppapi_proxy_test.h @@ -53,7 +53,7 @@ class ProxyTestHarnessBase { // Allows the test to specify an interface implementation for a given // interface name. This will be returned when any of the proxy logic // requests a local interface. - void RegisterTestInterface(const char* name, const void* interface); + void RegisterTestInterface(const char* name, const void* test_interface); // Sends a "supports interface" message to the current dispatcher and returns // true if it's supported. This is just for the convenience of tests. diff --git a/third_party/cld/cld.gyp b/third_party/cld/cld.gyp index 8e54dbc..bdd4ef6 100644 --- a/third_party/cld/cld.gyp +++ b/third_party/cld/cld.gyp @@ -3,6 +3,9 @@ # found in the LICENSE file. { + 'includes': [ + '../../build/win_precompile.gypi', + ], 'targets': [ { 'target_name': 'cld', diff --git a/third_party/harfbuzz-ng/harfbuzz.gyp b/third_party/harfbuzz-ng/harfbuzz.gyp index 67202ed..c1ea3e4 100644 --- a/third_party/harfbuzz-ng/harfbuzz.gyp +++ b/third_party/harfbuzz-ng/harfbuzz.gyp @@ -3,6 +3,9 @@ # found in the LICENSE file. { + 'includes': [ + '../../build/win_precompile.gypi', + ], 'targets': [ { 'target_name': 'harfbuzz', diff --git a/third_party/harfbuzz/harfbuzz.gyp b/third_party/harfbuzz/harfbuzz.gyp index 4ad082e..f029881 100644 --- a/third_party/harfbuzz/harfbuzz.gyp +++ b/third_party/harfbuzz/harfbuzz.gyp @@ -5,6 +5,9 @@ { 'conditions': [ ['use_harfbuzz_ng==0', { + 'includes': [ + '../../build/win_precompile.gypi', + ], 'targets': [ { 'target_name': 'harfbuzz', diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index cfc2413..0e3ca9c 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -6,6 +6,9 @@ 'variables': { 'no_libjingle_logging%': 0, }, + 'includes': [ + '../../build/win_precompile.gypi', + ], 'target_defaults': { 'defines': [ 'FEATURE_ENABLE_SSL', diff --git a/third_party/libphonenumber/libphonenumber.gyp b/third_party/libphonenumber/libphonenumber.gyp index 5c51895..92415da 100644 --- a/third_party/libphonenumber/libphonenumber.gyp +++ b/third_party/libphonenumber/libphonenumber.gyp @@ -19,6 +19,9 @@ 'USE_GOOGLE_BASE=1', ], }, + 'includes': [ + '../../build/win_precompile.gypi', + ], 'targets': [{ 'target_name': 'libphonenumber', 'type': 'static_library', 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', ], |