Commit 66e2097d authored by dcheng@chromium.org's avatar dcheng@chromium.org

Hack to fix Mac64 build break from r169638.

This part of the source is fairly fragile. I had to temporarily add a
direct include to WebFrame.h because typedefs cannot be forward
declared. Unfortunately, this causes IntSize.h to be included before
Cocoa. Since Cocoa.h can set NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES,
this can cause build failures with conflicting typedef redefinitions of
NSRect. To hack around this, we temporarily move the Cocoa.h include to
the header as well.

BUG=355268

Review URL: https://codereview.chromium.org/209663002

git-svn-id: svn://svn.chromium.org/blink/trunk@169826 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent b1952e54
......@@ -29,6 +29,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
// Temporary hack to avoid breaking build during WebFrame -> WebLocalFrame transition.
#if __LP64__
#define NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES 1
#endif
#include "config.h"
#include "WebSubstringUtil.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment