Commit 93d97678 authored by tfarina@chromium.org's avatar tfarina@chromium.org

Get weborigin to build within blink_platform target.

It does not build entirely yet, but get us closer.

../../third_party/WebKit/Source/platform/weborigin/OriginAccessEntry.cpp:
In constructor 'WebCore::OriginAccessEntry::OriginAccessEntry(const
                WTF::String&, const WTF::String&,
                WebCore::OriginAccessEntry::SubdomainSetting,
                WebCore::OriginAccessEntry::IPAddressSetting)':
../../third_party/WebKit/Source/platform/weborigin/OriginAccessEntry.cpp:55:86:
error: no matching function for call to
'blink::WebPublicSuffixList::getPublicSuffixLength(WTF::String&)'
../../third_party/WebKit/Source/platform/weborigin/OriginAccessEntry.cpp:55:86:
note: candidate is:
../../third_party/WebKit/public/platform/WebPublicSuffixList.h:40:20:
note: virtual size_t
blink::WebPublicSuffixList::getPublicSuffixLength(const
                blink::WebString&)
../../third_party/WebKit/public/platform/WebPublicSuffixList.h:40:20:
note:   no known conversion for argument 1 from 'WTF::String' to 'const
blink::WebString&'

BUG=328717
TEST=gn, ninja -C out/Default blink_platform
R=brettw@chromium.org
TBR=darin

Review URL: https://codereview.chromium.org/119723003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243886 0039d316-1c4b-4281-b951-d872f2087c98
parent da0aec69
...@@ -32,7 +32,7 @@ group("root") { ...@@ -32,7 +32,7 @@ group("root") {
"//third_party/icu:icudata", "//third_party/icu:icudata",
"//third_party/leveldatabase", "//third_party/leveldatabase",
"//third_party/zlib", "//third_party/zlib",
"//third_party/WebKit/Source/weborigin", "//third_party/WebKit/Source/platform",
"//skia", "//skia",
"//tools/gn", "//tools/gn",
"//url", "//url",
......
# Copyright 2013 The Chromium Authors. All rights reserved. # Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
component("weborigin") { component("platform") {
output_name = "blink_platform"
sources = [ sources = [
"DatabaseIdentifier.cpp", "weborigin/DatabaseIdentifier.cpp",
"DatabaseIdentifier.h", "weborigin/DatabaseIdentifier.h",
"KURL.cpp", "weborigin/KURL.cpp",
"KURL.h", "weborigin/KURL.h",
"KURLHash.h", "weborigin/KURLHash.h",
"KnownPorts.cpp", "weborigin/KnownPorts.cpp",
"KnownPorts.h", "weborigin/KnownPorts.h",
"OriginAccessEntry.cpp", "weborigin/OriginAccessEntry.cpp",
"OriginAccessEntry.h", "weborigin/OriginAccessEntry.h",
"ReferrerPolicy.h", "weborigin/ReferrerPolicy.h",
"SchemeRegistry.cpp", "weborigin/SchemeRegistry.cpp",
"SchemeRegistry.h", "weborigin/SchemeRegistry.h",
"SecurityOrigin.cpp", "weborigin/SecurityOrigin.cpp",
"SecurityOrigin.h", "weborigin/SecurityOrigin.h",
"SecurityOriginCache.h", "weborigin/SecurityOriginCache.h",
"SecurityOriginHash.h", "weborigin/SecurityOriginHash.h",
"SecurityPolicy.cpp", "weborigin/SecurityPolicy.cpp",
"SecurityPolicy.h", "weborigin/SecurityPolicy.h",
"WebOriginExport.h", "weborigin/WebOriginExport.h",
] ]
configs -= [ "//build/config/compiler:chromium_code" ] configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ configs += [
"//build/config/compiler:no_chromium_code",
"../wtf:wtf-config" "../wtf:wtf-config"
"//build/config/compiler:no_chromium_code",
] ]
include_dirs = [ "../.." ]
defines = [ "WEBORIGIN_IMPLEMENTATION=1" ] defines = [ "WEBORIGIN_IMPLEMENTATION=1" ]
deps = [ deps = [
"//third_party/WebKit/Source/wtf",
"//third_party/icu:icui18n", "//third_party/icu:icui18n",
"//third_party/icu:icuuc", "//third_party/icu:icuuc",
"//url", "//url",
] ]
} }
executable("weborigin_unittests") { executable("blink_platform_unittests") {
sources = [ sources = [
"DatabaseIdentifierTest.cpp", "weborigin/DatabaseIdentifierTest.cpp",
"KURLTest.cpp", "weborigin/KURLTest.cpp",
"SecurityOriginTest.cpp", "weborigin/SecurityOriginTest.cpp",
] ]
configs -= [ "//build/config/compiler:chromium_code" ] configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ configs += [
"../wtf:wtf-config" "../wtf:wtf-config"
"//build/config/compiler:no_chromium_code", "//build/config/compiler:no_chromium_code",
"//third_party/icu:icu_config", "//third_party/icu:icu_config",
] ]
deps = [ deps = [
":weborigin", ":platform",
"../wtf:run_all_tests", "../wtf:run_all_tests",
] ]
# if (is_linux && use_tcmalloc) { # if (is_linux && use_tcmalloc) {
# deps += [ # deps += [
# "//base:base", # "//base:base",
# "//base/allocator:allocator", # "//base/allocator:allocator",
# ], # ],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment