Typo in ThreadGuard.java

.gitignore

@@ -23,6 +23,7 @@ android/server/bin/
 cpp/IEDriver/IEReturnTypes.h
 java/org/openqa/selenium/ie/IeReturnTypes.java
 java/client/src/org/openqa/selenium/ie/IeReturnTypes.java
+javascript/deps.js
 .idea/vcs.xml
 .idea/misc.xml
 .idea/workspace.xml

WebDriver.sln

@@ -123,7 +123,6 @@ Global
 		{A9D3BB2D-FD1E-43A2-80F6-F8320682323E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{A9D3BB2D-FD1E-43A2-80F6-F8320682323E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{A9D3BB2D-FD1E-43A2-80F6-F8320682323E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A9D3BB2D-FD1E-43A2-80F6-F8320682323E}.Debug|Win32.Build.0 = Debug|Win32
 		{A9D3BB2D-FD1E-43A2-80F6-F8320682323E}.Debug|x64.ActiveCfg = Debug|x64
 		{A9D3BB2D-FD1E-43A2-80F6-F8320682323E}.Release|.NET.ActiveCfg = Release|Win32
 		{A9D3BB2D-FD1E-43A2-80F6-F8320682323E}.Release|Any CPU.ActiveCfg = Release|Win32
@@ -467,33 +466,27 @@ Global
 		{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
 		{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Debug|Mixed Platforms.Build.0 = Debug|x64
 		{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Debug|Win32.Build.0 = Debug|Win32
 		{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Debug|x64.ActiveCfg = Debug|x64
-		{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Debug|x64.Build.0 = Debug|x64
 		{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Release|.NET.ActiveCfg = Release|x64
 		{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Release|Any CPU.ActiveCfg = Release|x64
 		{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Release|Mixed Platforms.ActiveCfg = Release|x64
 		{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Release|Mixed Platforms.Build.0 = Release|x64
 		{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Release|Win32.ActiveCfg = Release|Win32
 		{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Release|Win32.Build.0 = Release|Win32
 		{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Release|x64.ActiveCfg = Release|x64
-		{D137A27D-8324-4024-97FC-D2D29E3EFE60}.Release|x64.Build.0 = Release|x64
 		{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Debug|.NET.ActiveCfg = Debug|x64
 		{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
 		{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Debug|Mixed Platforms.Build.0 = Debug|x64
 		{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Debug|Win32.Build.0 = Debug|Win32
 		{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Debug|x64.ActiveCfg = Debug|x64
-		{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Debug|x64.Build.0 = Debug|x64
 		{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Release|.NET.ActiveCfg = Release|x64
 		{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Release|Any CPU.ActiveCfg = Release|x64
 		{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Release|Mixed Platforms.ActiveCfg = Release|x64
 		{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Release|Mixed Platforms.Build.0 = Release|x64
 		{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Release|Win32.ActiveCfg = Release|Win32
 		{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Release|Win32.Build.0 = Release|Win32
 		{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Release|x64.ActiveCfg = Release|x64
-		{15097CC6-2D02-450E-93CF-3F4822EE64E7}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

android/.classpath

@@ -7,6 +7,6 @@
 	<classpathentry kind="lib" path="/third-party/java/android/android-14.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/servlet-api/servlet-api-2.5-6.1.9.jar" sourcepath="/third-party/java/servlet-api/servlet-api-2.5-6.1.9-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/webbit/webbit-0.4.14.jar" sourcepath="/third-party/java/webbit/webbit-0.4.14-src.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/guava-libraries/guava-14.0-rc1.jar" sourcepath="/third-party/java/guava-libraries/guava-14.0-rc1-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/guava-libraries/guava-14.0.jar" sourcepath="/third-party/java/guava-libraries/guava-14.0-sources.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

android/build.desc

@@ -12,6 +12,7 @@ java_library(name = "server",
   deps = [
     "//java/client/src/org/openqa/selenium/android:android_library",
     "//java/client/src/org/openqa/selenium/browserlaunchers:proxies",
+    "//java/client/src/org/openqa/selenium/remote:api",
     "//java/client/src/org/openqa/selenium/remote:base",
     "//java/client/src/org/openqa/selenium/remote:common",
     "//java/client/src/org/openqa/selenium/remote:remote",

android/build.xml

@@ -34,19 +34,20 @@
     <copy file="${build.location}/java/client/src/org/openqa/selenium/base.jar" tofile="libs/base.jar" />
     <copy file="${build.location}/java/client/src/org/openqa/selenium/codecs.jar" tofile="libs/codecs.jar" />
     <copy file="${build.location}/java/client/src/org/openqa/selenium/webdriver-api.jar" tofile="libs/webdriver-api.jar" />
+    <copy file="${build.location}/java/client/src/org/openqa/selenium/remote/api.jar" tofile="libs/webdriver-remote-api.jar" />
     <copy file="${build.location}/java/client/src/org/openqa/selenium/remote/base.jar" tofile="libs/webdriver-base.jar" />
     <copy file="${build.location}/java/client/src/org/openqa/selenium/remote/common.jar" tofile="libs/webdriver-common.jar" />
     <copy file="${build.location}/java/client/src/org/openqa/selenium/remote/remote.jar" tofile="libs/webdriver-client-remote.jar" />
     <copy file="${build.location}/java/client/src/org/openqa/selenium/browserlaunchers/proxies.jar" tofile="libs/proxies.jar" />
     <copy file="${build.location}/java/client/src/org/openqa/selenium/support/events/events.jar" tofile="libs/events.jar" />
     <copy file="${build.location}/java/client/src/org/openqa/selenium/logging/logging.jar" tofile="libs/logging.jar" />
-	<copy file="${build.location}/java/client/src/org/openqa/selenium/interactions/interactions.jar" tofile="libs/interactions.jar" />
+    <copy file="${build.location}/java/client/src/org/openqa/selenium/interactions/interactions.jar" tofile="libs/interactions.jar" />
     <copy file="${build.location}/java/server/src/org/openqa/selenium/remote/server/resource/resource.jar" tofile="libs/remote-wdserver-resource.jar" />
     <copy file="${build.location}/java/server/src/org/openqa/selenium/remote/server/server_very_core.jar" tofile="libs/remote-wdserver-verycore.jar" />
     <copy file="${build.location}/java/server/src/org/openqa/selenium/remote/server/server_core.jar" tofile="libs/remote-wdserver.jar" />
     <copy file="${build.location}/java/server/src/org/openqa/selenium/server/logging.jar" tofile="libs/remote-logging.jar" />
     <copy file="${build.location}/third_party/java/webbit/webbit-standalone.jar" tofile="libs/webbit-server.jar" />
-    <copy file="${third_party.location}/java/guava-libraries/guava-14.0-rc1.jar" todir="libs/"  />
+    <copy file="${third_party.location}/java/guava-libraries/guava-14.0.jar" todir="libs/"  />
     <copy file="${third_party.location}/java/json/json-20080701.jar" todir="libs/" />
     <copy file="${build.location}/java/client/src/org/openqa/selenium/android/android_library.jar" todir="libs" />
     <copy file="${build.location}/java/client/src/org/openqa/selenium/io/io.jar" todir="libs" />

android/src/org/openqa/selenium/android/server/handler/GetCapabilities.java

@@ -20,6 +20,8 @@
 
 import android.os.Build;
 
+import org.openqa.selenium.Platform;
+import org.openqa.selenium.remote.BrowserType;
 import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.remote.server.Session;
 import org.openqa.selenium.remote.server.handler.GetSessionCapabilities;
@@ -41,9 +43,9 @@ protected Map<String, Object> describeSession(Map<String, Object> capabilities)
     Map<String, Object> caps = Maps.newHashMap();
     caps.putAll(capabilities);
     caps.put(CapabilityType.TAKES_SCREENSHOT, true);
-    caps.put(CapabilityType.BROWSER_NAME, "android");
+    caps.put(CapabilityType.BROWSER_NAME, BrowserType.ANDROID);
     caps.put(CapabilityType.ROTATABLE, true);
-    caps.put(CapabilityType.PLATFORM, "android");
+    caps.put(CapabilityType.PLATFORM, Platform.ANDROID);
     caps.put(CapabilityType.SUPPORTS_ALERTS, true);
     caps.put(CapabilityType.SUPPORTS_JAVASCRIPT, true);
     caps.put(CapabilityType.VERSION, Build.VERSION.SDK);

common/src/web/click_tests/google_map.html

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Google Image Map</title>
+</head>
+<body>
+<h1>Google Image Map</h1>
+<img id="google_logo" src="google_map.png" usemap="#google_map" border="0" width="364" height="126"/>
+<map id="google_map" name="google_map">
+<area id="rectG" shape="rect" coords="0,0,90,100" href="mapped_page1.html" alt="area 1"/>
+<area id="circleO" shape="circle" coords="120,60,30" href="mapped_page2.html" alt="area 2"/>
+<area id="polyLE" shape="poly" coords="280,0,310,0,360,30,360,90,280,90" href="mapped_page3.html" alt="area 3"/>
+</map>
+</body>
+</html>

common/src/web/click_tests/mapped_page1.html

@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Target Page 1</title>
+</head>
+<body>
+  <div>Target Page 1</div>
+</body>
+</html>

common/src/web/click_tests/mapped_page2.html

@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Target Page 2</title>
+</head>
+<body>
+  <div>Target Page 2</div>
+</body>
+</html>

common/src/web/click_tests/mapped_page3.html

@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Target Page 3</title>
+</head>
+<body>
+  <div>Target Page 3</div>
+</body>
+</html>

common/src/web/javascriptPage.html

@@ -1,20 +1,21 @@
 <?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
     <title>Testing Javascript</title>
     <script type="text/javascript">
         var seen = {};
 
         function updateContent(input) {
-            document.getElementById('result').innerHTML = "<p>" + input.value + "</p>";
+            document.getElementById('resultParagraph').innerHTML = input.value;
         }
 
         function displayMessage(message) {
-            document.getElementById('result').innerHTML = "<p>" + message + "</p>";
+            document.getElementById('resultParagraph').innerHTML = message;
         }
 
         function appendMessage(message) {
-            document.getElementById('result').innerHTML += message + " ";
+            document.getElementById('resultParagraph').innerHTML += message + " ";
         }
 
         function register(message) {
@@ -81,7 +82,7 @@ <h1>Type Stuff</h1>
 
 <div id="resultContainer" height="30">&nbsp;
   <div id="result" style="width:300;height:60">
-    <p>&nbsp;</p>
+    <p id="resultParagraph">&nbsp;</p>
   </div>
 
 </div>

common/src/web/scroll.html

@@ -8,6 +8,7 @@
 	document.getElementById('clicked').innerHTML = elt.innerHTML;
 }
 </script>
+<div style='height: 150px'></div>
 <ul style='overflow: scroll; width: 150px; height: 80px; background-color: yellow' onclick="dump(event)">
 <li id='line1'>line1</li>
 <li id='line2'>line2</li>

cpp/IEDriver/Browser.cpp

@@ -308,7 +308,9 @@ unsigned int WINAPI Browser::GoBackThreadProc(LPVOID param) {
   hr = ::CoGetInterfaceAndReleaseStream(message_payload,
                                         IID_IWebBrowser2,
                                         reinterpret_cast<void**>(&browser));
-  hr = browser->GoBack();
+  if (browser != NULL) {
+    hr = browser->GoBack();
+  }
   return 0;
 }
 
@@ -338,7 +340,9 @@ unsigned int WINAPI Browser::GoForwardThreadProc(LPVOID param) {
   hr = ::CoGetInterfaceAndReleaseStream(message_payload,
                                         IID_IWebBrowser2,
                                         reinterpret_cast<void**>(&browser));
-  hr = browser->GoForward();
+  if (browser != NULL) {
+    hr = browser->GoForward();
+  }
   return 0;
 }