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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 9773003: Apply fix for 117418 to M17. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/963/src/
Patch Set: Created 8 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « content/browser/renderer_host/render_view_host.cc ('k') | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 3755 matching lines...) Expand 10 before | Expand all | Expand 10 after
3766 WebString::fromUTF8(css), 3766 WebString::fromUTF8(css),
3767 WebDocument::UserStyleAuthorLevel); 3767 WebDocument::UserStyleAuthorLevel);
3768 } 3768 }
3769 3769
3770 void RenderViewImpl::OnAllowBindings(int enabled_bindings_flags) { 3770 void RenderViewImpl::OnAllowBindings(int enabled_bindings_flags) {
3771 enabled_bindings_ |= enabled_bindings_flags; 3771 enabled_bindings_ |= enabled_bindings_flags;
3772 } 3772 }
3773 3773
3774 void RenderViewImpl::OnSetWebUIProperty(const std::string& name, 3774 void RenderViewImpl::OnSetWebUIProperty(const std::string& name,
3775 const std::string& value) { 3775 const std::string& value) {
3776 DCHECK(enabled_bindings_ & content::BINDINGS_POLICY_WEB_UI); 3776 if (enabled_bindings_ & content::BINDINGS_POLICY_WEB_UI)
3777 GetWebUIBindings()->SetProperty(name, value); 3777 GetWebUIBindings()->SetProperty(name, value);
3778 else
3779 NOTREACHED() << "WebUI bindings not enabled.";
3778 } 3780 }
3779 3781
3780 void RenderViewImpl::OnDragTargetDragEnter(const WebDropData& drop_data, 3782 void RenderViewImpl::OnDragTargetDragEnter(const WebDropData& drop_data,
3781 const gfx::Point& client_point, 3783 const gfx::Point& client_point,
3782 const gfx::Point& screen_point, 3784 const gfx::Point& screen_point,
3783 WebDragOperationsMask ops) { 3785 WebDragOperationsMask ops) {
3784 WebDragOperation operation = webview()->dragTargetDragEnter( 3786 WebDragOperation operation = webview()->dragTargetDragEnter(
3785 drop_data.ToDragData(), 3787 drop_data.ToDragData(),
3786 client_point, 3788 client_point,
3787 screen_point, 3789 screen_point,
(...skipping 996 matching lines...) Expand 10 before | Expand all | Expand 10 after
4784 return !!RenderThreadImpl::current()->compositor_thread(); 4786 return !!RenderThreadImpl::current()->compositor_thread();
4785 } 4787 }
4786 4788
4787 void RenderViewImpl::OnJavaBridgeInit( 4789 void RenderViewImpl::OnJavaBridgeInit(
4788 const IPC::ChannelHandle& channel_handle) { 4790 const IPC::ChannelHandle& channel_handle) {
4789 DCHECK(!java_bridge_dispatcher_.get()); 4791 DCHECK(!java_bridge_dispatcher_.get());
4790 #if defined(ENABLE_JAVA_BRIDGE) 4792 #if defined(ENABLE_JAVA_BRIDGE)
4791 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); 4793 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle));
4792 #endif 4794 #endif
4793 } 4795 }
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_view_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698