From 258c84d33512b45cb046504de7d790cf1bd5266f Mon Sep 17 00:00:00 2001
From: Jim Nelson <jim@yorba.org>
Date: Thu, 12 Dec 2013 14:48:53 -0800
Subject: [PATCH] Build against WebKitGTK 2.0.4: Closes #720290

---
 CMakeLists.txt                                |  1 +
 .../webkitgtk-1.10/WebKit-3.0.metadata        | 16 ++++++++++++++++
 .../webkitgtk-2.0/WebKit-3.0.metadata         |  3 +++
 src/CMakeLists.txt                            | 19 +++++++++++++++----
 4 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 bindings/metadata/webkitgtk-1.10/WebKit-3.0.metadata

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a190d88..de761dbe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,6 +52,7 @@ endif ()
 find_package(PkgConfig)
 pkg_check_modules(LIBUNITY QUIET unity>=5.12.0)
 pkg_check_modules(LIBMESSAGINGMENU QUIET messaging-menu>=12.10.2)
+pkg_check_modules(WEBKITGTK110X QUIET webkitgtk-3.0<=1.10.2)
 pkg_check_modules(WEBKITGTK22X QUIET webkitgtk-3.0>=2.2.0)
 
 # intl
diff --git a/bindings/metadata/webkitgtk-1.10/WebKit-3.0.metadata b/bindings/metadata/webkitgtk-1.10/WebKit-3.0.metadata
new file mode 100644
index 00000000..27ca48d6
--- /dev/null
+++ b/bindings/metadata/webkitgtk-1.10/WebKit-3.0.metadata
@@ -0,0 +1,16 @@
+DOM* parent="WebKit.DOM" name="DOM(.+)"
+
+DOMEventTarget.add_event_listener skip=false
+DOMEventTarget.remove_event_listener skip=false
+
+WebView.entering_fullscreen#signal name="entering_fullscreen_signal"
+WebView.leaving_fullscreen#signal name="leaving_fullscreen_signal"
+
+WebView.move_cursor#virtual_method name="leaving_fullscreen_method"
+WebSettings.enable_default_context_menu#property deprecated=false
+
+DOMNode.dispatch_event type="void"
+DOMWebKitNamedFlow.dispatch_event type="void"
+DOMDOMApplicationCache.dispatch_event type="void"
+DOMDOMWindow.dispatch_event type="void"
+
diff --git a/bindings/metadata/webkitgtk-2.0/WebKit-3.0.metadata b/bindings/metadata/webkitgtk-2.0/WebKit-3.0.metadata
index 27ca48d6..41376f15 100644
--- a/bindings/metadata/webkitgtk-2.0/WebKit-3.0.metadata
+++ b/bindings/metadata/webkitgtk-2.0/WebKit-3.0.metadata
@@ -13,4 +13,7 @@ DOMNode.dispatch_event type="void"
 DOMWebKitNamedFlow.dispatch_event type="void"
 DOMDOMApplicationCache.dispatch_event type="void"
 DOMDOMWindow.dispatch_event type="void"
+DOMTextTrackCue.dispatch_event type="void"
+DOMTextTrack.dispatch_event type="void"
+DOMTextTrackList.dispatch_event type="void"
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3e1d60be..fab87090 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -438,8 +438,19 @@ else ()
     message(STATUS "Unity launcher support: OFF")
 endif ()
 
-if (WEBKITGTK22X_FOUND)
-    message(STATUS "Targeting WebKitGTK 2.2.x")
+if (WEBKITGTK110X_FOUND)
+    message(STATUS "Targeting WebKitGTK 1.10")
+    SET(EXTRA_CLIENT_PKG_CONFIG
+        ${EXTRA_CLIENT_PKG_CONFIG}
+        webkitgtk-3.0>=1.10.0
+        webkitgtk-3.0<=1.10.2
+    )
+    
+    SET(WEBKITGTK_METADATA_DIR
+        webkitgtk-1.10
+    )
+elseif (WEBKITGTK22X_FOUND)
+    message(STATUS "Targeting WebKitGTK 2.2")
     SET(EXTRA_CLIENT_PKG_CONFIG
         ${EXTRA_CLIENT_PKG_CONFIG}
         webkitgtk-3.0>=2.2.0
@@ -449,10 +460,10 @@ if (WEBKITGTK22X_FOUND)
         webkitgtk-2.2
     )
 else ()
-    message(STATUS "Targeting WebKitGTK 1.10.0 to 2.0.4")
+    message(STATUS "Targeting WebKitGTK 2.0")
     SET(EXTRA_CLIENT_PKG_CONFIG
         ${EXTRA_CLIENT_PKG_CONFIG}
-        webkitgtk-3.0>=1.10.0
+        webkitgtk-3.0>=2.0.0
         webkitgtk-3.0<=2.0.4
     )