diff options
| author | Steve Block <steveblock@google.com> | 2010-02-16 11:42:26 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-16 11:48:32 +0000 |
| commit | 48b7cc16e8edd7abbf40cbe17b1abbc8cf273929 (patch) | |
| tree | 9092b29329947c15af6f968dcc0ac59393be8e17 /WebKit/chromium | |
| parent | 8a0914b749bbe7da7768e07a7db5c6d4bb09472b (diff) | |
| download | external_webkit-48b7cc16e8edd7abbf40cbe17b1abbc8cf273929.zip external_webkit-48b7cc16e8edd7abbf40cbe17b1abbc8cf273929.tar.gz external_webkit-48b7cc16e8edd7abbf40cbe17b1abbc8cf273929.tar.bz2 | |
Merge webkit.org at r54731 : Fix merge conflicts due to frame flattening
Common frame flattening code was added upstream in http://trac.webkit.org/changeset/54440
We take this code, but also keep the current Android-specific implementation.
Currently, the common code is disabled and we continue to use the Android version.
The two will be combined at a later date.
Change-Id: I194c7028b84a05d85040ca6199802c42a520be96
Diffstat (limited to 'WebKit/chromium')
0 files changed, 0 insertions, 0 deletions