| Index: content/test/layout_tests/runner/WebTestThemeEngineMac.h
|
| diff --git a/webkit/browser/appcache/manifest_parser.h b/content/test/layout_tests/runner/WebTestThemeEngineMac.h
|
| similarity index 50%
|
| copy from webkit/browser/appcache/manifest_parser.h
|
| copy to content/test/layout_tests/runner/WebTestThemeEngineMac.h
|
| index 44661ef1fa0da3a65965c728e2f4f1ae10cbd348..4753b49c3a58f728df13031ba1707118ecf18930 100644
|
| --- a/webkit/browser/appcache/manifest_parser.h
|
| +++ b/content/test/layout_tests/runner/WebTestThemeEngineMac.h
|
| @@ -1,11 +1,9 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// Copyright 2013 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
| -//
|
| -// This is a port of ManifestParser.h from WebKit/WebCore/loader/appcache.
|
|
|
| /*
|
| - * Copyright (C) 2008 Apple Inc. All Rights Reserved.
|
| + * Copyright (C) 2010 Google Inc. All Rights Reserved.
|
| *
|
| * Redistribution and use in source and binary forms, with or without
|
| * modification, are permitted provided that the following conditions
|
| @@ -29,36 +27,44 @@
|
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#ifndef WEBKIT_BROWSER_APPCACHE_MANIFEST_PARSER_H_
|
| -#define WEBKIT_BROWSER_APPCACHE_MANIFEST_PARSER_H_
|
| +// This implements the WebThemeEngine API in such a way that we match the Mac
|
| +// port rendering more than usual Chromium path, thus allowing us to share
|
| +// more pixel baselines.
|
|
|
| -#include <string>
|
| -#include <vector>
|
| +#ifndef WebTestThemeEngineMac_h
|
| +#define WebTestThemeEngineMac_h
|
|
|
| -#include "base/containers/hash_tables.h"
|
| -#include "webkit/browser/webkit_storage_browser_export.h"
|
| -#include "webkit/common/appcache/appcache_interfaces.h"
|
| +#include "third_party/WebKit/public/platform/WebNonCopyable.h"
|
| +#include "third_party/WebKit/public/platform/mac/WebThemeEngine.h"
|
|
|
| -class GURL;
|
| +namespace WebTestRunner {
|
|
|
| -namespace appcache {
|
| +class WebTestThemeEngineMac : public blink::WebThemeEngine, public blink::WebNonCopyable {
|
| +public:
|
| + virtual ~WebTestThemeEngineMac() { }
|
|
|
| -struct WEBKIT_STORAGE_BROWSER_EXPORT Manifest {
|
| - Manifest();
|
| - ~Manifest();
|
| + virtual void paintScrollbarThumb(
|
| + blink::WebCanvas*,
|
| + blink::WebThemeEngine::State,
|
| + blink::WebThemeEngine::Size,
|
| + const blink::WebRect&,
|
| + const blink::WebThemeEngine::ScrollbarInfo&);
|
|
|
| - base::hash_set<std::string> explicit_urls;
|
| - NamespaceVector intercept_namespaces;
|
| - NamespaceVector fallback_namespaces;
|
| - NamespaceVector online_whitelist_namespaces;
|
| - bool online_whitelist_all;
|
| +private:
|
| + virtual void paintHIThemeScrollbarThumb(
|
| + blink::WebCanvas*,
|
| + blink::WebThemeEngine::State,
|
| + blink::WebThemeEngine::Size,
|
| + const blink::WebRect&,
|
| + const blink::WebThemeEngine::ScrollbarInfo&);
|
| + virtual void paintNSScrollerScrollbarThumb(
|
| + blink::WebCanvas*,
|
| + blink::WebThemeEngine::State,
|
| + blink::WebThemeEngine::Size,
|
| + const blink::WebRect&,
|
| + const blink::WebThemeEngine::ScrollbarInfo&);
|
| };
|
|
|
| -WEBKIT_STORAGE_BROWSER_EXPORT bool ParseManifest(const GURL& manifest_url,
|
| - const char* data,
|
| - int length,
|
| - Manifest& manifest);
|
| +}
|
|
|
| -} // namespace appcache
|
| -
|
| -#endif // WEBKIT_BROWSER_APPCACHE_MANIFEST_PARSER_H_
|
| +#endif // WebTestThemeEngineMac_h
|
|
|