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

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

Issue 9969112: Merge 112991 - WebViewImpl doesn't notify the page that the user has canceled fullscreen. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 years, 8 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 | « no previous file | Source/WebKit/chromium/src/WebViewImpl.cpp » ('j') | 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) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 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 683 matching lines...) Expand 10 before | Expand all | Expand 10 after
694 #endif 694 #endif
695 695
696 // If set, the (plugin) node which has mouse capture. 696 // If set, the (plugin) node which has mouse capture.
697 RefPtr<WebCore::Node> m_mouseCaptureNode; 697 RefPtr<WebCore::Node> m_mouseCaptureNode;
698 698
699 // If set, the WebView is transitioning to fullscreen for this element. 699 // If set, the WebView is transitioning to fullscreen for this element.
700 RefPtr<WebCore::Element> m_provisionalFullScreenElement; 700 RefPtr<WebCore::Element> m_provisionalFullScreenElement;
701 701
702 // If set, the WebView is in fullscreen mode for an element in this frame. 702 // If set, the WebView is in fullscreen mode for an element in this frame.
703 RefPtr<WebCore::Frame> m_fullScreenFrame; 703 RefPtr<WebCore::Frame> m_fullScreenFrame;
704 bool m_isCancelingFullScreen;
704 705
705 #if USE(ACCELERATED_COMPOSITING) 706 #if USE(ACCELERATED_COMPOSITING)
706 WebCore::IntRect m_rootLayerScrollDamage; 707 WebCore::IntRect m_rootLayerScrollDamage;
707 OwnPtr<NonCompositedContentHost> m_nonCompositedContentHost; 708 OwnPtr<NonCompositedContentHost> m_nonCompositedContentHost;
708 WebLayerTreeView m_layerTreeView; 709 WebLayerTreeView m_layerTreeView;
709 WebLayer m_rootLayer; 710 WebLayer m_rootLayer;
710 WebCore::GraphicsLayer* m_rootGraphicsLayer; 711 WebCore::GraphicsLayer* m_rootGraphicsLayer;
711 bool m_isAcceleratedCompositingActive; 712 bool m_isAcceleratedCompositingActive;
712 bool m_compositorCreationFailed; 713 bool m_compositorCreationFailed;
713 // If true, the graphics context is being restored. 714 // If true, the graphics context is being restored.
(...skipping 16 matching lines...) Expand all
730 #endif 731 #endif
731 OwnPtr<WebCore::ActivePlatformGestureAnimation> m_gestureAnimation; 732 OwnPtr<WebCore::ActivePlatformGestureAnimation> m_gestureAnimation;
732 WebPoint m_lastWheelPosition; 733 WebPoint m_lastWheelPosition;
733 WebPoint m_lastWheelGlobalPosition; 734 WebPoint m_lastWheelGlobalPosition;
734 int m_flingModifier; 735 int m_flingModifier;
735 }; 736 };
736 737
737 } // namespace WebKit 738 } // namespace WebKit
738 739
739 #endif 740 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/WebKit/chromium/src/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698