← Back to branch summary

~chrisccoulson/oxide/lp1504853

« back to all changes in this revision

Viewing changes to patches/allow-per-url-user-agent-overrides.patch

Commit some additional fixes missed from r1223

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/allow-per-url-user-agent-overrides.patch
69
69
 blink::WebString RenderFrameImpl::userAgentOverride(
70
70
-    blink::WebLocalFrame* frame) {
71
71
+    blink::WebLocalFrame* frame,
72
 
+    const WebURL& url) {
 
72
+    const blink::WebURL& url) {
73
73
   DCHECK(!frame_ || frame_ == frame);
74
74
+  std::string user_agent_override_for_url =
75
75
+      GetContentClient()->renderer()->GetUserAgentOverrideForURL(
99
99
       blink::WebDOMMessageEvent event) override;
100
100
-  blink::WebString userAgentOverride(blink::WebLocalFrame* frame) override;
101
101
+  blink::WebString userAgentOverride(blink::WebLocalFrame* frame,
102
 
+                                     const WebURL& url) override;
 
102
+                                     const blink::WebURL& url) override;
103
103
   blink::WebString doNotTrackValue(blink::WebLocalFrame* frame) override;
104
104
   bool allowWebGL(blink::WebLocalFrame* frame, bool default_value) override;
105
105
   void didLoseWebGLContext(blink::WebLocalFrame* frame,
108
108
   bool isControlledByServiceWorker(blink::WebDataSource& data_source) override;
109
109
   int64_t serviceWorkerID(blink::WebDataSource& data_source) override;
110
110
   void postAccessibilityEvent(const blink::WebAXObject& obj,
 
111
diff --git a/third_party/WebKit/Source/core/loader/EmptyClients.h b/third_party/WebKit/Source/core/loader/EmptyClients.h
 
112
--- a/third_party/WebKit/Source/core/loader/EmptyClients.h
 
113
+++ b/third_party/WebKit/Source/core/loader/EmptyClients.h
 
114
@@ -215,17 +215,17 @@ public:
 
115
     void didStartLoading(LoadStartType) override {}
 
116
     void progressEstimateChanged(double) override {}
 
117
     void didStopLoading() override {}
 
118
 
 
119
     void loadURLExternally(const ResourceRequest&, NavigationPolicy, const String& = String()) override {}
 
120
 
 
121
     PassRefPtrWillBeRawPtr<DocumentLoader> createDocumentLoader(LocalFrame*, const ResourceRequest&, const SubstituteData&) override;
 
122
 
 
123
-    String userAgent() override { return ""; }
 
124
+    String userAgent(const KURL&) override { return ""; }
 
125
 
 
126
     String doNotTrackValue() override { return String(); }
 
127
 
 
128
     void transitionToCommittedForNewPage() override {}
 
129
 
 
130
     bool navigateBackForward(int offset) const override { return false; }
 
131
     void didDisplayInsecureContent() override {}
 
132
     void didRunInsecureContent(SecurityOrigin*, const KURL&) override {}
111
133
diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
112
134
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
113
135
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp