From cad810f21b803229eb11403f9209855525a25d57 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Fri, 6 May 2011 11:45:16 +0100 Subject: Merge WebKit at r75315: Initial merge by git. Change-Id: I570314b346ce101c935ed22a626b48c2af266b84 --- Source/WebCore/loader/win/DocumentLoaderWin.cpp | 46 ++++++++++++++++++ Source/WebCore/loader/win/FrameLoaderWin.cpp | 63 +++++++++++++++++++++++++ 2 files changed, 109 insertions(+) create mode 100644 Source/WebCore/loader/win/DocumentLoaderWin.cpp create mode 100644 Source/WebCore/loader/win/FrameLoaderWin.cpp (limited to 'Source/WebCore/loader/win') diff --git a/Source/WebCore/loader/win/DocumentLoaderWin.cpp b/Source/WebCore/loader/win/DocumentLoaderWin.cpp new file mode 100644 index 0000000..bab7de6 --- /dev/null +++ b/Source/WebCore/loader/win/DocumentLoaderWin.cpp @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2006 Don Gibson + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "config.h" +#include "DocumentLoader.h" + +#include "FrameWin.h" +#include "PlatformString.h" + +namespace WebCore { + +void DocumentLoader::setTitle(const String& title) +{ + String text = title; + text.replace('//', m_frame->backslashAsCurrencySymbol()); + + FrameWin* frameWin = static_cast(m_frame); + if (frameWin->client()) + frameWin->client()->setTitle(text); +} + +} diff --git a/Source/WebCore/loader/win/FrameLoaderWin.cpp b/Source/WebCore/loader/win/FrameLoaderWin.cpp new file mode 100644 index 0000000..66aa6ff --- /dev/null +++ b/Source/WebCore/loader/win/FrameLoaderWin.cpp @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2006 Don Gibson + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "config.h" +#include "FrameLoader.h" + +#include "DocumentLoader.h" +#include "FrameLoadRequest.h" +#include "FrameWin.h" +#include "ResourceRequest.h" + +namespace WebCore { + +void FrameLoader::urlSelected(const FrameLoadRequest& request, Event* /*triggering Event*/) +{ + FrameWin* frameWin = static_cast(m_frame); + if (frameWin->client()) + frameWin->client()->openURL(request.resourceRequest().url().string(), request.lockHistory()); +} + +void FrameLoader::submitForm(const FrameLoadRequest& request, Event*) +{ + const ResourceRequest& resourceRequest = request.resourceRequest(); + +#ifdef MULTIPLE_FORM_SUBMISSION_PROTECTION + // FIXME: this is a hack inherited from FrameMac, and should be pushed into Frame + if (m_submittedFormURL == resourceRequest.url()) + return; + m_submittedFormURL = resourceRequest.url(); +#endif + + FrameWin* frameWin = static_cast(m_frame); + if (frameWin->client()) + frameWin->client()->submitForm(resourceRequest.httpMethod(), resourceRequest.url(), resourceRequest.httpBody()); + + clearRecordedFormValues(); +} + +} -- cgit v1.1