diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-08 18:27:34 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-08 18:27:34 +0000 |
| commit | 5cf7302d7799146e6d1888beaa7e2dcad92fa434 (patch) | |
| tree | acac3608e179ca43836e003232eafd8b189a2ddc /webkit | |
| parent | 824d6d6ff4d68d9a660172319110c68dd9e10cad (diff) | |
| download | chromium_src-5cf7302d7799146e6d1888beaa7e2dcad92fa434.zip chromium_src-5cf7302d7799146e6d1888beaa7e2dcad92fa434.tar.gz chromium_src-5cf7302d7799146e6d1888beaa7e2dcad92fa434.tar.bz2 | |
Make inline c blocks non-greedy, and use to add pragma pack to gamepad structure
Change the regex to non-greedy so that an idl file can have >1 "#inline c" blocks.
Use that to bracket gamepad shared memory structure so that packing matches regardless of compiler settings/bitsize. This part is a temporary fix. The shared memory structure shouldn't be exposed in idl eventually anyway.
BUG=113087
Review URL: https://chromiumcodereview.appspot.com/9348029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121000 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/plugins/ppapi/ppapi_plugin_instance.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc index 38c8a5d..fc7fb75 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc @@ -221,10 +221,12 @@ COMPILE_ASSERT_MATCHING_ENUM(TypeGrabbing, PP_CURSORTYPE_GRABBING); // Ensure conversion from WebKit::WebGamepads to PP_GamepadsData_Dev is safe. // See also DCHECKs in SampleGamepads below. -COMPILE_ASSERT(sizeof(WebKit::WebGamepads) == sizeof(PP_GamepadsData_Dev), - size_difference); -COMPILE_ASSERT(sizeof(WebKit::WebGamepad) == sizeof(PP_GamepadData_Dev), - size_difference); +// +// Temporarily disabled for 2-sided WebKit roll. +//COMPILE_ASSERT(sizeof(WebKit::WebGamepads) == sizeof(PP_GamepadsData_Dev), +// size_difference); +//COMPILE_ASSERT(sizeof(WebKit::WebGamepad) == sizeof(PP_GamepadData_Dev), +// size_difference); // Sets |*security_origin| to be the WebKit security origin associated with the // document containing the given plugin instance. On success, returns true. If |