Merge webkit.org at r58033 : Resolve merge conflicts

- CanvasRenderingContext2D.cpp - Take upstream, conflict due to cherry-pick of security fix, see 285b474734e82bc42b25e48ea4824f8050badb4f
- CanvasSurface.cpp, HTMLCanvasElement.cpp - convertLogicalToDevice has been refactored. See http://trac.webkit.org/changeset/56447
- Chrome.cpp/h, ChromeClient.h - Take upstream, conflict due to cherry-pick of cancelling Geolocation permission request
- Document.h - Take both, conflicts due to ANDROID_META_SUPPORT
- DragImage.h - Take both, conflict due to Android addition
- EmptyClients.h - Take upstream, conflicts due to Geo cancel permission request
- EventHandler.cpp - Take both, conflicts due to recently upstreamed touch events and ANDROID_PLUGINS
- EventHandler.cpp - Keep ours, conflict due to touch event bug fixes not yet upstreamed. See 7f034a1734d634dd1fdb3b64817d5828b5e46922 and 73adc26dba4be1d9da34a7f0907cb7b12f10c909
- FileSystemPOSIX - Take both, conflict due to ANDROID_PLUGINS
- FrameLoader.cpp - Take both, conflct due to ANDROID_BLOCK_NETWORK_IMAGE
- FrameView.cpp - Take both, conflict due to Android frame flattening
- Geolocation.h - Merge conflicts due to Android-specific changes
- Geolocation.cpp - Take upstream, conflict due to addition of Geolocation maximumAge
- GeolocationPositionCache.cpp - Take upstream, conflict due to addition of ENABLE_GEOLOCATION guards
- Gradient.h - Take both, conflict due to Android addition
- HTMLLinkElement.cpp, DocLoader.cpp - Take both, conflict due to new link prefetching not yet upstreamed. See f91ac8eab3399adb5325701bebe0590a77e49df7
- HTMLMetaElement.cpp - Take both, conflict due to recently upstreamed meta element
- JavaInstanceJSC.cpp - Take both, conflict due to Android additional logging
- MediaPlayer.cpp/h - Take both, conflict due to Android-specific change
- PlatformTouchPoint.h - Take upstream, conflict due to recently upstreamed unsigned stuff
- RenderFrame.cpp, RenderFrameSet.h - Take both, conflict due to Android frameset flattening
- RenderLayerCompositor.cpp - Take both, conflicts due to Android layers code
- Settings.cpp/h - Conflict due to ANDROID_PLUGINS
- TextInputController.h - Take upstream, git got confused
- V8DOMWindowShell.cpp - Take upstream, conflict due to cherry-pick of method to add V8 bindings for page cache, see 8fecd9c9a62aa89fb44ed3142ba583dc7b8cbe29
- V8DOMWraper.cpp - Take upstream, conflict due to recently upstreamed WORKERS guards
- WebCore.xcodeproj - Take upstream, conflict due to addition of Geolocation maximumAge
- Widget.h - Take both, conflict due to Android addition
- jsc/JNIUtilityPrivate.cpp - Take upstream, conflict due to switching from bzero to memset
- mac/WebCoreSupport/WebChromeCient.h - Take upstream, conflicts due to Geo cancel permission request

Change-Id: I1b75eac220faddf2f84c7fd4fd3436a5e07edf64

1 files changed, 0 insertions, 76 deletions

diff --git a/WebKitTools/DumpRenderTree/chromium/TextInputController.h b/WebKitTools/DumpRenderTree/chromium/TextInputController.h
index a912ba1..9896be5 100644
--- a/WebKitTools/DumpRenderTree/chromium/TextInputController.h
+++ b/WebKitTools/DumpRenderTree/chromium/TextInputController.h
@@ -28,81 +28,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-<<<<<<< HEAD:WebCore/bindings/v8/custom/V8NavigatorCustom.cpp
-#include "config.h"
-#include "V8Navigator.h"
-
-#include "RuntimeEnabledFeatures.h"
-#include "V8DOMWindow.h"
-#include "V8DOMWrapper.h"
-
-#if PLATFORM(ANDROID)
-#include "ExceptionCode.h"
-#include "V8CustomApplicationInstalledCallback.h"
-#include "V8Proxy.h"
-#endif
-
-namespace WebCore {
-
-v8::Handle<v8::Value> toV8(Navigator* impl)
-{
-    if (!impl)
-        return v8::Null();
-    v8::Handle<v8::Object> wrapper = getDOMObjectMap().get(impl);
-    if (wrapper.IsEmpty()) {
-        wrapper = V8Navigator::wrap(impl);
-        if (!wrapper.IsEmpty())
-            V8DOMWrapper::setHiddenWindowReference(impl->frame(), V8DOMWindow::navigatorIndex, wrapper);
-    }
-    return wrapper;
-}
-
-#if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
-
-static PassRefPtr<ApplicationInstalledCallback> createApplicationInstalledCallback(
-        v8::Local<v8::Value> value, bool& succeeded)
-{
-    succeeded = true;
-
-    if (!value->IsFunction()) {
-        succeeded = false;
-        throwError("The second argument should be a function");
-        return 0;
-    }
-
-    Frame* frame = V8Proxy::retrieveFrameForCurrentContext();
-    return V8CustomApplicationInstalledCallback::create(value, frame);
-}
-
-v8::Handle<v8::Value> V8Navigator::isApplicationInstalledCallback(const v8::Arguments& args)
-{
-    INC_STATS("DOM.isApplicationInstalled()");
-    bool succeeded = false;
-
-    if (args.Length() < 2)
-        return throwError("Two arguments required: an application name and a callback.", V8Proxy::SyntaxError);
-
-    if (!args[0]->IsString())
-        return throwError("The first argument should be a string.");
-
-    RefPtr<ApplicationInstalledCallback> callback =
-        createApplicationInstalledCallback(args[1], succeeded);
-    if (!succeeded)
-        return v8::Undefined();
-
-    ASSERT(callback);
-
-    Navigator* navigator = V8Navigator::toNative(args.Holder());
-    if (!navigator->isApplicationInstalled(toWebCoreString(args[0]), callback.release()))
-        return throwError(INVALID_STATE_ERR);
-
-    return v8::Undefined();
-}
-
-#endif // PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
-
-} // namespace WebCore
-=======
 // TextInputController is bound to window.textInputController in Javascript
 // when DRT is running. Layout tests use it to exercise various corners of
 // text input.
@@ -146,4 +71,3 @@ private:
 };
 
 #endif // TextInputController_h
->>>>>>> webkit.org at r58033:WebKitTools/DumpRenderTree/chromium/TextInputController.h