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

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

Issue 14735003: Remove compile time flag ENABLE_PAGE_POPUP . This is part of an overall effort to remove unneeded c… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase Created 7 years, 7 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
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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 class WebMouseWheelEvent; 116 class WebMouseWheelEvent;
117 class WebPagePopupImpl; 117 class WebPagePopupImpl;
118 class WebPrerendererClient; 118 class WebPrerendererClient;
119 class WebSettingsImpl; 119 class WebSettingsImpl;
120 class WebTouchEvent; 120 class WebTouchEvent;
121 class WebViewBenchmarkSupport; 121 class WebViewBenchmarkSupport;
122 122
123 class WebViewImpl : public WebView 123 class WebViewImpl : public WebView
124 , public RefCounted<WebViewImpl> 124 , public RefCounted<WebViewImpl>
125 , public WebGestureCurveTarget 125 , public WebGestureCurveTarget
126 #if ENABLE(PAGE_POPUP)
127 , public WebCore::PagePopupDriver 126 , public WebCore::PagePopupDriver
128 #endif
129 , public PageWidgetEventHandler { 127 , public PageWidgetEventHandler {
130 public: 128 public:
131 enum AutoZoomType { 129 enum AutoZoomType {
132 DoubleTap, 130 DoubleTap,
133 FindInPage, 131 FindInPage,
134 }; 132 };
135 133
136 // WebWidget methods: 134 // WebWidget methods:
137 virtual void close(); 135 virtual void close();
138 virtual WebSize size(); 136 virtual WebSize size();
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 NotificationPresenterImpl* notificationPresenterImpl(); 495 NotificationPresenterImpl* notificationPresenterImpl();
498 #endif 496 #endif
499 497
500 // Tries to scroll a frame or any parent of a frame. Returns true if the vie w 498 // Tries to scroll a frame or any parent of a frame. Returns true if the vie w
501 // was scrolled. 499 // was scrolled.
502 bool propagateScroll(WebCore::ScrollDirection, WebCore::ScrollGranularity); 500 bool propagateScroll(WebCore::ScrollDirection, WebCore::ScrollGranularity);
503 501
504 // Notification that a popup was opened/closed. 502 // Notification that a popup was opened/closed.
505 void popupOpened(WebCore::PopupContainer* popupContainer); 503 void popupOpened(WebCore::PopupContainer* popupContainer);
506 void popupClosed(WebCore::PopupContainer* popupContainer); 504 void popupClosed(WebCore::PopupContainer* popupContainer);
507 #if ENABLE(PAGE_POPUP)
508 // PagePopupDriver functions. 505 // PagePopupDriver functions.
509 virtual WebCore::PagePopup* openPagePopup(WebCore::PagePopupClient*, const W ebCore::IntRect& originBoundsInRootView) OVERRIDE; 506 virtual WebCore::PagePopup* openPagePopup(WebCore::PagePopupClient*, const W ebCore::IntRect& originBoundsInRootView) OVERRIDE;
510 virtual void closePagePopup(WebCore::PagePopup*) OVERRIDE; 507 virtual void closePagePopup(WebCore::PagePopup*) OVERRIDE;
511 #endif
512 508
513 void hideAutofillPopup(); 509 void hideAutofillPopup();
514 510
515 // Creates a Helper Plugin of |pluginType| for |hostDocument|. 511 // Creates a Helper Plugin of |pluginType| for |hostDocument|.
516 WebHelperPluginImpl* createHelperPlugin(const String& pluginType, const WebD ocument& hostDocument); 512 WebHelperPluginImpl* createHelperPlugin(const String& pluginType, const WebD ocument& hostDocument);
517 513
518 // Returns the input event we're currently processing. This is used in some 514 // Returns the input event we're currently processing. This is used in some
519 // cases where the WebCore DOM event doesn't have the information we need. 515 // cases where the WebCore DOM event doesn't have the information we need.
520 static const WebInputEvent* currentInputEvent() 516 static const WebInputEvent* currentInputEvent()
521 { 517 {
(...skipping 10 matching lines...) Expand all
532 void setBackgroundColor(const WebCore::Color&); 528 void setBackgroundColor(const WebCore::Color&);
533 WebCore::GraphicsLayerFactory* graphicsLayerFactory() const; 529 WebCore::GraphicsLayerFactory* graphicsLayerFactory() const;
534 void registerForAnimations(WebLayer*); 530 void registerForAnimations(WebLayer*);
535 void scheduleAnimation(); 531 void scheduleAnimation();
536 532
537 void didProgrammaticallyScroll(const WebCore::IntPoint& scrollPoint); 533 void didProgrammaticallyScroll(const WebCore::IntPoint& scrollPoint);
538 534
539 virtual void setVisibilityState(WebPageVisibilityState, bool); 535 virtual void setVisibilityState(WebPageVisibilityState, bool);
540 536
541 WebCore::PopupContainer* selectPopup() const { return m_selectPopup.get(); } 537 WebCore::PopupContainer* selectPopup() const { return m_selectPopup.get(); }
542 #if ENABLE(PAGE_POPUP)
543 bool hasOpenedPopup() const { return m_selectPopup || m_pagePopup; } 538 bool hasOpenedPopup() const { return m_selectPopup || m_pagePopup; }
544 #else
545 bool hasOpenedPopup() const { return m_selectPopup; }
546 #endif
547 539
548 // Returns true if the event leads to scrolling. 540 // Returns true if the event leads to scrolling.
549 static bool mapKeyCodeForScroll(int keyCode, 541 static bool mapKeyCodeForScroll(int keyCode,
550 WebCore::ScrollDirection* scrollDirection, 542 WebCore::ScrollDirection* scrollDirection,
551 WebCore::ScrollGranularity* scrollGranularity ); 543 WebCore::ScrollGranularity* scrollGranularity );
552 544
553 // Called by a full frame plugin inside this view to inform it that its 545 // Called by a full frame plugin inside this view to inform it that its
554 // zoom level has been updated. The plugin should only call this function 546 // zoom level has been updated. The plugin should only call this function
555 // if the zoom change was triggered by the browser, it's only needed in case 547 // if the zoom change was triggered by the browser, it's only needed in case
556 // a plugin can update its own zoom, say because of its own UI. 548 // a plugin can update its own zoom, say because of its own UI.
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
785 777
786 // The Autofill popup client. 778 // The Autofill popup client.
787 OwnPtr<AutofillPopupMenuClient> m_autofillPopupClient; 779 OwnPtr<AutofillPopupMenuClient> m_autofillPopupClient;
788 780
789 // The Autofill popup. 781 // The Autofill popup.
790 RefPtr<WebCore::PopupContainer> m_autofillPopup; 782 RefPtr<WebCore::PopupContainer> m_autofillPopup;
791 783
792 // The popup associated with a select element. 784 // The popup associated with a select element.
793 RefPtr<WebCore::PopupContainer> m_selectPopup; 785 RefPtr<WebCore::PopupContainer> m_selectPopup;
794 786
795 #if ENABLE(PAGE_POPUP)
796 // The popup associated with an input element. 787 // The popup associated with an input element.
797 RefPtr<WebPagePopupImpl> m_pagePopup; 788 RefPtr<WebPagePopupImpl> m_pagePopup;
798 #endif
799 789
800 OwnPtr<WebDevToolsAgentPrivate> m_devToolsAgent; 790 OwnPtr<WebDevToolsAgentPrivate> m_devToolsAgent;
801 OwnPtr<PageOverlayList> m_pageOverlays; 791 OwnPtr<PageOverlayList> m_pageOverlays;
802 792
803 // Whether the webview is rendering transparently. 793 // Whether the webview is rendering transparently.
804 bool m_isTransparent; 794 bool m_isTransparent;
805 795
806 // Whether the user can press tab to focus links. 796 // Whether the user can press tab to focus links.
807 bool m_tabsToLinks; 797 bool m_tabsToLinks;
808 798
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
870 860
871 bool m_showFPSCounter; 861 bool m_showFPSCounter;
872 bool m_showPaintRects; 862 bool m_showPaintRects;
873 bool m_showDebugBorders; 863 bool m_showDebugBorders;
874 bool m_continuousPaintingEnabled; 864 bool m_continuousPaintingEnabled;
875 }; 865 };
876 866
877 } // namespace WebKit 867 } // namespace WebKit
878 868
879 #endif 869 #endif
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/WebPagePopupImpl.cpp ('k') | Source/WebKit/chromium/src/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698