OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2014 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
146 #else | 146 #else |
147 deref(); // Balances ref() acquired in WebFrameWidget::create | 147 deref(); // Balances ref() acquired in WebFrameWidget::create |
148 #endif | 148 #endif |
149 } | 149 } |
150 | 150 |
151 WebSize WebFrameWidgetImpl::size() | 151 WebSize WebFrameWidgetImpl::size() |
152 { | 152 { |
153 return m_size; | 153 return m_size; |
154 } | 154 } |
155 | 155 |
| 156 void WebFrameWidgetImpl::resize(const WebSize& newSize, float, bool) |
| 157 { |
| 158 // Widgets don't have top controls so ignore the top control params. |
| 159 resize(newSize); |
| 160 } |
| 161 |
156 void WebFrameWidgetImpl::resize(const WebSize& newSize) | 162 void WebFrameWidgetImpl::resize(const WebSize& newSize) |
157 { | 163 { |
158 if (m_size == newSize) | 164 if (m_size == newSize) |
159 return; | 165 return; |
160 | 166 |
161 FrameView* view = m_localRoot->frameView(); | 167 FrameView* view = m_localRoot->frameView(); |
162 if (!view) | 168 if (!view) |
163 return; | 169 return; |
164 | 170 |
165 m_size = newSize; | 171 m_size = newSize; |
(...skipping 931 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1097 | 1103 |
1098 HitTestResult WebFrameWidgetImpl::hitTestResultForRootFramePos(const IntPoint& p
osInRootFrame) | 1104 HitTestResult WebFrameWidgetImpl::hitTestResultForRootFramePos(const IntPoint& p
osInRootFrame) |
1099 { | 1105 { |
1100 IntPoint docPoint(m_localRoot->frame()->view()->rootFrameToContents(posInRoo
tFrame)); | 1106 IntPoint docPoint(m_localRoot->frame()->view()->rootFrameToContents(posInRoo
tFrame)); |
1101 HitTestResult result = m_localRoot->frame()->eventHandler().hitTestResultAtP
oint(docPoint, HitTestRequest::ReadOnly | HitTestRequest::Active); | 1107 HitTestResult result = m_localRoot->frame()->eventHandler().hitTestResultAtP
oint(docPoint, HitTestRequest::ReadOnly | HitTestRequest::Active); |
1102 result.setToShadowHostIfInUserAgentShadowRoot(); | 1108 result.setToShadowHostIfInUserAgentShadowRoot(); |
1103 return result; | 1109 return result; |
1104 } | 1110 } |
1105 | 1111 |
1106 } // namespace blink | 1112 } // namespace blink |
OLD | NEW |