diff options
| author | Steve Block <steveblock@google.com> | 2010-01-13 17:13:01 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-01-14 11:24:40 +0000 |
| commit | 47e3d63efb94462bdbb00e737e1a3b213fed62ae (patch) | |
| tree | e6d268fb72e26f972d550f257d8cb4f359b3a00b /WebCore/websockets | |
| parent | ee0e4a35152a822ebac039808db1a4c33f02f7ee (diff) | |
| download | external_webkit-47e3d63efb94462bdbb00e737e1a3b213fed62ae.zip external_webkit-47e3d63efb94462bdbb00e737e1a3b213fed62ae.tar.gz external_webkit-47e3d63efb94462bdbb00e737e1a3b213fed62ae.tar.bz2 | |
Move general includes before bindings includes.
This avoids problems with collisions between WebCore/platform/text/StringBuilder.h and the new
JavaScriptCore/runtime/StringBuilder.h. The latter is added in WebKit change 52075, so will be
picked up in the next WebKit merge. We may also cherry-pick the changes which add this file
as they are relevant to upstreaming in WebCore/bridge.
In WebCore, we want '#include "StringBuilder.h"' to pick up the WebCore StringBuilder.h. However, when
building WebCore for JSC, we need JavaScriptCore/runtime on the include path so that the JSC headers
are picked up correctly. This change puts JavaScriptCore/runtime and other bindings includes after the
WebCore and other general includes, so that the WebCore StringBuilder.h is picked up.
This was upstreamed to webkit.org in http://trac.webkit.org/changeset/53254
Change-Id: I1b20b6d457f1d5d1f08764ff0b537058e0742835
Diffstat (limited to 'WebCore/websockets')
0 files changed, 0 insertions, 0 deletions