| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 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 1539 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1550 WebLocalFrameImpl* frame = new WebLocalFrameImpl(client); | 1550 WebLocalFrameImpl* frame = new WebLocalFrameImpl(client); |
| 1551 #if ENABLE(OILPAN) | 1551 #if ENABLE(OILPAN) |
| 1552 return frame; | 1552 return frame; |
| 1553 #else | 1553 #else |
| 1554 return adoptRef(frame).leakRef(); | 1554 return adoptRef(frame).leakRef(); |
| 1555 #endif | 1555 #endif |
| 1556 } | 1556 } |
| 1557 | 1557 |
| 1558 WebLocalFrameImpl::WebLocalFrameImpl(WebFrameClient* client) | 1558 WebLocalFrameImpl::WebLocalFrameImpl(WebFrameClient* client) |
| 1559 : m_frameLoaderClientImpl(this) | 1559 : m_frameLoaderClientImpl(this) |
| 1560 , m_frameWidget(0) |
| 1560 , m_client(client) | 1561 , m_client(client) |
| 1561 , m_autofillClient(0) | 1562 , m_autofillClient(0) |
| 1562 , m_permissionClient(0) | 1563 , m_permissionClient(0) |
| 1563 , m_inputEventsScaleFactorForEmulation(1) | 1564 , m_inputEventsScaleFactorForEmulation(1) |
| 1564 , m_userMediaClientImpl(this) | 1565 , m_userMediaClientImpl(this) |
| 1565 , m_geolocationClientProxy(GeolocationClientProxy::create(client ? client->g
eolocationClient() : 0)) | 1566 , m_geolocationClientProxy(GeolocationClientProxy::create(client ? client->g
eolocationClient() : 0)) |
| 1566 #if ENABLE(OILPAN) | 1567 #if ENABLE(OILPAN) |
| 1567 , m_selfKeepAlive(this) | 1568 , m_selfKeepAlive(this) |
| 1568 #endif | 1569 #endif |
| 1569 { | 1570 { |
| (...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1999 } | 2000 } |
| 2000 | 2001 |
| 2001 void WebLocalFrameImpl::invalidateAll() const | 2002 void WebLocalFrameImpl::invalidateAll() const |
| 2002 { | 2003 { |
| 2003 ASSERT(frame() && frame()->view()); | 2004 ASSERT(frame() && frame()->view()); |
| 2004 FrameView* view = frame()->view(); | 2005 FrameView* view = frame()->view(); |
| 2005 view->invalidateRect(view->frameRect()); | 2006 view->invalidateRect(view->frameRect()); |
| 2006 invalidateScrollbar(); | 2007 invalidateScrollbar(); |
| 2007 } | 2008 } |
| 2008 | 2009 |
| 2010 void WebLocalFrameImpl::setFrameWidget(WebFrameWidgetImpl* frameWidget) |
| 2011 { |
| 2012 m_frameWidget = frameWidget; |
| 2013 } |
| 2014 |
| 2015 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const |
| 2016 { |
| 2017 return m_frameWidget; |
| 2018 } |
| 2019 |
| 2009 } // namespace blink | 2020 } // namespace blink |
| OLD | NEW |