Changeset 63516 in webkit for trunk/JavaScriptCore/JavaScriptCore.gyp

Timestamp:

Jul 15, 2010, 10:15:02 PM (15 years ago)

Author:

[email protected]

Message:

2010-07-15 Victor Wang <​[email protected]>

Reviewed by David Levin.

[Chromium] Disable c4291 for chromium windows multi dll build.

​https://bugs.webkit.org/show_bug.cgi?id=42177

• JavaScriptCore.gyp/JavaScriptCore.gyp:

2010-07-15 Victor Wang <​[email protected]>

Reviewed by David Levin.

[Chromium] Chromium webkit dll updates:

-. Fix WEBKIT_IMPLEMENTATION in WebCommon so

dllimport works as expected.

-. Update webkit.gyp so targets that depend on webkit

has correct macros defined.

​https://bugs.webkit.org/show_bug.cgi?id=42177

• WebKit.gyp:
• public/WebCommon.h:

2010-07-15 Victor Wang <​[email protected]>

Reviewed by David Levin.

[chromium] update KURLGoogle decodeURLEscapeSequences to
use googleurl public api so it does not access functions in
url_canon_internal. This is for chromium multi-dll build.

​https://bugs.webkit.org/show_bug.cgi?id=42177

Test: (unittest) WebKit\chromium\tests\KURLTest.cpp

• platform/KURLGoogle.cpp: (WebCore::decodeURLEscapeSequences):

File:

• trunk/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp (modified) (1 diff)

trunk/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp

@@ -143 +143 @@
             '<(SHARED_INTERMEDIATE_DIR)/webkit',
           ],
+          'conditions': [
+            ['inside_chromium_build==1 and component=="shared_library"', {
+              # Chromium windows multi-dll build enables c++ exception and this
+              # causes wtf generates 4291 warning due to operator new/delete
+              # implementations. Disable the warning for chromium windows
+              # multi-dll build.
+              'msvs_disabled_warnings': [4291],
+              'direct_dependent_settings': {
+                'msvs_disabled_warnings': [4291],
+              },
+            }],
+          ],
         }],
       ],