Changeset 158759 in webkit


Ignore:
Timestamp:
Nov 6, 2013 10:51:58 AM (11 years ago)
Author:
andersca@apple.com
Message:

Remove dead code
​https://bugs.webkit.org/show_bug.cgi?id=123902

Reviewed by Tim Horton.

Remove the PageClient::containingWindowGraphicsContext() as well as the
WKPageSetDebugPaintFlags and WKPageGetDebugPaintFlags API functions.

  • UIProcess/API/C/WKPage.cpp:
  • UIProcess/API/mac/PageClientImpl.h:
  • UIProcess/API/mac/PageClientImpl.mm:
  • UIProcess/PageClient.h:
  • UIProcess/WebPageProxy.cpp:
  • UIProcess/WebPageProxy.h:
  • UIProcess/mac/WebPageProxyMac.mm:

(WebKit::WebPageProxy::searchTheWeb):

Location:
trunk/Source/WebKit2
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r158756 r158759  
     12013-11-06  Anders Carlsson  <andersca@apple.com>
     2
     3        Remove dead code
     4        https://bugs.webkit.org/show_bug.cgi?id=123902
     5
     6        Reviewed by Tim Horton.
     7
     8        Remove the PageClient::containingWindowGraphicsContext() as well as the
     9        WKPageSetDebugPaintFlags and WKPageGetDebugPaintFlags API functions.
     10
     11        * UIProcess/API/C/WKPage.cpp:
     12        * UIProcess/API/mac/PageClientImpl.h:
     13        * UIProcess/API/mac/PageClientImpl.mm:
     14        * UIProcess/PageClient.h:
     15        * UIProcess/WebPageProxy.cpp:
     16        * UIProcess/WebPageProxy.h:
     17        * UIProcess/mac/WebPageProxyMac.mm:
     18        (WebKit::WebPageProxy::searchTheWeb):
     19
    1202013-11-06  Dan Bernstein  <mitz@apple.com>
    221

  • trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp

    r156924 r158759  
    786786}
    787787
    788 void WKPageSetDebugPaintFlags(WKPageDebugPaintFlags flags)
    789 {
    790     WebPageProxy::setDebugPaintFlags(flags);
    791 }
    792 
    793 WKPageDebugPaintFlags WKPageGetDebugPaintFlags()
    794 {
    795     return WebPageProxy::debugPaintFlags();
    796 }
    797 
    798788WKStringRef WKPageCopyStandardUserAgentWithApplicationName(WKStringRef applicationName)
    799789{

  • trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h

    r157972 r158759  
    114114    virtual void makeFirstResponder();
    115115   
    116     virtual CGContextRef containingWindowGraphicsContext();
    117 
    118     virtual void flashBackingStoreUpdates(const Vector<WebCore::IntRect>& updateRects);
    119 
    120116    virtual void didPerformDictionaryLookup(const AttributedString&, const DictionaryPopupInfo&);
    121117    virtual void dismissDictionaryLookupPanel();

  • trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm

    r157972 r158759  
    448448}
    449449
    450 CGContextRef PageClientImpl::containingWindowGraphicsContext()
    451 {
    452     NSWindow *window = [m_wkView window];
    453 
    454     // Don't try to get the graphics context if the NSWindow doesn't have a window device.
    455     if ([window windowNumber] <= 0)
    456         return 0;
    457 
    458     return static_cast<CGContextRef>([[window graphicsContext] graphicsPort]);
    459 }
    460 
    461 void PageClientImpl::flashBackingStoreUpdates(const Vector<IntRect>&)
    462 {
    463     notImplemented();
    464 }
    465 
    466450void PageClientImpl::didPerformDictionaryLookup(const AttributedString& text, const DictionaryPopupInfo& dictionaryPopupInfo)
    467451{

  • trunk/Source/WebKit2/UIProcess/PageClient.h

    r157972 r158759  
    193193    virtual void pluginFocusOrWindowFocusChanged(uint64_t pluginComplexTextInputIdentifier, bool pluginHasFocusAndWindowHasFocus) = 0;
    194194    virtual void setPluginComplexTextInputState(uint64_t pluginComplexTextInputIdentifier, PluginComplexTextInputState) = 0;
    195     virtual CGContextRef containingWindowGraphicsContext() = 0;
    196195    virtual void didPerformDictionaryLookup(const AttributedString&, const DictionaryPopupInfo&) = 0;
    197196    virtual void dismissDictionaryLookupPanel() = 0;
    … …  
    216215#endif // USE(APPKIT)
    217216#endif // PLATFORM(MAC)
    218 
    219     virtual void flashBackingStoreUpdates(const Vector<WebCore::IntRect>& updateRects) = 0;
    220217};
    221218

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r158451 r158759  
    127127namespace WebKit {
    128128
    129 WKPageDebugPaintFlags WebPageProxy::s_debugPaintFlags = 0;
    130 
    131129DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, webPageProxyCounter, ("WebPageProxy"));
    132130
    … …  
    41784176#endif
    41794177
    4180 void WebPageProxy::flashBackingStoreUpdates(const Vector<IntRect>& updateRects)
    4181 {
    4182     m_pageClient->flashBackingStoreUpdates(updateRects);
    4183 }
    4184 
    41854178void WebPageProxy::updateBackingStoreDiscardableState()
    41864179{
    … …  
    41974190}
    41984191
    4199 Color WebPageProxy::viewUpdatesFlashColor()
    4200 {
    4201     return Color(0, 200, 255);
    4202 }
    4203 
    4204 Color WebPageProxy::backingStoreUpdatesFlashColor()
    4205 {
    4206     return Color(200, 0, 255);
    4207 }
    4208 
    42094192void WebPageProxy::saveDataToFileInDownloadsFolder(const String& suggestedFilename, const String& mimeType, const String& originatingURLString, WebData* data)
    42104193{

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r158451 r158759  
    380380
    381381    void sendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, const String& textInput);
    382     CGContextRef containingWindowGraphicsContext();
    383382    bool shouldDelayWindowOrderingForEvent(const WebMouseEvent&);
    384383    bool acceptsFirstMouse(int eventNumber, const WebMouseEvent&);
    … …  
    674673    const String& pendingAPIRequestURL() const { return m_pendingAPIRequestURL; }
    675674
    676     void flashBackingStoreUpdates(const Vector<WebCore::IntRect>& updateRects);
    677 
    678675#if PLATFORM(MAC)
    679676    void handleAlternativeTextUIResult(const String& result);
    680677#endif
    681 
    682     static void setDebugPaintFlags(WKPageDebugPaintFlags flags) { s_debugPaintFlags = flags; }
    683     static WKPageDebugPaintFlags debugPaintFlags() { return s_debugPaintFlags; }
    684 
    685     // Color to be used with kWKDebugFlashViewUpdates.
    686     static WebCore::Color viewUpdatesFlashColor();
    687 
    688     // Color to be used with kWKDebugFlashBackingStoreUpdates.
    689     static WebCore::Color backingStoreUpdatesFlashColor();
    690678
    691679    void saveDataToFileInDownloadsFolder(const String& suggestedFilename, const String& mimeType, const String& originatingURLString, WebData*);
    … …  
    12191207    uint64_t m_renderTreeSize;
    12201208
    1221     static WKPageDebugPaintFlags s_debugPaintFlags;
    1222 
    12231209    bool m_shouldSendEventsSynchronously;
    12241210

  • trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm

    r157972 r158759  
    138138    NSPerformService(@"Search With %WebSearchProvider@", pasteboard);
    139139}
    140    
    141 CGContextRef WebPageProxy::containingWindowGraphicsContext()
    142 {
    143     return m_pageClient->containingWindowGraphicsContext();
    144 }
    145140
    146141void WebPageProxy::windowAndViewFramesChanged(const FloatRect& viewFrameInWindowCoordinates, const FloatPoint& accessibilityViewCoordinates)
Note: See TracChangeset for help on using the changeset viewer.