Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 5540 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5551 const WebString& base_url, | 5551 const WebString& base_url, |
| 5552 const WebString& url, | 5552 const WebString& url, |
| 5553 const WebString& title) { | 5553 const WebString& title) { |
| 5554 bool user_gesture = (webview()->focusedFrame() && | 5554 bool user_gesture = (webview()->focusedFrame() && |
| 5555 webview()->focusedFrame()->isProcessingUserGesture()); | 5555 webview()->focusedFrame()->isProcessingUserGesture()); |
| 5556 GURL base(base_url); | 5556 GURL base(base_url); |
| 5557 GURL absolute_url = base.Resolve(UTF16ToUTF8(url)); | 5557 GURL absolute_url = base.Resolve(UTF16ToUTF8(url)); |
| 5558 if (base.GetOrigin() != absolute_url.GetOrigin()) { | 5558 if (base.GetOrigin() != absolute_url.GetOrigin()) { |
| 5559 return; | 5559 return; |
| 5560 } | 5560 } |
| 5561 LOG(INFO) << "Got RPH in RenderViewImpl"; | |
|
koz (OOO until 15th September)
2012/06/21 01:50:53
Don't forget to remove this.
Greg Billock
2012/06/21 19:59:11
I won't. There looks like a race bug, at least on
koz (OOO until 15th September)
2012/06/21 23:03:50
That's strange. I wonder if something changed rece
Greg Billock
2012/06/21 23:10:59
Yes. It was happening when I was testing the user
koz (OOO until 15th September)
2012/06/22 00:41:14
I'm not sure why this would be failing. Recently t
Greg Billock
2012/06/22 19:45:40
Looks like this is a prerendering thing. Proper th
| |
| 5561 Send(new ViewHostMsg_RegisterProtocolHandler(routing_id_, | 5562 Send(new ViewHostMsg_RegisterProtocolHandler(routing_id_, |
| 5562 UTF16ToUTF8(scheme), | 5563 UTF16ToUTF8(scheme), |
| 5563 absolute_url, | 5564 absolute_url, |
| 5564 title, | 5565 title, |
| 5565 user_gesture)); | 5566 user_gesture)); |
| 5566 } | 5567 } |
| 5567 | 5568 |
| 5568 WebKit::WebPageVisibilityState RenderViewImpl::visibilityState() const { | 5569 WebKit::WebPageVisibilityState RenderViewImpl::visibilityState() const { |
| 5569 WebKit::WebPageVisibilityState current_state = is_hidden() ? | 5570 WebKit::WebPageVisibilityState current_state = is_hidden() ? |
| 5570 WebKit::WebPageVisibilityStateHidden : | 5571 WebKit::WebPageVisibilityStateHidden : |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5650 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 5651 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
| 5651 return !!RenderThreadImpl::current()->compositor_thread(); | 5652 return !!RenderThreadImpl::current()->compositor_thread(); |
| 5652 } | 5653 } |
| 5653 | 5654 |
| 5654 void RenderViewImpl::OnJavaBridgeInit() { | 5655 void RenderViewImpl::OnJavaBridgeInit() { |
| 5655 DCHECK(!java_bridge_dispatcher_); | 5656 DCHECK(!java_bridge_dispatcher_); |
| 5656 #if defined(ENABLE_JAVA_BRIDGE) | 5657 #if defined(ENABLE_JAVA_BRIDGE) |
| 5657 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); | 5658 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); |
| 5658 #endif | 5659 #endif |
| 5659 } | 5660 } |
| OLD | NEW |