diff options
| author | penghuang <penghuang@chromium.org> | 2015-07-20 08:00:01 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-20 15:00:35 +0000 |
| commit | aea37b678233dcd67eced879be71c7bed3dc9d1b (patch) | |
| tree | a300e1324fa0fd636219afbb89fe6714e3262608 /components | |
| parent | e4a3cfc149e8653899ddeed19312e04d58396c83 (diff) | |
| download | chromium_src-aea37b678233dcd67eced879be71c7bed3dc9d1b.zip chromium_src-aea37b678233dcd67eced879be71c7bed3dc9d1b.tar.gz chromium_src-aea37b678233dcd67eced879be71c7bed3dc9d1b.tar.bz2 | |
mandoline: Retrun the dummy GeolocationClientImpl to avoid crash for oopif.
i
BUG=None
Review URL: https://codereview.chromium.org/1242273003
Cr-Commit-Position: refs/heads/master@{#339448}
Diffstat (limited to 'components')
| -rw-r--r-- | components/html_viewer/frame.cc | 7 | ||||
| -rw-r--r-- | components/html_viewer/frame.h | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/components/html_viewer/frame.cc b/components/html_viewer/frame.cc index a9163f5..f9a17a4 100644 --- a/components/html_viewer/frame.cc +++ b/components/html_viewer/frame.cc @@ -15,6 +15,7 @@ #include "components/html_viewer/blink_input_events_type_converters.h" #include "components/html_viewer/blink_url_request_type_converters.h" #include "components/html_viewer/frame_tree_manager.h" +#include "components/html_viewer/geolocation_client_impl.h" #include "components/html_viewer/global_state.h" #include "components/html_viewer/media_factory.h" #include "components/html_viewer/touch_handler.h" @@ -467,6 +468,12 @@ void Frame::didNavigateWithinPage(blink::WebLocalFrame* frame, this, history_item.urlString().utf8()); } +blink::WebGeolocationClient* Frame::geolocationClient() { + if (!geolocation_client_impl_) + geolocation_client_impl_.reset(new GeolocationClientImpl); + return geolocation_client_impl_.get(); +} + blink::WebEncryptedMediaClient* Frame::encryptedMediaClient() { return global_state()->media_factory()->GetEncryptedMediaClient(); } diff --git a/components/html_viewer/frame.h b/components/html_viewer/frame.h index 01be353..68dedfc 100644 --- a/components/html_viewer/frame.h +++ b/components/html_viewer/frame.h @@ -30,6 +30,7 @@ class View; namespace html_viewer { class FrameTreeManager; +class GeolocationClientImpl; class TouchHandler; class WebLayerImpl; class WebLayerTreeViewImpl; @@ -158,6 +159,7 @@ class Frame : public blink::WebFrameClient, virtual void didNavigateWithinPage(blink::WebLocalFrame* frame, const blink::WebHistoryItem& history_item, blink::WebHistoryCommitType commit_type); + virtual blink::WebGeolocationClient* geolocationClient(); virtual blink::WebEncryptedMediaClient* encryptedMediaClient(); virtual void didStartLoading(bool to_different_document); virtual void didStopLoading(); @@ -185,6 +187,7 @@ class Frame : public blink::WebFrameClient, std::vector<Frame*> children_; blink::WebFrame* web_frame_; blink::WebWidget* web_widget_; + scoped_ptr<GeolocationClientImpl> geolocation_client_impl_; scoped_ptr<WebLayerTreeViewImpl> web_layer_tree_view_impl_; scoped_ptr<TouchHandler> touch_handler_; |