Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(285)

Side by Side Diff: Source/WebKit/chromium/src/WebViewImpl.cpp

Issue 9384018: Merge 106401 (part of http://crbug.com/111266) - (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/WebKit/chromium/src/WebViewImpl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 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 1758 matching lines...) Expand 10 before | Expand all | Expand 10 after
1769 } 1769 }
1770 1770
1771 void WebViewImpl::didLosePointerLock() 1771 void WebViewImpl::didLosePointerLock()
1772 { 1772 {
1773 #if ENABLE(POINTER_LOCK) 1773 #if ENABLE(POINTER_LOCK)
1774 if (page()) 1774 if (page())
1775 page()->pointerLockController()->didLosePointerLock(); 1775 page()->pointerLockController()->didLosePointerLock();
1776 #endif 1776 #endif
1777 } 1777 }
1778 1778
1779 void WebViewImpl::didChangeWindowResizerRect()
1780 {
1781 if (mainFrameImpl()->frameView())
1782 mainFrameImpl()->frameView()->windowResizerRectChanged();
1783 }
1784
1779 // WebView -------------------------------------------------------------------- 1785 // WebView --------------------------------------------------------------------
1780 1786
1781 WebSettings* WebViewImpl::settings() 1787 WebSettings* WebViewImpl::settings()
1782 { 1788 {
1783 if (!m_webSettings) 1789 if (!m_webSettings)
1784 m_webSettings = adoptPtr(new WebSettingsImpl(m_page->settings())); 1790 m_webSettings = adoptPtr(new WebSettingsImpl(m_page->settings()));
1785 ASSERT(m_webSettings); 1791 ASSERT(m_webSettings);
1786 return m_webSettings.get(); 1792 return m_webSettings.get();
1787 } 1793 }
1788 1794
(...skipping 1431 matching lines...) Expand 10 before | Expand all | Expand 10 after
3220 const WebMouseEvent& mouseEvent = static_cast<const WebMouseEvent&>(event); 3226 const WebMouseEvent& mouseEvent = static_cast<const WebMouseEvent&>(event);
3221 3227
3222 if (page()) 3228 if (page())
3223 page()->pointerLockController()->dispatchLockedMouseEvent( 3229 page()->pointerLockController()->dispatchLockedMouseEvent(
3224 PlatformMouseEventBuilder(mainFrameImpl()->frameView(), mouseEvent), 3230 PlatformMouseEventBuilder(mainFrameImpl()->frameView(), mouseEvent),
3225 eventType); 3231 eventType);
3226 } 3232 }
3227 #endif 3233 #endif
3228 3234
3229 } // namespace WebKit 3235 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/WebViewImpl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698