From 9fa6ca170aa2a735001e4833c3c712ef3f3b51fa Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Tue, 14 Apr 2015 12:16:51 -0700 Subject: [PATCH] Teach window.location.href setter to handle relative urls. Also fixed display of text in touch-demo.sky R=ianh@google.com Review URL: https://codereview.chromium.org/1059743004 --- engine/core/frame/LocalDOMWindow.cpp | 2 +- examples/raw/touch-demo.sky | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/engine/core/frame/LocalDOMWindow.cpp b/engine/core/frame/LocalDOMWindow.cpp index 03429144776..16e1da3ced3 100644 --- a/engine/core/frame/LocalDOMWindow.cpp +++ b/engine/core/frame/LocalDOMWindow.cpp @@ -703,7 +703,7 @@ void LocalDOMWindow::setLocation(const String& urlString, SetLocationLocking loc if (!host) return; mojo::URLRequestPtr request = mojo::URLRequest::New(); - request->url = urlString.toUTF8(); + request->url = document()->completeURL(urlString).string().toUTF8(); host->services()->NavigatorHost()->RequestNavigate( mojo::TARGET_SOURCE_NODE, request.Pass()); } diff --git a/examples/raw/touch-demo.sky b/examples/raw/touch-demo.sky index d4ab5b6c8f8..79e4b8b8713 100644 --- a/examples/raw/touch-demo.sky +++ b/examples/raw/touch-demo.sky @@ -12,6 +12,7 @@ dot { } log { + display: paragraph; margin-top: 50px; }