| 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/browser/browser_plugin/browser_plugin_guest.h" | 5 #include "content/browser/browser_plugin/browser_plugin_guest.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
| (...skipping 1509 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1520 WebContents* source, const blink::WebGestureEvent& event) { | 1520 WebContents* source, const blink::WebGestureEvent& event) { |
| 1521 return event.type == blink::WebGestureEvent::GesturePinchBegin || | 1521 return event.type == blink::WebGestureEvent::GesturePinchBegin || |
| 1522 event.type == blink::WebGestureEvent::GesturePinchUpdate || | 1522 event.type == blink::WebGestureEvent::GesturePinchUpdate || |
| 1523 event.type == blink::WebGestureEvent::GesturePinchEnd; | 1523 event.type == blink::WebGestureEvent::GesturePinchEnd; |
| 1524 } | 1524 } |
| 1525 | 1525 |
| 1526 void BrowserPluginGuest::OnUpdateRect( | 1526 void BrowserPluginGuest::OnUpdateRect( |
| 1527 const ViewHostMsg_UpdateRect_Params& params) { | 1527 const ViewHostMsg_UpdateRect_Params& params) { |
| 1528 BrowserPluginMsg_UpdateRect_Params relay_params; | 1528 BrowserPluginMsg_UpdateRect_Params relay_params; |
| 1529 relay_params.view_size = params.view_size; | 1529 relay_params.view_size = params.view_size; |
| 1530 relay_params.scale_factor = params.scale_factor; | |
| 1531 relay_params.is_resize_ack = ViewHostMsg_UpdateRect_Flags::is_resize_ack( | 1530 relay_params.is_resize_ack = ViewHostMsg_UpdateRect_Flags::is_resize_ack( |
| 1532 params.flags); | 1531 params.flags); |
| 1533 relay_params.needs_ack = false; | 1532 relay_params.needs_ack = false; |
| 1534 | 1533 |
| 1535 bool size_changed = last_seen_view_size_ != params.view_size; | 1534 bool size_changed = last_seen_view_size_ != params.view_size; |
| 1536 gfx::Size old_size = last_seen_view_size_; | 1535 gfx::Size old_size = last_seen_view_size_; |
| 1537 last_seen_view_size_ = params.view_size; | 1536 last_seen_view_size_ = params.view_size; |
| 1538 | 1537 |
| 1539 if ((auto_size_enabled_ || last_seen_auto_size_enabled_) && | 1538 if ((auto_size_enabled_ || last_seen_auto_size_enabled_) && |
| 1540 size_changed && delegate_) { | 1539 size_changed && delegate_) { |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1581 const GURL& url) { | 1580 const GURL& url) { |
| 1582 if (!url.is_valid()) { | 1581 if (!url.is_valid()) { |
| 1583 callback.Run(false); | 1582 callback.Run(false); |
| 1584 return; | 1583 return; |
| 1585 } | 1584 } |
| 1586 | 1585 |
| 1587 delegate_->CanDownload(request_method, url, callback); | 1586 delegate_->CanDownload(request_method, url, callback); |
| 1588 } | 1587 } |
| 1589 | 1588 |
| 1590 } // namespace content | 1589 } // namespace content |
| OLD | NEW |