Changeset 73539 in webkit
- Timestamp:
- Dec 8, 2010 12:29:03 PM (13 years ago)
- Location:
- trunk/WebKit/gtk
- Files:
-
- 1 added
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/gtk/ChangeLog
r73535 r73539 47 47 * webkit/webkitprivate.h: 48 48 * webkit/webkitwebframe.cpp: 49 50 2010-12-08 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> 51 52 Reviewed by Martin Robinson. 53 54 [GTK] Split webkitprivate.{cpp,h} in more manageable chunks 55 https://bugs.webkit.org/show_bug.cgi?id=50698 56 57 Split private bits of WebKitWebView to its own private header, and 58 to its implementation file. Take the opportunity to fix includes 59 sorting to comply with the style guide. 60 61 * WebCoreSupport/ChromeClientGtk.cpp: 62 (WebKit::ChromeClient::enterFullscreenForNode): 63 (WebKit::ChromeClient::exitFullscreenForNode): 64 * WebCoreSupport/ContextMenuClientGtk.cpp: 65 * WebCoreSupport/DragClientGtk.cpp: 66 * WebCoreSupport/DumpRenderTreeSupportGtk.cpp: 67 * WebCoreSupport/EditorClientGtk.cpp: 68 * WebCoreSupport/FrameLoaderClientGtk.cpp: 69 * WebCoreSupport/InspectorClientGtk.cpp: 70 * WebCoreSupport/PasteboardHelperGtk.cpp: 71 * webkit/webkitprivate.cpp: 72 (webkit_init): 73 * webkit/webkitprivate.h: 74 * webkit/webkitwebbackforwardlist.cpp: 75 * webkit/webkitwebdatasource.cpp: 76 * webkit/webkitwebframe.cpp: 77 * webkit/webkitwebview.cpp: 78 (WebKit::core): 79 (WebKit::kit): 80 (WebKit::webViewEnterFullscreen): 81 (WebKit::webViewExitFullscreen): 82 * webkit/webkitwebviewprivate.h: Added. 49 83 50 84 2010-12-08 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> -
trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
r72909 r73539 28 28 #include "DumpRenderTreeSupportGtk.h" 29 29 #include "Element.h" 30 #include "FileChooser.h" 30 31 #include "FileSystem.h" 31 #include "FileChooser.h"32 32 #include "FloatRect.h" 33 33 #include "FrameLoadRequest.h" … … 35 35 #include "GtkVersioning.h" 36 36 #include "HTMLNames.h" 37 #include "IntRect.h"38 37 #include "HitTestResult.h" 39 38 #include "Icon.h" 39 #include "IntRect.h" 40 40 #include "KURL.h" 41 41 #include "NavigationAction.h" 42 #include "NotImplemented.h" 42 43 #include "PlatformString.h" 43 44 #include "PopupMenuClient.h" … … 45 46 #include "SearchPopupMenuGtk.h" 46 47 #include "SecurityOrigin.h" 48 #include "WindowFeatures.h" 47 49 #include "webkitgeolocationpolicydecision.h" 48 #include "webkitwebview.h"49 50 #include "webkitnetworkrequest.h" 50 51 #include "webkitprivate.h" 51 #include "NotImplemented.h" 52 #include "WindowFeatures.h" 52 #include "webkitwebview.h" 53 #include "webkitwebviewprivate.h" 54 #include <glib.h> 55 #include <glib/gi18n-lib.h> 56 #include <gtk/gtk.h> 57 #include <wtf/text/CString.h> 58 53 59 #if ENABLE(DATABASE) 54 60 #include "DatabaseTracker.h" 55 61 #endif 56 #include <wtf/text/CString.h>57 58 #include <glib.h>59 #include <glib/gi18n-lib.h>60 #include <gtk/gtk.h>61 62 62 63 using namespace WebCore; … … 669 670 WebKitWebFrame* webFrame = kit(frame); 670 671 WebKitWebView* webView = getViewFromFrame(webFrame); 671 web kitWebViewEnterFullscreen(webView, node);672 webViewEnterFullscreen(webView, node); 672 673 } 673 674 … … 677 678 WebKitWebFrame* webFrame = kit(frame); 678 679 WebKitWebView* webView = getViewFromFrame(webFrame); 679 web kitWebViewExitFullscreen(webView);680 webViewExitFullscreen(webView); 680 681 } 681 682 #endif -
trunk/WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp
r73535 r73539 19 19 20 20 #include "config.h" 21 #include "ContextMenuClientGtk.h" 22 21 23 #include "ContextMenu.h" 22 #include "ContextMenuClientGtk.h"23 24 #include "ContextMenuController.h" 24 25 25 #include "HitTestResult.h" 26 26 #include "KURL.h" 27 27 #include "NotImplemented.h" 28 28 #include "Page.h" 29 #include "webkitprivate.h" 30 #include "webkitwebviewprivate.h" 31 #include <glib-object.h> 32 #include <glib/gi18n-lib.h> 33 #include <gtk/gtk.h> 29 34 #include <wtf/text/CString.h> 30 31 #include <glib/gi18n-lib.h>32 #include <glib-object.h>33 #include <gtk/gtk.h>34 #include "webkitprivate.h"35 35 36 36 using namespace WebCore; -
trunk/WebKit/gtk/WebCoreSupport/DragClientGtk.cpp
r71204 r73539 34 34 #include "RenderObject.h" 35 35 #include "webkitprivate.h" 36 #include "webkitwebviewprivate.h" 36 37 #include "webkitwebview.h" 37 38 #include <gdk/gdk.h> -
trunk/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
r73527 r73539 48 48 #endif 49 49 #include "webkitprivate.h" 50 #include "webkitwebviewprivate.h" 50 51 #include "webkitwebview.h" 51 52 #include "webkitwebframe.h" -
trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp
r73088 r73539 47 47 #include "webkitmarshal.h" 48 48 #include "webkitprivate.h" 49 #include "webkitwebviewprivate.h" 49 50 #include <wtf/text/CString.h> 50 51 -
trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
r73455 r73539 35 35 #include "FrameLoader.h" 36 36 #include "FrameNetworkingContextGtk.h" 37 #include "FrameTree.h" 37 38 #include "FrameView.h" 38 #include "FrameTree.h"39 39 #include "GOwnPtr.h" 40 40 #include "GRefPtr.h" … … 46 46 #include "HTMLNames.h" 47 47 #include "HTMLPlugInElement.h" 48 #include "JSDOMBinding.h" 48 49 #include "JSDOMWindow.h" 49 50 #include "Language.h" … … 53 54 #include "Page.h" 54 55 #include "PluginDatabase.h" 56 #include "ProgressTracker.h" 55 57 #include "RenderPart.h" 56 58 #include "ResourceHandle.h" 57 59 #include "ResourceRequest.h" 58 #include "ProgressTracker.h"59 #include "JSDOMBinding.h"60 60 #include "ScriptController.h" 61 61 #include "webkiterror.h" … … 67 67 #include "webkitwebpolicydecision.h" 68 68 #include "webkitwebview.h" 69 #include <wtf/text/CString.h> 70 #include <wtf/text/StringConcatenate.h> 71 69 #include "webkitwebviewprivate.h" 72 70 #include <JavaScriptCore/APICast.h> 73 71 #include <gio/gio.h> … … 75 73 #include <glib/gi18n-lib.h> 76 74 #include <stdio.h> 75 #include <wtf/text/CString.h> 76 #include <wtf/text/StringConcatenate.h> 77 77 78 78 using namespace WebCore; -
trunk/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
r71604 r73539 22 22 23 23 #include "Frame.h" 24 #include "webkitwebview.h"25 #include "webkitwebinspector.h"26 #include "webkitprivate.h"27 #include "webkitversion.h"28 24 #include "InspectorController.h" 29 25 #include "NotImplemented.h" 30 26 #include "PlatformString.h" 27 #include "webkitprivate.h" 28 #include "webkitversion.h" 29 #include "webkitwebinspector.h" 30 #include "webkitwebview.h" 31 #include "webkitwebviewprivate.h" 31 32 #include <wtf/text/CString.h> 32 33 -
trunk/WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp
r57901 r73539 25 25 #include "FocusController.h" 26 26 #include "Frame.h" 27 #include <gtk/gtk.h>28 27 #include "webkitwebframe.h" 29 28 #include "webkitwebview.h" 30 #include "webkitprivate.h" 29 #include "webkitwebviewprivate.h" 30 #include <gtk/gtk.h> 31 31 32 32 using namespace WebCore; -
trunk/WebKit/gtk/webkit/webkitprivate.cpp
r73353 r73539 91 91 } 92 92 93 WebCore::Page* core(WebKitWebView* webView)94 {95 if (!webView)96 return 0;97 98 WebKitWebViewPrivate* priv = webView->priv;99 return priv ? priv->corePage : 0;100 }101 102 WebKitWebView* kit(WebCore::Page* corePage)103 {104 if (!corePage)105 return 0;106 107 ASSERT(corePage->chrome());108 WebKit::ChromeClient* client = static_cast<WebKit::ChromeClient*>(corePage->chrome()->client());109 return client ? client->webView() : 0;110 }111 112 93 WebKitWebNavigationReason kit(WebCore::NavigationType type) 113 94 { … … 317 298 soup_session_add_feature_by_type(session, SOUP_TYPE_CONTENT_DECODER); 318 299 } 319 320 void webkitWebViewEnterFullscreen(WebKitWebView* webView, Node* node)321 {322 if (!node->hasTagName(HTMLNames::videoTag))323 return;324 325 #if ENABLE(VIDEO)326 HTMLMediaElement* videoElement = static_cast<HTMLMediaElement*>(node);327 WebKitWebViewPrivate* priv = webView->priv;328 329 // First exit Fullscreen for the old mediaElement.330 if (priv->fullscreenVideoController)331 priv->fullscreenVideoController->exitFullscreen();332 333 priv->fullscreenVideoController = new FullscreenVideoController;334 priv->fullscreenVideoController->setMediaElement(videoElement);335 priv->fullscreenVideoController->enterFullscreen();336 #endif337 }338 339 void webkitWebViewExitFullscreen(WebKitWebView* webView)340 {341 #if ENABLE(VIDEO)342 WebKitWebViewPrivate* priv = webView->priv;343 if (priv->fullscreenVideoController)344 priv->fullscreenVideoController->exitFullscreen();345 #endif346 }347 -
trunk/WebKit/gtk/webkit/webkitprivate.h
r73527 r73539 58 58 #include "IntRect.h" 59 59 #include "FrameLoaderClient.h" 60 #include "FullscreenVideoController.h"61 60 #include "Node.h" 62 61 #include "Page.h" … … 88 87 WebKitWebFrame* kit(WebCore::Frame*); 89 88 90 WebCore::Page* core(WebKitWebView*);91 WebKitWebView* kit(WebCore::Page*);92 93 89 WebCore::HistoryItem* core(WebKitWebHistoryItem*); 94 90 WebKitWebHistoryItem* kit(PassRefPtr<WebCore::HistoryItem>); … … 111 107 112 108 PasteboardHelperGtk* pasteboardHelperInstance(); 113 114 typedef struct DroppingContext_ {115 WebKitWebView* webView;116 GdkDragContext* gdkContext;117 RefPtr<WebCore::DataObjectGtk> dataObject;118 WebCore::IntPoint lastMotionPosition;119 int pendingDataRequests;120 bool dropHappened;121 } DroppingContext;122 109 } 123 110 … … 131 118 #define WEBKIT_PARAM_READABLE ((GParamFlags)(G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB)) 132 119 #define WEBKIT_PARAM_READWRITE ((GParamFlags)(G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB)) 133 134 #define WEBKIT_WEB_VIEW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_VIEW, WebKitWebViewPrivate))135 typedef struct _WebKitWebViewPrivate WebKitWebViewPrivate;136 struct _WebKitWebViewPrivate {137 WebCore::Page* corePage;138 PlatformRefPtr<WebKitWebSettings> webSettings;139 PlatformRefPtr<WebKitWebInspector> webInspector;140 PlatformRefPtr<WebKitWebWindowFeatures> webWindowFeatures;141 142 WebKitWebFrame* mainFrame;143 PlatformRefPtr<WebKitWebBackForwardList> backForwardList;144 145 PlatformRefPtr<GtkMenu> currentMenu;146 gint lastPopupXPosition;147 gint lastPopupYPosition;148 149 HashSet<GtkWidget*> children;150 bool editable;151 PlatformRefPtr<GtkIMContext> imContext;152 153 gboolean transparent;154 155 PlatformRefPtr<GtkAdjustment> horizontalAdjustment;156 PlatformRefPtr<GtkAdjustment> verticalAdjustment;157 158 #ifndef GTK_API_VERSION_2159 // GtkScrollablePolicy needs to be checked when160 // driving the scrollable adjustment values161 GtkScrollablePolicy horizontalScrollingPolicy;162 GtkScrollablePolicy verticalScrollingPolicy;163 #endif164 165 gboolean zoomFullContent;166 WebKitLoadStatus loadStatus;167 CString encoding;168 CString customEncoding;169 170 CString iconURI;171 172 gboolean disposing;173 gboolean usePrimaryForPaste;174 175 #if ENABLE(VIDEO)176 FullscreenVideoController* fullscreenVideoController;177 #endif178 179 // These are hosted here because the DataSource object is180 // created too late in the frame loading process.181 PlatformRefPtr<WebKitWebResource> mainResource;182 CString mainResourceIdentifier;183 PlatformRefPtr<GHashTable> subResources;184 CString tooltipText;185 WebCore::IntRect tooltipArea;186 187 int currentClickCount;188 WebCore::IntPoint previousClickPoint;189 guint previousClickButton;190 guint32 previousClickTime;191 HashMap<GdkDragContext*, RefPtr<WebCore::DataObjectGtk> > draggingDataObjects;192 HashMap<GdkDragContext*, WebKit::DroppingContext*> droppingContexts;193 };194 120 195 121 #define WEBKIT_WEB_FRAME_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_FRAME, WebKitWebFramePrivate)) … … 272 198 webkit_web_window_features_new_from_core_features (const WebCore::WindowFeatures& features); 273 199 274 void275 webkit_web_view_notify_ready (WebKitWebView* web_view);276 277 void278 webkit_web_view_request_download(WebKitWebView* web_view, WebKitNetworkRequest* request, const WebCore::ResourceResponse& response = WebCore::ResourceResponse(), WebCore::ResourceHandle* handle = 0);279 280 void281 webkit_web_view_add_resource(WebKitWebView*, const char*, WebKitWebResource*);282 283 void284 webkit_web_view_add_main_resource(WebKitWebView*, const char*, WebKitWebResource*);285 286 void287 webkit_web_view_remove_resource(WebKitWebView*, const char*);288 289 WebKitWebResource*290 webkit_web_view_get_resource(WebKitWebView*, char*);291 292 WebKitWebResource*293 webkit_web_view_get_main_resource(WebKitWebView*);294 295 void296 webkit_web_view_clear_resources(WebKitWebView*);297 298 GList*299 webkit_web_view_get_subresources(WebKitWebView*);300 301 void302 webkit_web_view_set_tooltip_text(WebKitWebView*, const char*);303 304 GtkMenu*305 webkit_web_view_get_context_menu(WebKitWebView*);306 307 200 WebKitDownload* 308 201 webkit_download_new_with_handle(WebKitNetworkRequest* request, WebCore::ResourceHandle* handle, const WebCore::ResourceResponse& response); … … 336 229 // FIXME: Move these to webkitwebframe.h once their API has been discussed. 337 230 338 WEBKIT_API gchar*339 webkit_web_view_get_selected_text (WebKitWebView* web_view);340 341 231 WEBKIT_API void 342 232 webkit_web_settings_add_extra_plugin_directory (WebKitWebView *web_view, const gchar* directory); … … 344 234 GSList* 345 235 webkit_web_settings_get_enchant_dicts(WebKitWebView* web_view); 346 347 bool348 webkit_web_view_use_primary_for_paste(WebKitWebView* web_view);349 236 350 237 GHashTable* … … 364 251 webkit_security_origin_get_web_database(WebKitSecurityOrigin* securityOrigin, const char* databaseName); 365 252 366 void webkitWebViewEnterFullscreen(WebKitWebView* webView, WebCore::Node* node);367 void webkitWebViewExitFullscreen(WebKitWebView* webView);253 WEBKIT_API void 254 webkit_web_frame_layout(WebKitWebFrame* frame); 368 255 } 369 256 -
trunk/WebKit/gtk/webkit/webkitwebbackforwardlist.cpp
r70955 r73539 27 27 #include "webkitwebhistoryitem.h" 28 28 #include "webkitwebview.h" 29 #include "webkitwebviewprivate.h" 29 30 #include <glib.h> 30 31 -
trunk/WebKit/gtk/webkit/webkitwebdatasource.cpp
r73006 r73539 23 23 #include "ArchiveResource.h" 24 24 #include "DocumentLoaderGtk.h" 25 #include "FrameLoader.h" 25 26 #include "FrameLoaderClientGtk.h" 26 #include "FrameLoader.h"27 27 #include "KURL.h" 28 28 #include "PlatformString.h" 29 29 #include "ResourceRequest.h" 30 #include "runtime/InitializeThreading.h"31 30 #include "SharedBuffer.h" 32 31 #include "SubstituteData.h" 32 #include "runtime/InitializeThreading.h" 33 #include "webkitprivate.h" 33 34 #include "webkitwebresource.h" 34 #include "webkit private.h"35 #include "webkitwebviewprivate.h" 35 36 #include "wtf/Assertions.h" 36 37 37 #include <glib.h> 38 38 -
trunk/WebKit/gtk/webkit/webkitwebframe.cpp
r73527 r73539 26 26 27 27 #include "config.h" 28 29 #include "webkitenumtypes.h"30 28 #include "webkitwebframe.h" 31 #include "webkitwebview.h" 32 #include "webkitmarshal.h" 33 #include "webkitprivate.h" 34 29 30 #include "AXObjectCache.h" 35 31 #include "AccessibilityObjectWrapperAtk.h" 36 32 #include "AnimationController.h" 37 #include "AXObjectCache.h"38 33 #include "DOMObjectCache.h" 39 34 #include "DocumentLoader.h" … … 43 38 #include "FrameTree.h" 44 39 #include "FrameView.h" 45 #include <glib/gi18n-lib.h>46 40 #include "GCController.h" 47 41 #include "GraphicsContext.h" 48 42 #include "GtkVersioning.h" 49 43 #include "HTMLFrameOwnerElement.h" 44 #include "JSDOMBinding.h" 45 #include "JSDOMWindow.h" 50 46 #include "JSElement.h" 51 47 #include "PrintContext.h" 52 48 #include "RenderListItem.h" 49 #include "RenderTreeAsText.h" 53 50 #include "RenderView.h" 54 #include "RenderTreeAsText.h"55 #include "JSDOMBinding.h"56 51 #include "ScriptController.h" 57 52 #include "SubstituteData.h" 53 #include "webkitenumtypes.h" 54 #include "webkitmarshal.h" 55 #include "webkitprivate.h" 56 #include "webkitwebview.h" 57 #include "webkitwebviewprivate.h" 58 #include <JavaScriptCore/APICast.h> 59 #include <atk/atk.h> 60 #include <glib/gi18n-lib.h> 61 #include <wtf/text/CString.h> 62 58 63 #if ENABLE(SVG) 59 64 #include "SVGSMILElement.h" 60 65 #endif 61 62 #include <atk/atk.h>63 #include <JavaScriptCore/APICast.h>64 #include <wtf/text/CString.h>65 66 66 67 /** -
trunk/WebKit/gtk/webkit/webkitwebview.cpp
r73534 r73539 30 30 #include "webkitwebview.h" 31 31 32 #include "webkitdownload.h"33 #include "webkitenumtypes.h"34 #include "webkitgeolocationpolicydecision.h"35 #include "webkitmarshal.h"36 #include "webkitnetworkrequest.h"37 #include "webkitnetworkresponse.h"38 #include "webkitprivate.h"39 #include "webkitwebinspector.h"40 #include "webkitwebbackforwardlist.h"41 #include "webkitwebhistoryitem.h"42 43 32 #include "AXObjectCache.h" 44 33 #include "AbstractDatabase.h" 45 34 #include "BackForwardListImpl.h" 46 #include " MemoryCache.h"35 #include "Chrome.h" 47 36 #include "ChromeClientGtk.h" 48 37 #include "ClipboardUtilitiesGtk.h" 38 #include "ContextMenu.h" 49 39 #include "ContextMenuClientGtk.h" 50 40 #include "ContextMenuController.h" 51 #include "ContextMenu.h"52 41 #include "Cursor.h" 53 42 #include "Document.h" … … 57 46 #include "DragController.h" 58 47 #include "DragData.h" 48 #include "Editor.h" 59 49 #include "EditorClientGtk.h" 60 #include "Editor.h"61 50 #include "EventHandler.h" 62 51 #include "FloatQuad.h" … … 65 54 #include "FrameLoaderTypes.h" 66 55 #include "FrameView.h" 67 #include <glib/gi18n-lib.h> 68 #include <GOwnPtr.h> 69 #include <GOwnPtrGtk.h> 56 #include "GOwnPtrGtk.h" 70 57 #include "GraphicsContext.h" 71 58 #include "GtkVersioning.h" 59 #include "HTMLNames.h" 72 60 #include "HitTestRequest.h" 73 61 #include "HitTestResult.h" 74 62 #include "IconDatabase.h" 75 63 #include "InspectorClientGtk.h" 64 #include "MemoryCache.h" 76 65 #include "MouseEventWithHitTestResults.h" 77 66 #include "NotImplemented.h" 78 67 #include "PageCache.h" 79 68 #include "Pasteboard.h" 69 #include "PasteboardHelper.h" 80 70 #include "PasteboardHelperGtk.h" 81 #include "PasteboardHelper.h"82 71 #include "PlatformKeyboardEvent.h" 83 72 #include "PlatformWheelEvent.h" … … 88 77 #include "Scrollbar.h" 89 78 #include "webkit/WebKitDOMDocumentPrivate.h" 79 #include "webkitdownload.h" 80 #include "webkitenumtypes.h" 81 #include "webkitgeolocationpolicydecision.h" 82 #include "webkitmarshal.h" 83 #include "webkitnetworkrequest.h" 84 #include "webkitnetworkresponse.h" 85 #include "webkitprivate.h" 86 #include "webkitwebbackforwardlist.h" 87 #include "webkitwebhistoryitem.h" 88 #include "webkitwebinspector.h" 89 #include "webkitwebviewprivate.h" 90 #include <gdk/gdkkeysyms.h> 91 #include <glib/gi18n-lib.h> 92 #include <wtf/gobject/GOwnPtr.h> 90 93 #include <wtf/text/CString.h> 91 92 #include <gdk/gdkkeysyms.h>93 94 94 95 /** … … 5058 5059 #endif 5059 5060 } 5061 5062 namespace WebKit { 5063 5064 WebCore::Page* core(WebKitWebView* webView) 5065 { 5066 if (!webView) 5067 return 0; 5068 5069 WebKitWebViewPrivate* priv = webView->priv; 5070 return priv ? priv->corePage : 0; 5071 } 5072 5073 WebKitWebView* kit(WebCore::Page* corePage) 5074 { 5075 if (!corePage) 5076 return 0; 5077 5078 ASSERT(corePage->chrome()); 5079 WebKit::ChromeClient* client = static_cast<WebKit::ChromeClient*>(corePage->chrome()->client()); 5080 return client ? client->webView() : 0; 5081 } 5082 5083 void webViewEnterFullscreen(WebKitWebView* webView, Node* node) 5084 { 5085 if (!node->hasTagName(HTMLNames::videoTag)) 5086 return; 5087 5088 #if ENABLE(VIDEO) 5089 HTMLMediaElement* videoElement = static_cast<HTMLMediaElement*>(node); 5090 WebKitWebViewPrivate* priv = webView->priv; 5091 5092 // First exit Fullscreen for the old mediaElement. 5093 if (priv->fullscreenVideoController) 5094 priv->fullscreenVideoController->exitFullscreen(); 5095 5096 priv->fullscreenVideoController = new FullscreenVideoController; 5097 priv->fullscreenVideoController->setMediaElement(videoElement); 5098 priv->fullscreenVideoController->enterFullscreen(); 5099 #endif 5100 } 5101 5102 void webViewExitFullscreen(WebKitWebView* webView) 5103 { 5104 #if ENABLE(VIDEO) 5105 WebKitWebViewPrivate* priv = webView->priv; 5106 if (priv->fullscreenVideoController) 5107 priv->fullscreenVideoController->exitFullscreen(); 5108 #endif 5109 } 5110 5111 }
Note: See TracChangeset
for help on using the changeset viewer.