diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 18:22:07 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:57 +0000 |
| commit | 8761fdb52e725d81cca926454dae4a0e8e1fe1f5 (patch) | |
| tree | e0cdec5eebd87a78318180c9257a81673bd1181f /WebCore/platform | |
| parent | 33fc8ca0ce504ea94c9b038e11968187fc10d13e (diff) | |
| download | external_webkit-8761fdb52e725d81cca926454dae4a0e8e1fe1f5.zip external_webkit-8761fdb52e725d81cca926454dae4a0e8e1fe1f5.tar.gz external_webkit-8761fdb52e725d81cca926454dae4a0e8e1fe1f5.tar.bz2 | |
Merge webkit.org at r54127 : Fix conflicts due to use of OS_ANDROID
See http://trac.webkit.org/changeset/52791
Change-Id: I0e1a6ae16f93cdbb12ae5770607a220079451cb8
Diffstat (limited to 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/Widget.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/WebCore/platform/Widget.cpp b/WebCore/platform/Widget.cpp index 1a8f7f8..520eb6f 100644 --- a/WebCore/platform/Widget.cpp +++ b/WebCore/platform/Widget.cpp @@ -127,11 +127,7 @@ IntPoint Widget::convertFromContainingWindowToRoot(const Widget*, const IntPoint } #endif -<<<<<<< HEAD -#if (!PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(ANDROID)) || ENABLE(EXPERIMENTAL_SINGLE_VIEW_MODE) -======= -#if !PLATFORM(MAC) && !PLATFORM(GTK) ->>>>>>> webkit.org at r54127 +#if !PLATFORM(MAC) && !PLATFORM(GTK) && !OS(ANDROID) void Widget::releasePlatformWidget() { } |