Diff
Modified: trunk/Source/WebKit2/ChangeLog (158758 => 158759)
--- trunk/Source/WebKit2/ChangeLog 2013-11-06 18:18:48 UTC (rev 158758)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-06 18:51:58 UTC (rev 158759)
@@ -1,3 +1,22 @@
+2013-11-06 Anders Carlsson <[email protected]>
+
+ 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):
+
2013-11-06 Dan Bernstein <[email protected]>
Promoted WKBrowsingContextHistoryDelegate.h to private.
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (158758 => 158759)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2013-11-06 18:18:48 UTC (rev 158758)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2013-11-06 18:51:58 UTC (rev 158759)
@@ -785,16 +785,6 @@
return toCopiedURLAPI(toImpl(pageRef)->committedURL());
}
-void WKPageSetDebugPaintFlags(WKPageDebugPaintFlags flags)
-{
- WebPageProxy::setDebugPaintFlags(flags);
-}
-
-WKPageDebugPaintFlags WKPageGetDebugPaintFlags()
-{
- return WebPageProxy::debugPaintFlags();
-}
-
WKStringRef WKPageCopyStandardUserAgentWithApplicationName(WKStringRef applicationName)
{
return toCopiedAPI(WebPageProxy::standardUserAgent(toImpl(applicationName)->string()));
Modified: trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h (158758 => 158759)
--- trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h 2013-11-06 18:18:48 UTC (rev 158758)
+++ trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h 2013-11-06 18:51:58 UTC (rev 158759)
@@ -113,10 +113,6 @@
virtual void makeFirstResponder();
- virtual CGContextRef containingWindowGraphicsContext();
-
- virtual void flashBackingStoreUpdates(const Vector<WebCore::IntRect>& updateRects);
-
virtual void didPerformDictionaryLookup(const AttributedString&, const DictionaryPopupInfo&);
virtual void dismissDictionaryLookupPanel();
Modified: trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm (158758 => 158759)
--- trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm 2013-11-06 18:18:48 UTC (rev 158758)
+++ trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm 2013-11-06 18:51:58 UTC (rev 158759)
@@ -447,22 +447,6 @@
[m_wkView _setPluginComplexTextInputState:pluginComplexTextInputState pluginComplexTextInputIdentifier:pluginComplexTextInputIdentifier];
}
-CGContextRef PageClientImpl::containingWindowGraphicsContext()
-{
- NSWindow *window = [m_wkView window];
-
- // Don't try to get the graphics context if the NSWindow doesn't have a window device.
- if ([window windowNumber] <= 0)
- return 0;
-
- return static_cast<CGContextRef>([[window graphicsContext] graphicsPort]);
-}
-
-void PageClientImpl::flashBackingStoreUpdates(const Vector<IntRect>&)
-{
- notImplemented();
-}
-
void PageClientImpl::didPerformDictionaryLookup(const AttributedString& text, const DictionaryPopupInfo& dictionaryPopupInfo)
{
RetainPtr<NSAttributedString> attributedString = text.string;
Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (158758 => 158759)
--- trunk/Source/WebKit2/UIProcess/PageClient.h 2013-11-06 18:18:48 UTC (rev 158758)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2013-11-06 18:51:58 UTC (rev 158759)
@@ -192,7 +192,6 @@
#if PLATFORM(MAC)
virtual void pluginFocusOrWindowFocusChanged(uint64_t pluginComplexTextInputIdentifier, bool pluginHasFocusAndWindowHasFocus) = 0;
virtual void setPluginComplexTextInputState(uint64_t pluginComplexTextInputIdentifier, PluginComplexTextInputState) = 0;
- virtual CGContextRef containingWindowGraphicsContext() = 0;
virtual void didPerformDictionaryLookup(const AttributedString&, const DictionaryPopupInfo&) = 0;
virtual void dismissDictionaryLookupPanel() = 0;
virtual void showCorrectionPanel(WebCore::AlternativeTextType, const WebCore::FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings) = 0;
@@ -215,8 +214,6 @@
#endif // USE(DICTATION_ALTERNATIVES)
#endif // USE(APPKIT)
#endif // PLATFORM(MAC)
-
- virtual void flashBackingStoreUpdates(const Vector<WebCore::IntRect>& updateRects) = 0;
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (158758 => 158759)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-11-06 18:18:48 UTC (rev 158758)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-11-06 18:51:58 UTC (rev 158759)
@@ -126,8 +126,6 @@
namespace WebKit {
-WKPageDebugPaintFlags WebPageProxy::s_debugPaintFlags = 0;
-
DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, webPageProxyCounter, ("WebPageProxy"));
class ExceededDatabaseQuotaRecords {
@@ -4177,11 +4175,6 @@
}
#endif
-void WebPageProxy::flashBackingStoreUpdates(const Vector<IntRect>& updateRects)
-{
- m_pageClient->flashBackingStoreUpdates(updateRects);
-}
-
void WebPageProxy::updateBackingStoreDiscardableState()
{
ASSERT(isValid());
@@ -4196,16 +4189,6 @@
m_drawingArea->setBackingStoreIsDiscardable(isDiscardable);
}
-Color WebPageProxy::viewUpdatesFlashColor()
-{
- return Color(0, 200, 255);
-}
-
-Color WebPageProxy::backingStoreUpdatesFlashColor()
-{
- return Color(200, 0, 255);
-}
-
void WebPageProxy::saveDataToFileInDownloadsFolder(const String& suggestedFilename, const String& mimeType, const String& originatingURLString, WebData* data)
{
m_uiClient.saveDataToFileInDownloadsFolder(this, suggestedFilename, mimeType, originatingURLString, data);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (158758 => 158759)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-11-06 18:18:48 UTC (rev 158758)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-11-06 18:51:58 UTC (rev 158759)
@@ -379,7 +379,6 @@
bool executeKeypressCommands(const Vector<WebCore::KeypressCommand>&);
void sendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, const String& textInput);
- CGContextRef containingWindowGraphicsContext();
bool shouldDelayWindowOrderingForEvent(const WebMouseEvent&);
bool acceptsFirstMouse(int eventNumber, const WebMouseEvent&);
@@ -673,21 +672,10 @@
const String& pendingAPIRequestURL() const { return m_pendingAPIRequestURL; }
- void flashBackingStoreUpdates(const Vector<WebCore::IntRect>& updateRects);
-
#if PLATFORM(MAC)
void handleAlternativeTextUIResult(const String& result);
#endif
- static void setDebugPaintFlags(WKPageDebugPaintFlags flags) { s_debugPaintFlags = flags; }
- static WKPageDebugPaintFlags debugPaintFlags() { return s_debugPaintFlags; }
-
- // Color to be used with kWKDebugFlashViewUpdates.
- static WebCore::Color viewUpdatesFlashColor();
-
- // Color to be used with kWKDebugFlashBackingStoreUpdates.
- static WebCore::Color backingStoreUpdatesFlashColor();
-
void saveDataToFileInDownloadsFolder(const String& suggestedFilename, const String& mimeType, const String& originatingURLString, WebData*);
void savePDFToFileInDownloadsFolder(const String& suggestedFilename, const String& originatingURLString, const CoreIPC::DataReference&);
#if PLATFORM(MAC)
@@ -1218,8 +1206,6 @@
uint64_t m_renderTreeSize;
- static WKPageDebugPaintFlags s_debugPaintFlags;
-
bool m_shouldSendEventsSynchronously;
bool m_suppressVisibilityUpdates;
Modified: trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm (158758 => 158759)
--- trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2013-11-06 18:18:48 UTC (rev 158758)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2013-11-06 18:51:58 UTC (rev 158759)
@@ -137,11 +137,6 @@
NSPerformService(@"Search With %WebSearchProvider@", pasteboard);
}
-
-CGContextRef WebPageProxy::containingWindowGraphicsContext()
-{
- return m_pageClient->containingWindowGraphicsContext();
-}
void WebPageProxy::windowAndViewFramesChanged(const FloatRect& viewFrameInWindowCoordinates, const FloatPoint& accessibilityViewCoordinates)
{
