Commit 2f01fbf0 authored by peter's avatar peter Committed by Commit bot

Small cleanups in the Mojo HTML viewer

This CL removes the "override" keyword from all Blink API implementations.
We don't use the keyword for the Blink API since it's in a different
repository, and it makes changes to the API much harder.

Additionally, clean up some minor camelCase -> under_score variables.

R=sky@chromium.org
BUG=

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

Cr-Commit-Position: refs/heads/master@{#325468}
parent 127d1038
...@@ -23,46 +23,46 @@ namespace html_viewer { ...@@ -23,46 +23,46 @@ namespace html_viewer {
class BlinkPlatformImpl : public blink::Platform { class BlinkPlatformImpl : public blink::Platform {
public: public:
explicit BlinkPlatformImpl(); explicit BlinkPlatformImpl();
~BlinkPlatformImpl() override; virtual ~BlinkPlatformImpl();
// blink::Platform methods: // blink::Platform methods:
blink::WebMimeRegistry* mimeRegistry() override; virtual blink::WebMimeRegistry* mimeRegistry();
blink::WebThemeEngine* themeEngine() override; virtual blink::WebThemeEngine* themeEngine();
blink::WebScheduler* scheduler() override; virtual blink::WebScheduler* scheduler();
blink::WebString defaultLocale() override; virtual blink::WebString defaultLocale();
double currentTime() override; virtual double currentTime();
double monotonicallyIncreasingTime() override; virtual double monotonicallyIncreasingTime();
void cryptographicallyRandomValues(unsigned char* buffer, virtual void cryptographicallyRandomValues(unsigned char* buffer,
size_t length) override; size_t length);
void setSharedTimerFiredFunction(void (*func)()) override; virtual void setSharedTimerFiredFunction(void (*func)());
void setSharedTimerFireInterval(double interval_seconds) override; virtual void setSharedTimerFireInterval(double interval_seconds);
void stopSharedTimer() override; virtual void stopSharedTimer();
virtual void callOnMainThread(void (*func)(void*), void* context); virtual void callOnMainThread(void (*func)(void*), void* context);
bool isThreadedCompositingEnabled() override; virtual bool isThreadedCompositingEnabled();
blink::WebCompositorSupport* compositorSupport() override; virtual blink::WebCompositorSupport* compositorSupport();
blink::WebURLLoader* createURLLoader() override; virtual blink::WebURLLoader* createURLLoader();
blink::WebSocketHandle* createWebSocketHandle() override; virtual blink::WebSocketHandle* createWebSocketHandle();
blink::WebString userAgent() override; virtual blink::WebString userAgent();
blink::WebData parseDataURL( virtual blink::WebData parseDataURL(
const blink::WebURL& url, blink::WebString& mime_type, const blink::WebURL& url, blink::WebString& mime_type,
blink::WebString& charset) override; blink::WebString& charset);
bool isReservedIPAddress(const blink::WebString& host) const override; virtual bool isReservedIPAddress(const blink::WebString& host) const;
blink::WebURLError cancelledError(const blink::WebURL& url) const override; virtual blink::WebURLError cancelledError(const blink::WebURL& url) const;
blink::WebThread* createThread(const char* name) override; virtual blink::WebThread* createThread(const char* name);
blink::WebThread* currentThread() override; virtual blink::WebThread* currentThread();
void yieldCurrentThread() override; virtual void yieldCurrentThread();
blink::WebWaitableEvent* createWaitableEvent() override; virtual blink::WebWaitableEvent* createWaitableEvent();
blink::WebWaitableEvent* waitMultipleEvents( virtual blink::WebWaitableEvent* waitMultipleEvents(
const blink::WebVector<blink::WebWaitableEvent*>& events) override; const blink::WebVector<blink::WebWaitableEvent*>& events);
blink::WebScrollbarBehavior* scrollbarBehavior() override; virtual blink::WebScrollbarBehavior* scrollbarBehavior();
const unsigned char* getTraceCategoryEnabledFlag( virtual const unsigned char* getTraceCategoryEnabledFlag(
const char* category_name) override; const char* category_name);
blink::WebData loadResource(const char* name) override; virtual blink::WebData loadResource(const char* name);
blink::WebGestureCurve* createFlingAnimationCurve( virtual blink::WebGestureCurve* createFlingAnimationCurve(
blink::WebGestureDevice device_source, blink::WebGestureDevice device_source,
const blink::WebFloatPoint& velocity, const blink::WebFloatPoint& velocity,
const blink::WebSize& cumulative_scroll) override; const blink::WebSize& cumulative_scroll);
blink::WebNotificationManager* notificationManager() override; virtual blink::WebNotificationManager* notificationManager();
private: private:
void SuspendSharedTimer(); void SuspendSharedTimer();
......
...@@ -76,7 +76,7 @@ class HTMLDocument : public blink::WebViewClient, ...@@ -76,7 +76,7 @@ class HTMLDocument : public blink::WebViewClient,
void UpdateWebviewSizeFromViewSize(); void UpdateWebviewSizeFromViewSize();
// WebViewClient methods: // WebViewClient methods:
blink::WebStorageNamespace* createSessionStorageNamespace() override; virtual blink::WebStorageNamespace* createSessionStorageNamespace();
// WebWidgetClient methods: // WebWidgetClient methods:
void initializeLayerTreeView() override; void initializeLayerTreeView() override;
...@@ -87,33 +87,33 @@ class HTMLDocument : public blink::WebViewClient, ...@@ -87,33 +87,33 @@ class HTMLDocument : public blink::WebViewClient,
blink::WebLocalFrame* frame, blink::WebLocalFrame* frame,
const blink::WebURL& url, const blink::WebURL& url,
blink::WebMediaPlayerClient* client); blink::WebMediaPlayerClient* client);
blink::WebMediaPlayer* createMediaPlayer( virtual blink::WebMediaPlayer* createMediaPlayer(
blink::WebLocalFrame* frame, blink::WebLocalFrame* frame,
const blink::WebURL& url, const blink::WebURL& url,
blink::WebMediaPlayerClient* client, blink::WebMediaPlayerClient* client,
blink::WebContentDecryptionModule* initial_cdm) override; blink::WebContentDecryptionModule* initial_cdm);
blink::WebFrame* createChildFrame( virtual blink::WebFrame* createChildFrame(
blink::WebLocalFrame* parent, blink::WebLocalFrame* parent,
const blink::WebString& frameName, const blink::WebString& frameName,
blink::WebSandboxFlags sandboxFlags) override; blink::WebSandboxFlags sandboxFlags);
void frameDetached(blink::WebFrame*) override; virtual void frameDetached(blink::WebFrame*);
blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame) override; virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame);
blink::WebNavigationPolicy decidePolicyForNavigation( virtual blink::WebNavigationPolicy decidePolicyForNavigation(
blink::WebLocalFrame* frame, blink::WebLocalFrame* frame,
blink::WebDataSource::ExtraData* data, blink::WebDataSource::ExtraData* data,
const blink::WebURLRequest& request, const blink::WebURLRequest& request,
blink::WebNavigationType nav_type, blink::WebNavigationType nav_type,
blink::WebNavigationPolicy default_policy, blink::WebNavigationPolicy default_policy,
bool isRedirect) override; bool isRedirect);
void didAddMessageToConsole(const blink::WebConsoleMessage& message, virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message,
const blink::WebString& source_name, const blink::WebString& source_name,
unsigned source_line, unsigned source_line,
const blink::WebString& stack_trace) override; const blink::WebString& stack_trace);
void didFinishLoad(blink::WebLocalFrame* frame) override; virtual void didFinishLoad(blink::WebLocalFrame* frame);
void didNavigateWithinPage(blink::WebLocalFrame* frame, virtual void didNavigateWithinPage(blink::WebLocalFrame* frame,
const blink::WebHistoryItem& history_item, const blink::WebHistoryItem& history_item,
blink::WebHistoryCommitType commit_type) override; blink::WebHistoryCommitType commit_type);
blink::WebEncryptedMediaClient* encryptedMediaClient() override; virtual blink::WebEncryptedMediaClient* encryptedMediaClient();
// ViewManagerDelegate methods: // ViewManagerDelegate methods:
void OnEmbed(mojo::View* root, void OnEmbed(mojo::View* root,
......
...@@ -25,8 +25,8 @@ class MojoBlinkPlatformImpl : public BlinkPlatformImpl { ...@@ -25,8 +25,8 @@ class MojoBlinkPlatformImpl : public BlinkPlatformImpl {
private: private:
// BlinkPlatform // BlinkPlatform
blink::WebCookieJar* cookieJar() override; virtual blink::WebCookieJar* cookieJar();
blink::WebClipboard* clipboard() override; virtual blink::WebClipboard* clipboard();
blink::WebURLLoader* createURLLoader() override; blink::WebURLLoader* createURLLoader() override;
blink::WebSocketHandle* createWebSocketHandle() override; blink::WebSocketHandle* createWebSocketHandle() override;
......
...@@ -19,8 +19,8 @@ class TestBlinkPlatformImpl : public BlinkPlatformImpl { ...@@ -19,8 +19,8 @@ class TestBlinkPlatformImpl : public BlinkPlatformImpl {
private: private:
// blink::Platform methods: // blink::Platform methods:
blink::WebCookieJar* cookieJar() override; virtual blink::WebCookieJar* cookieJar();
blink::WebClipboard* clipboard() override; virtual blink::WebClipboard* clipboard();
blink::WebClipboard clipboard_; blink::WebClipboard clipboard_;
blink::WebCookieJar cookie_jar_; blink::WebCookieJar cookie_jar_;
......
...@@ -100,7 +100,7 @@ bool WebClipboardImpl::isFormatAvailable(Format format, Buffer buffer) { ...@@ -100,7 +100,7 @@ bool WebClipboardImpl::isFormatAvailable(Format format, Buffer buffer) {
blink::WebVector<blink::WebString> WebClipboardImpl::readAvailableTypes( blink::WebVector<blink::WebString> WebClipboardImpl::readAvailableTypes(
Buffer buffer, Buffer buffer,
bool* containsFilenames) { bool* contains_filenames) {
Clipboard::Type clipboard_type = ConvertBufferType(buffer); Clipboard::Type clipboard_type = ConvertBufferType(buffer);
std::vector<std::string> types; std::vector<std::string> types;
...@@ -110,8 +110,8 @@ blink::WebVector<blink::WebString> WebClipboardImpl::readAvailableTypes( ...@@ -110,8 +110,8 @@ blink::WebVector<blink::WebString> WebClipboardImpl::readAvailableTypes(
// Force this to be synchronous. // Force this to be synchronous.
clipboard_.WaitForIncomingMethodCall(); clipboard_.WaitForIncomingMethodCall();
// AFAICT, every instance of setting containsFilenames is false. // AFAICT, every instance of setting contains_filenames is false.
*containsFilenames = false; *contains_filenames = false;
blink::WebVector<blink::WebString> output(types.size()); blink::WebVector<blink::WebString> output(types.size());
for (size_t i = 0; i < types.size(); ++i) { for (size_t i = 0; i < types.size(); ++i) {
...@@ -135,9 +135,9 @@ blink::WebString WebClipboardImpl::readPlainText(Buffer buffer) { ...@@ -135,9 +135,9 @@ blink::WebString WebClipboardImpl::readPlainText(Buffer buffer) {
} }
blink::WebString WebClipboardImpl::readHTML(Buffer buffer, blink::WebString WebClipboardImpl::readHTML(Buffer buffer,
blink::WebURL* pageURL, blink::WebURL* page_url,
unsigned* fragmentStart, unsigned* fragment_start,
unsigned* fragmentEnd) { unsigned* fragment_end) {
Clipboard::Type type = ConvertBufferType(buffer); Clipboard::Type type = ConvertBufferType(buffer);
blink::WebString html; blink::WebString html;
...@@ -145,11 +145,11 @@ blink::WebString WebClipboardImpl::readHTML(Buffer buffer, ...@@ -145,11 +145,11 @@ blink::WebString WebClipboardImpl::readHTML(Buffer buffer,
base::Bind(&CopyWebString, &html)); base::Bind(&CopyWebString, &html));
clipboard_.WaitForIncomingMethodCall(); clipboard_.WaitForIncomingMethodCall();
*fragmentStart = 0; *fragment_start = 0;
*fragmentEnd = static_cast<unsigned>(html.length()); *fragment_end = static_cast<unsigned>(html.length());
clipboard_->ReadMimeType(type, Clipboard::MIME_TYPE_URL, clipboard_->ReadMimeType(type, Clipboard::MIME_TYPE_URL,
base::Bind(&CopyURL, pageURL)); base::Bind(&CopyURL, page_url));
clipboard_.WaitForIncomingMethodCall(); clipboard_.WaitForIncomingMethodCall();
return html; return html;
...@@ -170,21 +170,21 @@ blink::WebString WebClipboardImpl::readCustomData( ...@@ -170,21 +170,21 @@ blink::WebString WebClipboardImpl::readCustomData(
return data; return data;
} }
void WebClipboardImpl::writePlainText(const blink::WebString& text) { void WebClipboardImpl::writePlainText(const blink::WebString& plain_text) {
Map<String, Array<uint8_t>> data; Map<String, Array<uint8_t>> data;
data[Clipboard::MIME_TYPE_TEXT] = Array<uint8_t>::From(text); data[Clipboard::MIME_TYPE_TEXT] = Array<uint8_t>::From(plain_text);
clipboard_->WriteClipboardData(Clipboard::TYPE_COPY_PASTE, data.Pass()); clipboard_->WriteClipboardData(Clipboard::TYPE_COPY_PASTE, data.Pass());
} }
void WebClipboardImpl::writeHTML(const blink::WebString& htmlText, void WebClipboardImpl::writeHTML(const blink::WebString& html_text,
const blink::WebURL& url, const blink::WebURL& source_url,
const blink::WebString& plainText, const blink::WebString& plain_text,
bool writeSmartPaste) { bool writeSmartPaste) {
Map<String, Array<uint8_t>> data; Map<String, Array<uint8_t>> data;
data[Clipboard::MIME_TYPE_TEXT] = Array<uint8_t>::From(plainText); data[Clipboard::MIME_TYPE_TEXT] = Array<uint8_t>::From(plain_text);
data[Clipboard::MIME_TYPE_HTML] = Array<uint8_t>::From(htmlText); data[Clipboard::MIME_TYPE_HTML] = Array<uint8_t>::From(html_text);
data[Clipboard::MIME_TYPE_URL] = Array<uint8_t>::From(url.string()); data[Clipboard::MIME_TYPE_URL] = Array<uint8_t>::From(source_url.string());
if (writeSmartPaste) if (writeSmartPaste)
data[kMimeTypeWebkitSmartPaste] = Array<uint8_t>::From(blink::WebString()); data[kMimeTypeWebkitSmartPaste] = Array<uint8_t>::From(blink::WebString());
......
...@@ -16,24 +16,24 @@ class WebClipboardImpl : public blink::WebClipboard { ...@@ -16,24 +16,24 @@ class WebClipboardImpl : public blink::WebClipboard {
virtual ~WebClipboardImpl(); virtual ~WebClipboardImpl();
// blink::WebClipboard methods: // blink::WebClipboard methods:
uint64_t sequenceNumber(Buffer) override; virtual uint64_t sequenceNumber(Buffer);
bool isFormatAvailable(Format, Buffer) override; virtual bool isFormatAvailable(Format, Buffer);
blink::WebVector<blink::WebString> readAvailableTypes( virtual blink::WebVector<blink::WebString> readAvailableTypes(
Buffer, Buffer buffer,
bool* containsFilenames) override; bool* contains_filenames);
blink::WebString readPlainText(Buffer) override; virtual blink::WebString readPlainText(Buffer buffer);
blink::WebString readHTML(Buffer buffer, virtual blink::WebString readHTML(Buffer buffer,
blink::WebURL* pageURL, blink::WebURL* page_url,
unsigned* fragmentStart, unsigned* fragment_start,
unsigned* fragmentEnd) override; unsigned* fragment_end);
// TODO(erg): readImage() // TODO(erg): readImage()
blink::WebString readCustomData(Buffer, virtual blink::WebString readCustomData(Buffer buffer,
const blink::WebString& type) override; const blink::WebString& type);
void writePlainText(const blink::WebString&) override; virtual void writePlainText(const blink::WebString& plain_text);
void writeHTML(const blink::WebString& htmlText, virtual void writeHTML(const blink::WebString& html_text,
const blink::WebURL&, const blink::WebURL& source_url,
const blink::WebString& plainText, const blink::WebString& plain_text,
bool writeSmartPaste) override; bool write_smart_paste);
private: private:
// Changes webkit buffers to mojo Clipboard::Types. // Changes webkit buffers to mojo Clipboard::Types.
......
...@@ -16,15 +16,15 @@ class WebCookieJarImpl : public blink::WebCookieJar { ...@@ -16,15 +16,15 @@ class WebCookieJarImpl : public blink::WebCookieJar {
virtual ~WebCookieJarImpl(); virtual ~WebCookieJarImpl();
// blink::WebCookieJar methods: // blink::WebCookieJar methods:
void setCookie(const blink::WebURL& url, virtual void setCookie(const blink::WebURL& url,
const blink::WebURL& first_party_for_cookies, const blink::WebURL& first_party_for_cookies,
const blink::WebString& cookie) override; const blink::WebString& cookie);
blink::WebString cookies( virtual blink::WebString cookies(
const blink::WebURL& url, const blink::WebURL& url,
const blink::WebURL& first_party_for_cookies) override; const blink::WebURL& first_party_for_cookies);
blink::WebString cookieRequestHeaderFieldValue( virtual blink::WebString cookieRequestHeaderFieldValue(
const blink::WebURL& url, const blink::WebURL& url,
const blink::WebURL& first_party_for_cookies) override; const blink::WebURL& first_party_for_cookies);
private: private:
mojo::CookieStorePtr store_; mojo::CookieStorePtr store_;
......
...@@ -72,45 +72,45 @@ class WebLayerTreeViewImpl : public blink::WebLayerTreeView, ...@@ -72,45 +72,45 @@ class WebLayerTreeViewImpl : public blink::WebLayerTreeView,
void RateLimitSharedMainThreadContext() override {} void RateLimitSharedMainThreadContext() override {}
// blink::WebLayerTreeView implementation. // blink::WebLayerTreeView implementation.
void setRootLayer(const blink::WebLayer& layer) override; virtual void setRootLayer(const blink::WebLayer& layer);
void clearRootLayer() override; virtual void clearRootLayer();
void setViewportSize(const blink::WebSize& device_viewport_size) override; virtual void setViewportSize(const blink::WebSize& device_viewport_size);
blink::WebSize deviceViewportSize() const override; virtual blink::WebSize deviceViewportSize() const;
void setDeviceScaleFactor(float) override; virtual void setDeviceScaleFactor(float);
float deviceScaleFactor() const override; virtual float deviceScaleFactor() const;
void setBackgroundColor(blink::WebColor color) override; virtual void setBackgroundColor(blink::WebColor color);
void setHasTransparentBackground(bool has_transparent_background) override; virtual void setHasTransparentBackground(bool has_transparent_background);
void setVisible(bool visible) override; virtual void setVisible(bool visible);
void setPageScaleFactorAndLimits(float page_scale_factor, virtual void setPageScaleFactorAndLimits(float page_scale_factor,
float minimum, float minimum,
float maximum) override; float maximum);
void startPageScaleAnimation(const blink::WebPoint& destination, virtual void startPageScaleAnimation(const blink::WebPoint& destination,
bool use_anchor, bool use_anchor,
float new_page_scale, float new_page_scale,
double duration_sec) override; double duration_sec);
void heuristicsForGpuRasterizationUpdated(bool matches_heuristic) override {} virtual void heuristicsForGpuRasterizationUpdated(bool matches_heuristic) {}
void setNeedsAnimate() override; virtual void setNeedsAnimate();
bool commitRequested() const override; virtual bool commitRequested() const;
void didStopFlinging() override {} virtual void didStopFlinging() {}
void compositeAndReadbackAsync( virtual void compositeAndReadbackAsync(
blink::WebCompositeAndReadbackAsyncCallback* callback) override {} blink::WebCompositeAndReadbackAsyncCallback* callback) {}
void finishAllRendering() override; virtual void finishAllRendering();
void setDeferCommits(bool defer_commits) override {} virtual void setDeferCommits(bool defer_commits) {}
void registerForAnimations(blink::WebLayer* layer) override; virtual void registerForAnimations(blink::WebLayer* layer);
void registerViewportLayers( virtual void registerViewportLayers(
const blink::WebLayer* overscrollElasticityLayer, const blink::WebLayer* overscrollElasticityLayer,
const blink::WebLayer* pageScaleLayerLayer, const blink::WebLayer* pageScaleLayerLayer,
const blink::WebLayer* innerViewportScrollLayer, const blink::WebLayer* innerViewportScrollLayer,
const blink::WebLayer* outerViewportScrollLayer) override; const blink::WebLayer* outerViewportScrollLayer);
void clearViewportLayers() override; virtual void clearViewportLayers();
void registerSelection(const blink::WebSelectionBound& start, virtual void registerSelection(const blink::WebSelectionBound& start,
const blink::WebSelectionBound& end) override {} const blink::WebSelectionBound& end) {}
void clearSelection() override {} virtual void clearSelection() {}
void setShowFPSCounter(bool) override {} virtual void setShowFPSCounter(bool) {}
void setShowPaintRects(bool) override {} virtual void setShowPaintRects(bool) {}
void setShowDebugBorders(bool) override {} virtual void setShowDebugBorders(bool) {}
void setContinuousPaintingEnabled(bool) override {} virtual void setContinuousPaintingEnabled(bool) {}
void setShowScrollBottleneckRects(bool) override {} virtual void setShowScrollBottleneckRects(bool) {}
// OutputSurfaceMojoClient implementation. // OutputSurfaceMojoClient implementation.
void DidCreateSurface(cc::SurfaceId id) override; void DidCreateSurface(cc::SurfaceId id) override;
......
...@@ -16,27 +16,27 @@ class WebMimeRegistryImpl : public blink::WebMimeRegistry { ...@@ -16,27 +16,27 @@ class WebMimeRegistryImpl : public blink::WebMimeRegistry {
virtual ~WebMimeRegistryImpl() {} virtual ~WebMimeRegistryImpl() {}
// WebMimeRegistry methods: // WebMimeRegistry methods:
blink::WebMimeRegistry::SupportsType supportsMIMEType( virtual blink::WebMimeRegistry::SupportsType supportsMIMEType(
const blink::WebString& mime_type) override; const blink::WebString& mime_type);
blink::WebMimeRegistry::SupportsType supportsImageMIMEType( virtual blink::WebMimeRegistry::SupportsType supportsImageMIMEType(
const blink::WebString& mime_type) override; const blink::WebString& mime_type);
blink::WebMimeRegistry::SupportsType supportsImagePrefixedMIMEType( virtual blink::WebMimeRegistry::SupportsType supportsImagePrefixedMIMEType(
const blink::WebString& mime_type) override; const blink::WebString& mime_type);
blink::WebMimeRegistry::SupportsType supportsJavaScriptMIMEType( virtual blink::WebMimeRegistry::SupportsType supportsJavaScriptMIMEType(
const blink::WebString& mime_type) override; const blink::WebString& mime_type);
blink::WebMimeRegistry::SupportsType supportsMediaMIMEType( virtual blink::WebMimeRegistry::SupportsType supportsMediaMIMEType(
const blink::WebString& mime_type, const blink::WebString& mime_type,
const blink::WebString& codecs, const blink::WebString& codecs,
const blink::WebString& key_system) override; const blink::WebString& key_system);
bool supportsMediaSourceMIMEType(const blink::WebString& mime_type, virtual bool supportsMediaSourceMIMEType(const blink::WebString& mime_type,
const blink::WebString& codecs) override; const blink::WebString& codecs);
blink::WebMimeRegistry::SupportsType supportsNonImageMIMEType( virtual blink::WebMimeRegistry::SupportsType supportsNonImageMIMEType(
const blink::WebString& mime_type) override; const blink::WebString& mime_type);
blink::WebString mimeTypeForExtension( virtual blink::WebString mimeTypeForExtension(
const blink::WebString& extension) override; const blink::WebString& extension);
blink::WebString wellKnownMimeTypeForExtension( virtual blink::WebString wellKnownMimeTypeForExtension(
const blink::WebString& extension) override; const blink::WebString& extension);
blink::WebString mimeTypeFromFile(const blink::WebString& path) override; virtual blink::WebString mimeTypeFromFile(const blink::WebString& path);
}; };
} // namespace html_viewer } // namespace html_viewer
......
...@@ -14,28 +14,28 @@ namespace html_viewer { ...@@ -14,28 +14,28 @@ namespace html_viewer {
class WebNotificationManagerImpl : public blink::WebNotificationManager { class WebNotificationManagerImpl : public blink::WebNotificationManager {
public: public:
WebNotificationManagerImpl(); WebNotificationManagerImpl();
~WebNotificationManagerImpl() override; virtual ~WebNotificationManagerImpl();
// blink::WebNotificationManager methods: // blink::WebNotificationManager methods:
void show(const blink::WebSerializedOrigin&, virtual void show(const blink::WebSerializedOrigin&,
const blink::WebNotificationData&, const blink::WebNotificationData&,
blink::WebNotificationDelegate*) override; blink::WebNotificationDelegate*);
void showPersistent(const blink::WebSerializedOrigin&, virtual void showPersistent(const blink::WebSerializedOrigin&,
const blink::WebNotificationData&, const blink::WebNotificationData&,
blink::WebServiceWorkerRegistration*, blink::WebServiceWorkerRegistration*,
blink::WebNotificationShowCallbacks*) override; blink::WebNotificationShowCallbacks*);
void getNotifications(const blink::WebString& filterTag, virtual void getNotifications(const blink::WebString& filterTag,
blink::WebServiceWorkerRegistration*, blink::WebServiceWorkerRegistration*,
blink::WebNotificationGetCallbacks*) override; blink::WebNotificationGetCallbacks*);
void close(blink::WebNotificationDelegate*) override; virtual void close(blink::WebNotificationDelegate*);
void closePersistent(const blink::WebSerializedOrigin&, virtual void closePersistent(const blink::WebSerializedOrigin&,
int64_t persistentNotificationId) override; int64_t persistentNotificationId);
void closePersistent(const blink::WebSerializedOrigin&, virtual void closePersistent(
const blink::WebString& persistentNotificationId) const blink::WebSerializedOrigin&,
override; const blink::WebString& persistentNotificationId);
void notifyDelegateDestroyed(blink::WebNotificationDelegate*) override; virtual void notifyDelegateDestroyed(blink::WebNotificationDelegate*);
blink::WebNotificationPermission checkPermission( virtual blink::WebNotificationPermission checkPermission(
const blink::WebSerializedOrigin&) override; const blink::WebSerializedOrigin&);
private: private:
DISALLOW_COPY_AND_ASSIGN(WebNotificationManagerImpl); DISALLOW_COPY_AND_ASSIGN(WebNotificationManagerImpl);
......
...@@ -15,14 +15,14 @@ class WebSchedulerImpl : public blink::WebScheduler { ...@@ -15,14 +15,14 @@ class WebSchedulerImpl : public blink::WebScheduler {
public: public:
explicit WebSchedulerImpl( explicit WebSchedulerImpl(
scoped_refptr<base::SingleThreadTaskRunner> task_runner); scoped_refptr<base::SingleThreadTaskRunner> task_runner);
~WebSchedulerImpl() override; virtual ~WebSchedulerImpl();
private: private:
// blink::WebScheduler overrides. // blink::WebScheduler overrides.
void postIdleTask(const blink::WebTraceLocation& location, virtual void postIdleTask(const blink::WebTraceLocation& location,
blink::WebThread::IdleTask* task) override; blink::WebThread::IdleTask* task);
void postLoadingTask(const blink::WebTraceLocation& location, virtual void postLoadingTask(const blink::WebTraceLocation& location,
blink::WebThread::Task* task) override; blink::WebThread::Task* task);
virtual void postTimerTask(const blink::WebTraceLocation& location, virtual void postTimerTask(const blink::WebTraceLocation& location,
blink::WebThread::Task* task, blink::WebThread::Task* task,
long long delayMs); long long delayMs);
......
...@@ -28,16 +28,16 @@ class WebSocketHandleImpl : public blink::WebSocketHandle { ...@@ -28,16 +28,16 @@ class WebSocketHandleImpl : public blink::WebSocketHandle {
private: private:
friend class WebSocketClientImpl; friend class WebSocketClientImpl;
~WebSocketHandleImpl() override; virtual ~WebSocketHandleImpl();
// blink::WebSocketHandle methods: // blink::WebSocketHandle methods:
void connect(const blink::WebURL& url, virtual void connect(const blink::WebURL& url,
const blink::WebVector<blink::WebString>& protocols, const blink::WebVector<blink::WebString>& protocols,
const blink::WebSerializedOrigin& origin, const blink::WebSerializedOrigin& origin,
blink::WebSocketHandleClient*) override; blink::WebSocketHandleClient*);
void send(bool fin, MessageType, const char* data, size_t size) override; virtual void send(bool fin, MessageType, const char* data, size_t size);
void flowControl(int64_t quota) override; virtual void flowControl(int64_t quota);
void close(unsigned short code, const blink::WebString& reason) override; virtual void close(unsigned short code, const blink::WebString& reason);
// Called when we finished writing to |send_stream_|. // Called when we finished writing to |send_stream_|.
void DidWriteToSendStream(bool fin, void DidWriteToSendStream(bool fin,
......
...@@ -15,12 +15,12 @@ class WebStorageNamespaceImpl : public blink::WebStorageNamespace { ...@@ -15,12 +15,12 @@ class WebStorageNamespaceImpl : public blink::WebStorageNamespace {
WebStorageNamespaceImpl(); WebStorageNamespaceImpl();
private: private:
~WebStorageNamespaceImpl() override; virtual ~WebStorageNamespaceImpl();
// blink::WebStorageNamespace methods: // blink::WebStorageNamespace methods:
blink::WebStorageArea* createStorageArea( virtual blink::WebStorageArea* createStorageArea(
const blink::WebString& origin) override; const blink::WebString& origin);
bool isSameNamespace(const blink::WebStorageNamespace&) const override; virtual bool isSameNamespace(const blink::WebStorageNamespace&) const;
DISALLOW_COPY_AND_ASSIGN(WebStorageNamespaceImpl); DISALLOW_COPY_AND_ASSIGN(WebStorageNamespaceImpl);
}; };
......
...@@ -12,12 +12,12 @@ namespace html_viewer { ...@@ -12,12 +12,12 @@ namespace html_viewer {
class WebThemeEngineImpl : public blink::WebThemeEngine { class WebThemeEngineImpl : public blink::WebThemeEngine {
public: public:
// WebThemeEngine methods: // WebThemeEngine methods:
blink::WebSize getSize(blink::WebThemeEngine::Part) override; virtual blink::WebSize getSize(blink::WebThemeEngine::Part);
void paint(blink::WebCanvas* canvas, virtual void paint(blink::WebCanvas* canvas,
blink::WebThemeEngine::Part part, blink::WebThemeEngine::Part part,
blink::WebThemeEngine::State state, blink::WebThemeEngine::State state,
const blink::WebRect& rect, const blink::WebRect& rect,
const blink::WebThemeEngine::ExtraParams* extra_params) override; const blink::WebThemeEngine::ExtraParams* extra_params);
virtual void paintStateTransition(blink::WebCanvas* canvas, virtual void paintStateTransition(blink::WebCanvas* canvas,
blink::WebThemeEngine::Part part, blink::WebThemeEngine::Part part,
blink::WebThemeEngine::State startState, blink::WebThemeEngine::State startState,
......
...@@ -15,12 +15,12 @@ namespace html_viewer { ...@@ -15,12 +15,12 @@ namespace html_viewer {
class WebThreadBase : public blink::WebThread { class WebThreadBase : public blink::WebThread {
public: public:
~WebThreadBase() override; virtual ~WebThreadBase();
void addTaskObserver(TaskObserver* observer) override; virtual void addTaskObserver(TaskObserver* observer);
void removeTaskObserver(TaskObserver* observer) override; virtual void removeTaskObserver(TaskObserver* observer);
bool isCurrentThread() const override = 0; virtual bool isCurrentThread() const = 0;
protected: protected:
WebThreadBase(); WebThreadBase();
...@@ -37,18 +37,18 @@ class WebThreadImpl : public WebThreadBase { ...@@ -37,18 +37,18 @@ class WebThreadImpl : public WebThreadBase {
explicit WebThreadImpl(const char* name); explicit WebThreadImpl(const char* name);
~WebThreadImpl() override; ~WebThreadImpl() override;
void postTask(const blink::WebTraceLocation& location, Task* task) override; virtual void postTask(const blink::WebTraceLocation& location, Task* task);
void postDelayedTask(const blink::WebTraceLocation& location, virtual void postDelayedTask(const blink::WebTraceLocation& location,
Task* task, Task* task,
long long delay_ms) override; long long delay_ms);
void enterRunLoop() override; virtual void enterRunLoop();
void exitRunLoop() override; virtual void exitRunLoop();
base::MessageLoop* message_loop() const { return thread_->message_loop(); } base::MessageLoop* message_loop() const { return thread_->message_loop(); }
bool isCurrentThread() const override; bool isCurrentThread() const override;
blink::PlatformThreadId threadId() const override; virtual blink::PlatformThreadId threadId() const;
private: private:
scoped_ptr<base::Thread> thread_; scoped_ptr<base::Thread> thread_;
...@@ -60,17 +60,17 @@ class WebThreadImplForMessageLoop : public WebThreadBase { ...@@ -60,17 +60,17 @@ class WebThreadImplForMessageLoop : public WebThreadBase {
base::MessageLoopProxy* message_loop); base::MessageLoopProxy* message_loop);
~WebThreadImplForMessageLoop() override; ~WebThreadImplForMessageLoop() override;
void postTask(const blink::WebTraceLocation& location, Task* task) override; virtual void postTask(const blink::WebTraceLocation& location, Task* task);
void postDelayedTask(const blink::WebTraceLocation& location, virtual void postDelayedTask(const blink::WebTraceLocation& location,
Task* task, Task* task,
long long delay_ms) override; long long delay_ms);
void enterRunLoop() override; virtual void enterRunLoop();
void exitRunLoop() override; virtual void exitRunLoop();
private: private:
bool isCurrentThread() const override; bool isCurrentThread() const override;
blink::PlatformThreadId threadId() const override; virtual blink::PlatformThreadId threadId() const;
scoped_refptr<base::MessageLoopProxy> message_loop_; scoped_refptr<base::MessageLoopProxy> message_loop_;
blink::PlatformThreadId thread_id_; blink::PlatformThreadId thread_id_;
......
...@@ -22,7 +22,7 @@ namespace html_viewer { ...@@ -22,7 +22,7 @@ namespace html_viewer {
class WebURLRequestExtraData : public blink::WebURLRequest::ExtraData { class WebURLRequestExtraData : public blink::WebURLRequest::ExtraData {
public: public:
WebURLRequestExtraData(); WebURLRequestExtraData();
~WebURLRequestExtraData() override; virtual ~WebURLRequestExtraData();
mojo::URLResponsePtr synthetic_response; mojo::URLResponsePtr synthetic_response;
}; };
...@@ -35,14 +35,14 @@ class WebURLLoaderImpl : public blink::WebURLLoader { ...@@ -35,14 +35,14 @@ class WebURLLoaderImpl : public blink::WebURLLoader {
virtual ~WebURLLoaderImpl(); virtual ~WebURLLoaderImpl();
// blink::WebURLLoader methods: // blink::WebURLLoader methods:
void loadSynchronously(const blink::WebURLRequest& request, virtual void loadSynchronously(const blink::WebURLRequest& request,
blink::WebURLResponse& response, blink::WebURLResponse& response,
blink::WebURLError& error, blink::WebURLError& error,
blink::WebData& data) override; blink::WebData& data);
void loadAsynchronously(const blink::WebURLRequest&, virtual void loadAsynchronously(const blink::WebURLRequest&,
blink::WebURLLoaderClient* client) override; blink::WebURLLoaderClient* client);
void cancel() override; virtual void cancel();
void setDefersLoading(bool defers_loading) override; virtual void setDefersLoading(bool defers_loading);
void OnReceivedResponse(const blink::WebURLRequest& request, void OnReceivedResponse(const blink::WebURLRequest& request,
mojo::URLResponsePtr response); mojo::URLResponsePtr response);
......
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