Merge WebKit at r74534: Initial merge by git.

Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb

1 files changed, 54 insertions, 0 deletions

diff --git a/WebKit/gtk/webkit/webkitviewportattributesprivate.h b/WebKit/gtk/webkit/webkitviewportattributesprivate.h
new file mode 100644
index 0000000..11cb668
--- /dev/null
+++ b/WebKit/gtk/webkit/webkitviewportattributesprivate.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2007, 2008, 2009 Holger Hans Peter Freyther
+ * Copyright (C) 2008 Jan Michael C. Alonzo
+ * Copyright (C) 2008 Collabora Ltd.
+ * Copyright (C) 2010 Igalia S.L.
+ *
+ * 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 webkitviewportattributesprivate_h
+#define webkitnavigationactionprivate_h
+
+#include <webkit/webkitviewportattributes.h>
+
+extern "C" {
+
+struct _WebKitViewportAttributesPrivate {
+    WebKitWebView* webView;
+    int deviceWidth;
+    int deviceHeight;
+    int availableWidth;
+    int availableHeight;
+    int desktopWidth;
+    int deviceDPI;
+
+    int width;
+    int height;
+    float initialScaleFactor;
+    float minimumScaleFactor;
+    float maximumScaleFactor;
+    float devicePixelRatio;
+    gboolean userScalable;
+    gboolean isValid;
+};
+
+
+void webkitViewportAttributesRecompute(WebKitViewportAttributes*);
+
+}
+
+#endif