diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 18:22:59 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:57 +0000 |
| commit | c6dded1a060b3f3d623d2aeb1ba4c4607b29eda8 (patch) | |
| tree | 24c270068a7b888e42e4c7f01de0f03d1df27323 /WebCore/platform | |
| parent | 67da76711ae9175ec5a36f1f31c3bfeb602db071 (diff) | |
| download | external_webkit-c6dded1a060b3f3d623d2aeb1ba4c4607b29eda8.zip external_webkit-c6dded1a060b3f3d623d2aeb1ba4c4607b29eda8.tar.gz external_webkit-c6dded1a060b3f3d623d2aeb1ba4c4607b29eda8.tar.bz2 | |
Merge webkit.org at r54127 : Keep ours for PlatformBridge.
Change-Id: I19c5c5ea530813b6665c0d4beacae94be9d65d5d
Diffstat (limited to 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/android/PlatformBridge.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/WebCore/platform/android/PlatformBridge.h b/WebCore/platform/android/PlatformBridge.h index 644b504..5eb127f 100644 --- a/WebCore/platform/android/PlatformBridge.h +++ b/WebCore/platform/android/PlatformBridge.h @@ -81,10 +81,7 @@ class NPObject; namespace WebCore { -<<<<<<< HEAD class FrameView; -======= ->>>>>>> webkit.org at r54127 class Widget; // An interface to the embedding layer, which has the ability to answer @@ -108,7 +105,6 @@ public: static bool cookiesEnabled(); // Plugin static NPObject* pluginScriptableObject(Widget*); -<<<<<<< HEAD // Popups static bool popupsAllowed(NPP); @@ -131,8 +127,6 @@ public: // Whether the WebView is paused. static bool isWebViewPaused(); -======= ->>>>>>> webkit.org at r54127 }; } |