diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-10-05 20:23:04 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-10-07 11:03:33 +0100 |
| commit | ec39fd6fb1e0ae6e61e6fcdea4197f54dda2713d (patch) | |
| tree | fbbecec813c475d7f86a121a19cc4e4f8f9a1fbf | |
| parent | eea0127e7a587bbd6825bb2f47e86e70cb0a5be2 (diff) | |
| download | external_webkit-ec39fd6fb1e0ae6e61e6fcdea4197f54dda2713d.zip external_webkit-ec39fd6fb1e0ae6e61e6fcdea4197f54dda2713d.tar.gz external_webkit-ec39fd6fb1e0ae6e61e6fcdea4197f54dda2713d.tar.bz2 | |
Merge WebKit at r68651 : Use the Android version of release/retainPlatformWidget
Empty declarations for these were added in the header file, probably safest
to keep the Android ones around.
In the Fix conflicts merge these were removed from Widget.cpp, so this should
match the old behaviour.
Webkit CL:
http://trac.webkit.org/changeset/68054/trunk/WebCore/platform/Widget.h
Change-Id: Ifdc0ad47816e03a7d424eb7130f2f7c1a61f7067
| -rw-r--r-- | WebCore/platform/Widget.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/platform/Widget.h b/WebCore/platform/Widget.h index 90d38a9..089a1e9 100644 --- a/WebCore/platform/Widget.h +++ b/WebCore/platform/Widget.h @@ -303,7 +303,7 @@ inline void Widget::setPlatformWidget(PlatformWidget widget) #endif -#if !PLATFORM(GTK) +#if !PLATFORM(GTK) && !PLATFORM(ANDROID) inline void Widget::releasePlatformWidget() { |