| 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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 WebLayerTreeView* layerTreeView() const { return m_layerTreeView; } | 158 WebLayerTreeView* layerTreeView() const { return m_layerTreeView; } |
| 159 | 159 |
| 160 // Returns true if the event leads to scrolling. | 160 // Returns true if the event leads to scrolling. |
| 161 static bool mapKeyCodeForScroll( | 161 static bool mapKeyCodeForScroll( |
| 162 int keyCode, | 162 int keyCode, |
| 163 ScrollDirection*, | 163 ScrollDirection*, |
| 164 ScrollGranularity*); | 164 ScrollGranularity*); |
| 165 | 165 |
| 166 Color baseBackgroundColor() const { return m_baseBackgroundColor; } | 166 Color baseBackgroundColor() const { return m_baseBackgroundColor; } |
| 167 | 167 |
| 168 HitTestResult coreHitTestResultAt(const WebPoint&); |
| 169 |
| 168 DECLARE_TRACE(); | 170 DECLARE_TRACE(); |
| 169 | 171 |
| 170 private: | 172 private: |
| 171 friend class WebFrameWidget; // For WebFrameWidget::create. | 173 friend class WebFrameWidget; // For WebFrameWidget::create. |
| 172 | 174 |
| 173 explicit WebFrameWidgetImpl(WebWidgetClient*, WebLocalFrame*); | 175 explicit WebFrameWidgetImpl(WebWidgetClient*, WebLocalFrame*); |
| 174 | 176 |
| 175 // Perform a hit test for a point relative to the root frame of the page. | 177 // Perform a hit test for a point relative to the root frame of the page. |
| 176 HitTestResult hitTestResultForRootFramePos(const IntPoint& posInRootFrame); | 178 HitTestResult hitTestResultForRootFramePos(const IntPoint& posInRootFrame); |
| 177 | 179 |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 253 WebColor m_baseBackgroundColor; | 255 WebColor m_baseBackgroundColor; |
| 254 | 256 |
| 255 SelfKeepAlive<WebFrameWidgetImpl> m_selfKeepAlive; | 257 SelfKeepAlive<WebFrameWidgetImpl> m_selfKeepAlive; |
| 256 }; | 258 }; |
| 257 | 259 |
| 258 DEFINE_TYPE_CASTS(WebFrameWidgetImpl, WebFrameWidgetBase, widget, widget->forSub
frame(), widget.forSubframe()); | 260 DEFINE_TYPE_CASTS(WebFrameWidgetImpl, WebFrameWidgetBase, widget, widget->forSub
frame(), widget.forSubframe()); |
| 259 | 261 |
| 260 } // namespace blink | 262 } // namespace blink |
| 261 | 263 |
| 262 #endif | 264 #endif |
| OLD | NEW |