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

Side by Side Diff: Source/web/WebViewImpl.h

Issue 497723002: Merge willEnter/willExitFullScreen into didEnter/didExitFullScreen (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 public: 85 public:
86 static WebViewImpl* create(WebViewClient*); 86 static WebViewImpl* create(WebViewClient*);
87 87
88 // WebWidget methods: 88 // WebWidget methods:
89 virtual void close() OVERRIDE; 89 virtual void close() OVERRIDE;
90 virtual WebSize size() OVERRIDE; 90 virtual WebSize size() OVERRIDE;
91 virtual void willStartLiveResize() OVERRIDE; 91 virtual void willStartLiveResize() OVERRIDE;
92 virtual void resize(const WebSize&) OVERRIDE; 92 virtual void resize(const WebSize&) OVERRIDE;
93 virtual void resizePinchViewport(const WebSize&) OVERRIDE; 93 virtual void resizePinchViewport(const WebSize&) OVERRIDE;
94 virtual void willEndLiveResize() OVERRIDE; 94 virtual void willEndLiveResize() OVERRIDE;
95 virtual void willEnterFullScreen() OVERRIDE;
96 virtual void didEnterFullScreen() OVERRIDE; 95 virtual void didEnterFullScreen() OVERRIDE;
97 virtual void willExitFullScreen() OVERRIDE;
98 virtual void didExitFullScreen() OVERRIDE; 96 virtual void didExitFullScreen() OVERRIDE;
99 97
100 virtual void beginFrame(const WebBeginFrameArgs&) OVERRIDE; 98 virtual void beginFrame(const WebBeginFrameArgs&) OVERRIDE;
101 99
102 virtual void layout() OVERRIDE; 100 virtual void layout() OVERRIDE;
103 virtual void paint(WebCanvas*, const WebRect&) OVERRIDE; 101 virtual void paint(WebCanvas*, const WebRect&) OVERRIDE;
104 #if OS(ANDROID) 102 #if OS(ANDROID)
105 virtual void paintCompositedDeprecated(WebCanvas*, const WebRect&) OVERRIDE; 103 virtual void paintCompositedDeprecated(WebCanvas*, const WebRect&) OVERRIDE;
106 #endif 104 #endif
107 virtual void compositeAndReadbackAsync(WebCompositeAndReadbackAsyncCallback* ) OVERRIDE; 105 virtual void compositeAndReadbackAsync(WebCompositeAndReadbackAsyncCallback* ) OVERRIDE;
(...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after
717 bool m_userGestureObserved; 715 bool m_userGestureObserved;
718 }; 716 };
719 717
720 // We have no ways to check if the specified WebView is an instance of 718 // We have no ways to check if the specified WebView is an instance of
721 // WebViewImpl because WebViewImpl is the only implementation of WebView. 719 // WebViewImpl because WebViewImpl is the only implementation of WebView.
722 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true); 720 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true);
723 721
724 } // namespace blink 722 } // namespace blink
725 723
726 #endif 724 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698