Skip to content

Commit

Permalink
Upstream platform/network/blackberry/ProxyServerBlackBerry.cpp
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=73288

Reviewed by Antonio Gomes.

Initial upstream, can't be built yet, no new tests.

* platform/network/blackberry/ProxyServerBlackBerry.cpp: Added.
(WebCore::proxyServersForURL):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@101444 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Leo Yang committed Nov 30, 2011
1 parent 1e426f8 commit 18502bc
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 0 deletions.
12 changes: 12 additions & 0 deletions Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
2011-11-29 Leo Yang <leo.yang@torchmobile.com.cn>

Upstream platform/network/blackberry/ProxyServerBlackBerry.cpp
https://bugs.webkit.org/show_bug.cgi?id=73288

Reviewed by Antonio Gomes.

Initial upstream, can't be built yet, no new tests.

* platform/network/blackberry/ProxyServerBlackBerry.cpp: Added.
(WebCore::proxyServersForURL):

2011-11-29 Jessie Berlin <jberlin@apple.com>

WKKeyValueStorageManagerGetKeyValueStorageOrigins may not report the correct list of origins
Expand Down
@@ -0,0 +1,40 @@
/*
* Copyright (C) 2010 Brent Fulgham <bfulgham@webkit.org>. 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 "ProxyServer.h"

#include "KURL.h"
#include "NotImplemented.h"

namespace WebCore {

Vector<ProxyServer> proxyServersForURL(const KURL&, const NetworkingContext*)
{
notImplemented();
return Vector<ProxyServer>();
}

} // namespace WebCore

0 comments on commit 18502bc

Please sign in to comment.