Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(327)

Side by Side Diff: chrome/renderer/render_view.cc

Issue 509016: Refactored code to allow associating workers with multiple renderers. (Closed)
Patch Set: Disabled overly-aggressive assertion in ResourceDispatcherHost. Created 10 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/common/render_messages_internal.h ('k') | chrome/renderer/websharedworker_proxy.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/renderer/render_view.h" 5 #include "chrome/renderer/render_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1898 matching lines...) Expand 10 before | Expand all | Expand 10 after
1909 return new WebWorkerProxy(client, RenderThread::current(), routing_id_); 1909 return new WebWorkerProxy(client, RenderThread::current(), routing_id_);
1910 } 1910 }
1911 1911
1912 WebSharedWorker* RenderView::createSharedWorker( 1912 WebSharedWorker* RenderView::createSharedWorker(
1913 WebFrame* frame, const WebURL& url, const WebString& name, 1913 WebFrame* frame, const WebURL& url, const WebString& name,
1914 unsigned long long document_id) { 1914 unsigned long long document_id) {
1915 1915
1916 int route_id = MSG_ROUTING_NONE; 1916 int route_id = MSG_ROUTING_NONE;
1917 bool url_mismatch = false; 1917 bool url_mismatch = false;
1918 Send(new ViewHostMsg_LookupSharedWorker( 1918 Send(new ViewHostMsg_LookupSharedWorker(
1919 url, name, document_id, &route_id, &url_mismatch)); 1919 url, name, document_id, routing_id_, &route_id, &url_mismatch));
1920 if (url_mismatch) { 1920 if (url_mismatch) {
1921 return NULL; 1921 return NULL;
1922 } else { 1922 } else {
1923 return new WebSharedWorkerProxy(RenderThread::current(), 1923 return new WebSharedWorkerProxy(RenderThread::current(),
1924 document_id,
1924 route_id, 1925 route_id,
1925 routing_id_); 1926 routing_id_);
1926 } 1927 }
1927 } 1928 }
1928 1929
1929 WebMediaPlayer* RenderView::createMediaPlayer( 1930 WebMediaPlayer* RenderView::createMediaPlayer(
1930 WebFrame* frame, WebMediaPlayerClient* client) { 1931 WebFrame* frame, WebMediaPlayerClient* client) {
1931 scoped_refptr<media::FilterFactoryCollection> factory = 1932 scoped_refptr<media::FilterFactoryCollection> factory =
1932 new media::FilterFactoryCollection(); 1933 new media::FilterFactoryCollection();
1933 // Add in any custom filter factories first. 1934 // Add in any custom filter factories first.
(...skipping 2097 matching lines...) Expand 10 before | Expand all | Expand 10 after
4031 new PluginMsg_SignalModalDialogEvent(host_window_)); 4032 new PluginMsg_SignalModalDialogEvent(host_window_));
4032 4033
4033 message->EnableMessagePumping(); // Runs a nested message loop. 4034 message->EnableMessagePumping(); // Runs a nested message loop.
4034 bool rv = Send(message); 4035 bool rv = Send(message);
4035 4036
4036 PluginChannelHost::Broadcast( 4037 PluginChannelHost::Broadcast(
4037 new PluginMsg_ResetModalDialogEvent(host_window_)); 4038 new PluginMsg_ResetModalDialogEvent(host_window_));
4038 4039
4039 return rv; 4040 return rv;
4040 } 4041 }
OLDNEW
« no previous file with comments | « chrome/common/render_messages_internal.h ('k') | chrome/renderer/websharedworker_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698