| 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 1534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1545 WebLocalFrameImpl* frame = new WebLocalFrameImpl(client); | 1545 WebLocalFrameImpl* frame = new WebLocalFrameImpl(client); |
| 1546 #if ENABLE(OILPAN) | 1546 #if ENABLE(OILPAN) |
| 1547 return frame; | 1547 return frame; |
| 1548 #else | 1548 #else |
| 1549 return adoptRef(frame).leakRef(); | 1549 return adoptRef(frame).leakRef(); |
| 1550 #endif | 1550 #endif |
| 1551 } | 1551 } |
| 1552 | 1552 |
| 1553 WebLocalFrameImpl::WebLocalFrameImpl(WebFrameClient* client) | 1553 WebLocalFrameImpl::WebLocalFrameImpl(WebFrameClient* client) |
| 1554 : m_frameLoaderClientImpl(this) | 1554 : m_frameLoaderClientImpl(this) |
| 1555 , m_frameWidget(0) |
| 1555 , m_client(client) | 1556 , m_client(client) |
| 1556 , m_autofillClient(0) | 1557 , m_autofillClient(0) |
| 1557 , m_permissionClient(0) | 1558 , m_permissionClient(0) |
| 1558 , m_inputEventsScaleFactorForEmulation(1) | 1559 , m_inputEventsScaleFactorForEmulation(1) |
| 1559 , m_userMediaClientImpl(this) | 1560 , m_userMediaClientImpl(this) |
| 1560 , m_geolocationClientProxy(GeolocationClientProxy::create(client ? client->g
eolocationClient() : 0)) | 1561 , m_geolocationClientProxy(GeolocationClientProxy::create(client ? client->g
eolocationClient() : 0)) |
| 1561 #if ENABLE(OILPAN) | 1562 #if ENABLE(OILPAN) |
| 1562 , m_selfKeepAlive(this) | 1563 , m_selfKeepAlive(this) |
| 1563 #endif | 1564 #endif |
| 1564 { | 1565 { |
| (...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1994 } | 1995 } |
| 1995 | 1996 |
| 1996 void WebLocalFrameImpl::invalidateAll() const | 1997 void WebLocalFrameImpl::invalidateAll() const |
| 1997 { | 1998 { |
| 1998 ASSERT(frame() && frame()->view()); | 1999 ASSERT(frame() && frame()->view()); |
| 1999 FrameView* view = frame()->view(); | 2000 FrameView* view = frame()->view(); |
| 2000 view->invalidateRect(view->frameRect()); | 2001 view->invalidateRect(view->frameRect()); |
| 2001 invalidateScrollbar(); | 2002 invalidateScrollbar(); |
| 2002 } | 2003 } |
| 2003 | 2004 |
| 2005 void WebLocalFrameImpl::setFrameWidget(WebFrameWidgetImpl* frameWidget) |
| 2006 { |
| 2007 m_frameWidget = frameWidget; |
| 2008 } |
| 2009 |
| 2010 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() |
| 2011 { |
| 2012 return m_frameWidget; |
| 2013 } |
| 2014 |
| 2004 } // namespace blink | 2015 } // namespace blink |
| OLD | NEW |