Merge WebKit at r78450: Initial merge by git.

Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1

1 files changed, 34 insertions, 0 deletions

diff --git a/Source/WebCore/plugins/IFrameShimSupport.h b/Source/WebCore/plugins/IFrameShimSupport.h
new file mode 100644
index 0000000..6e55126
--- /dev/null
+++ b/Source/WebCore/plugins/IFrameShimSupport.h
@@ -0,0 +1,34 @@
+/*
+    Copyright (C) 2011 Robert Hogan <robert@roberthogan.net>.
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#ifndef IFrameShimSupport_h
+#define IFrameShimSupport_h
+
+#include <wtf/Vector.h>
+
+namespace WebCore {
+class Element;
+class Widget;
+class IntRect;
+
+void getPluginOcclusions(Element*, Widget* parentWidget, const IntRect& frameRect, Vector<IntRect>& occlusions);
+
+} // namespace WebCore
+
+#endif // IFrameShimSupport_h