Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(56)

Issue 209663002: Hack to fix Mac64 build break from r169638. (Closed)

Created:
6 years, 9 months ago by dcheng
Modified:
6 years, 9 months ago
Reviewers:
Mark Mentovai, eseidel
CC:
blink-reviews, jamesr, dglazkov+blink, abarth-chromium, Avi (use Gerrit), Mark Mentovai, Andre
Visibility:
Public.

Description

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 Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=169826

Patch Set 1 #

Patch Set 2 : Another approach #

Unified diffs Side-by-side diffs Delta from patch set Stats (+5 lines, -0 lines) Patch
M Source/web/mac/WebSubstringUtil.mm View 1 1 chunk +5 lines, -0 lines 0 comments Download

Messages

Total messages: 9 (0 generated)
dcheng
6 years, 9 months ago (2014-03-24 02:13:49 UTC) #1
eseidel
lgtm I have no idea if this is kosher or not. But I'd rather land ...
6 years, 9 months ago (2014-03-24 02:48:07 UTC) #2
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/dcheng@chromium.org/209663002/20001
6 years, 9 months ago (2014-03-24 02:48:14 UTC) #3
Mark Mentovai
lgtm I t
6 years, 9 months ago (2014-03-24 03:43:44 UTC) #4
Mark Mentovai
I didn’t mean to hit that button. I think that whatever file is using NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES ...
6 years, 9 months ago (2014-03-24 03:44:38 UTC) #5
Mark Mentovai
(“whatever file” = IntSize.h, at least.)
6 years, 9 months ago (2014-03-24 03:46:59 UTC) #6
eseidel
I believe WebKit intentionally avoided including mac headers from those files, but I don't really ...
6 years, 9 months ago (2014-03-24 03:48:00 UTC) #7
Mark Mentovai
They’re probably picking them up from some prefix header that we’re not using.
6 years, 9 months ago (2014-03-24 03:49:13 UTC) #8
commit-bot: I haz the power
6 years, 9 months ago (2014-03-24 06:55:44 UTC) #9
Message was sent while issue was closed.
Change committed as 169826

Powered by Google App Engine
This is Rietveld 408576698