Diff
Modified: trunk/Source/WebKit2/ChangeLog (136610 => 136611)
--- trunk/Source/WebKit2/ChangeLog 2012-12-05 03:25:34 UTC (rev 136610)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-05 03:29:19 UTC (rev 136611)
@@ -1,3 +1,35 @@
+2012-12-04 Anders Carlsson <[email protected]>
+
+ Remove PageClient::didChangeScrollbarsForMainFrame
+ https://bugs.webkit.org/show_bug.cgi?id=104077
+
+ Reviewed by Andreas Kling.
+
+ The aforementioned function was only used to implement some Snow Leopard specific behavior that we no longer support.
+
+ * UIProcess/API/gtk/PageClientImpl.cpp:
+ * UIProcess/API/gtk/PageClientImpl.h:
+ (PageClientImpl):
+ * UIProcess/API/mac/PageClientImpl.h:
+ (PageClientImpl):
+ * UIProcess/API/mac/PageClientImpl.mm:
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView viewWillMoveToWindow:]):
+ * UIProcess/API/mac/WKViewInternal.h:
+ * UIProcess/API/qt/raw/qrawwebview_p_p.h:
+ * UIProcess/PageClient.h:
+ (PageClient):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didChangeScrollbarsForMainFrame):
+ * UIProcess/efl/PageClientBase.cpp:
+ (WebKit):
+ * UIProcess/efl/PageClientBase.h:
+ (PageClientBase):
+ * UIProcess/qt/QtPageClient.h:
+ * UIProcess/win/WebView.cpp:
+ * UIProcess/win/WebView.h:
+ (WebView):
+
2012-12-04 Andy Estes <[email protected]>
[WebKit2] WKWebProcessPlugInBrowserContextControllers should be treated as type WKBrowsingContextControllerType for encoding purposes
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp (136610 => 136611)
--- trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2012-12-05 03:25:34 UTC (rev 136610)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2012-12-05 03:29:19 UTC (rev 136611)
@@ -282,10 +282,6 @@
notImplemented();
}
-void PageClientImpl::didChangeScrollbarsForMainFrame() const
-{
-}
-
void PageClientImpl::flashBackingStoreUpdates(const Vector<IntRect>&)
{
notImplemented();
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h (136610 => 136611)
--- trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2012-12-05 03:25:34 UTC (rev 136610)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2012-12-05 03:29:19 UTC (rev 136611)
@@ -85,7 +85,6 @@
virtual PassRefPtr<WebColorChooserProxy> createColorChooserProxy(WebPageProxy*, const WebCore::Color& intialColor, const WebCore::IntRect&);
#endif
virtual void setFindIndicator(PassRefPtr<FindIndicator>, bool fadeOut, bool animate);
- virtual void didChangeScrollbarsForMainFrame() const;
virtual void flashBackingStoreUpdates(const Vector<WebCore::IntRect>& updateRects);
virtual void getEditorCommandsForKeyEvent(const NativeWebKeyboardEvent&, const AtomicString&, Vector<WTF::String>&);
virtual void findStringInCustomRepresentation(const String&, FindOptions, unsigned);
Modified: trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h (136610 => 136611)
--- trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h 2012-12-05 03:25:34 UTC (rev 136610)
+++ trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h 2012-12-05 03:29:19 UTC (rev 136611)
@@ -116,8 +116,6 @@
virtual CGContextRef containingWindowGraphicsContext();
- virtual void didChangeScrollbarsForMainFrame() const;
-
virtual void didCommitLoadForMainFrame(bool useCustomRepresentation);
virtual void didFinishLoadingDataForCustomRepresentation(const String& suggestedFilename, const CoreIPC::DataReference&);
Modified: trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm (136610 => 136611)
--- trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm 2012-12-05 03:25:34 UTC (rev 136610)
+++ trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm 2012-12-05 03:29:19 UTC (rev 136611)
@@ -432,11 +432,6 @@
return static_cast<CGContextRef>([[window graphicsContext] graphicsPort]);
}
-void PageClientImpl::didChangeScrollbarsForMainFrame() const
-{
- [m_wkView _didChangeScrollbarsForMainFrame];
-}
-
void PageClientImpl::didCommitLoadForMainFrame(bool useCustomRepresentation)
{
[m_wkView _setPageHasCustomRepresentation:useCustomRepresentation];
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (136610 => 136611)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2012-12-05 03:25:34 UTC (rev 136610)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2012-12-05 03:29:19 UTC (rev 136611)
@@ -105,13 +105,6 @@
@end
@interface NSWindow (WKNSWindowDetails)
-#if __MAC_OS_X_VERSION_MIN_REQUIRED == 1060
-- (NSRect)_growBoxRect;
-- (id)_growBoxOwner;
-- (void)_setShowOpaqueGrowBoxForOwner:(id)owner;
-- (BOOL)_updateGrowBoxForWindowFrameChange;
-#endif
-
- (NSRect)_intersectBottomCornersWithRect:(NSRect)viewRect;
- (void)_maskRoundedBottomCorners:(NSRect)clipRect;
@end
@@ -1804,57 +1797,6 @@
}
-#if __MAC_OS_X_VERSION_MIN_REQUIRED == 1060
-- (BOOL)_ownsWindowGrowBox
-{
- NSWindow* window = [self window];
- if (!window)
- return NO;
-
- NSView *superview = [self superview];
- if (!superview)
- return NO;
-
- NSRect growBoxRect = [window _growBoxRect];
- if (NSIsEmptyRect(growBoxRect))
- return NO;
-
- NSRect visibleRect = [self visibleRect];
- if (NSIsEmptyRect(visibleRect))
- return NO;
-
- NSRect visibleRectInWindowCoords = [self convertRect:visibleRect toView:nil];
- if (!NSIntersectsRect(growBoxRect, visibleRectInWindowCoords))
- return NO;
-
- return YES;
-}
-
-- (BOOL)_updateGrowBoxForWindowFrameChange
-{
- // Temporarily enable the resize indicator to make a the _ownsWindowGrowBox calculation work.
- BOOL wasShowingIndicator = [[self window] showsResizeIndicator];
- if (!wasShowingIndicator)
- [[self window] setShowsResizeIndicator:YES];
-
- BOOL ownsGrowBox = [self _ownsWindowGrowBox];
- _data->_page->setWindowResizerSize(ownsGrowBox ? enclosingIntRect([[self window] _growBoxRect]).size() : IntSize());
-
- if (ownsGrowBox)
- [[self window] _setShowOpaqueGrowBoxForOwner:(_data->_page->hasHorizontalScrollbar() || _data->_page->hasVerticalScrollbar() ? self : nil)];
- else
- [[self window] _setShowOpaqueGrowBoxForOwner:nil];
-
- // Once WebCore can draw the window resizer, this should read:
- // if (wasShowingIndicator)
- // [[self window] setShowsResizeIndicator:!ownsGrowBox];
- if (!wasShowingIndicator)
- [[self window] setShowsResizeIndicator:NO];
-
- return ownsGrowBox;
-}
-#endif
-
// FIXME: Use AppKit constants for these when they are available.
static NSString * const windowDidChangeBackingPropertiesNotification = @"NSWindowDidChangeBackingPropertiesNotification";
static NSString * const backingPropertyOldScaleFactorKey = @"NSBackingPropertyOldScaleFactorKey";
@@ -1922,11 +1864,6 @@
[self removeWindowObservers];
[self addWindowObserversForWindow:window];
-
-#if __MAC_OS_X_VERSION_MIN_REQUIRED == 1060
- if ([currentWindow _growBoxOwner] == self)
- [currentWindow _setShowOpaqueGrowBoxForOwner:nil];
-#endif
}
- (void)viewDidMoveToWindow
@@ -2891,13 +2828,6 @@
}
}
-- (void)_didChangeScrollbarsForMainFrame
-{
-#if __MAC_OS_X_VERSION_MIN_REQUIRED == 1060
- [self _updateGrowBoxForWindowFrameChange];
-#endif
-}
-
#if ENABLE(FULLSCREEN_API)
- (BOOL)hasFullScreenWindowController
{
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h (136610 => 136611)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2012-12-05 03:25:34 UTC (rev 136610)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2012-12-05 03:29:19 UTC (rev 136611)
@@ -85,8 +85,6 @@
- (void)_updateTextInputStateIncludingSecureInputState:(BOOL)updateSecureInputState;
- (void)_resetTextInputState;
-- (void)_didChangeScrollbarsForMainFrame;
-
- (WebKit::ColorSpaceData)_colorSpace;
#if ENABLE(FULLSCREEN_API)
Modified: trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p_p.h (136610 => 136611)
--- trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p_p.h 2012-12-05 03:25:34 UTC (rev 136610)
+++ trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p_p.h 2012-12-05 03:29:19 UTC (rev 136611)
@@ -42,7 +42,6 @@
virtual void didFinishLoadingDataForCustomRepresentation(const String& suggestedFilename, const CoreIPC::DataReference&) { }
virtual double customRepresentationZoomFactor() { return 1; }
virtual void setCustomRepresentationZoomFactor(double) { }
- virtual void didChangeScrollbarsForMainFrame() const { }
virtual void findStringInCustomRepresentation(const String&, WebKit::FindOptions, unsigned maxMatchCount) { }
virtual void countStringMatchesInCustomRepresentation(const String&, WebKit::FindOptions, unsigned maxMatchCount) { }
virtual void clearAllEditCommands() { }
Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (136610 => 136611)
--- trunk/Source/WebKit2/UIProcess/PageClient.h 2012-12-05 03:25:34 UTC (rev 136610)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2012-12-05 03:29:19 UTC (rev 136611)
@@ -236,8 +236,6 @@
#endif // USE(APPKIT)
#endif // PLATFORM(MAC)
- virtual void didChangeScrollbarsForMainFrame() const = 0;
-
// Custom representations.
virtual void didCommitLoadForMainFrame(bool useCustomRepresentation) = 0;
virtual void didFinishLoadingDataForCustomRepresentation(const String& suggestedFilename, const CoreIPC::DataReference&) = 0;
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (136610 => 136611)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-12-05 03:25:34 UTC (rev 136610)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-12-05 03:29:19 UTC (rev 136611)
@@ -3934,8 +3934,6 @@
{
m_mainFrameHasHorizontalScrollbar = hasHorizontalScrollbar;
m_mainFrameHasVerticalScrollbar = hasVerticalScrollbar;
-
- m_pageClient->didChangeScrollbarsForMainFrame();
}
void WebPageProxy::didChangeScrollOffsetPinningForMainFrame(bool pinnedToLeftSide, bool pinnedToRightSide, bool pinnedToTopSide, bool pinnedToBottomSide)
Modified: trunk/Source/WebKit2/UIProcess/efl/PageClientBase.cpp (136610 => 136611)
--- trunk/Source/WebKit2/UIProcess/efl/PageClientBase.cpp 2012-12-05 03:25:34 UTC (rev 136610)
+++ trunk/Source/WebKit2/UIProcess/efl/PageClientBase.cpp 2012-12-05 03:29:19 UTC (rev 136611)
@@ -252,11 +252,6 @@
}
#endif // USE(ACCELERATED_COMPOSITING)
-void PageClientBase::didChangeScrollbarsForMainFrame() const
-{
- notImplemented();
-}
-
void PageClientBase::didCommitLoadForMainFrame(bool)
{
notImplemented();
Modified: trunk/Source/WebKit2/UIProcess/efl/PageClientBase.h (136610 => 136611)
--- trunk/Source/WebKit2/UIProcess/efl/PageClientBase.h 2012-12-05 03:25:34 UTC (rev 136610)
+++ trunk/Source/WebKit2/UIProcess/efl/PageClientBase.h 2012-12-05 03:29:19 UTC (rev 136611)
@@ -100,8 +100,6 @@
virtual void updateAcceleratedCompositingMode(const LayerTreeContext&);
#endif
- virtual void didChangeScrollbarsForMainFrame() const;
-
virtual void didCommitLoadForMainFrame(bool);
virtual void didFinishLoadingDataForCustomRepresentation(const String&, const CoreIPC::DataReference&);
virtual double customRepresentationZoomFactor();
Modified: trunk/Source/WebKit2/UIProcess/qt/QtPageClient.h (136610 => 136611)
--- trunk/Source/WebKit2/UIProcess/qt/QtPageClient.h 2012-12-05 03:25:34 UTC (rev 136610)
+++ trunk/Source/WebKit2/UIProcess/qt/QtPageClient.h 2012-12-05 03:29:19 UTC (rev 136611)
@@ -96,7 +96,6 @@
virtual void didFinishLoadingDataForCustomRepresentation(const String& suggestedFilename, const CoreIPC::DataReference&) { }
virtual double customRepresentationZoomFactor() { return 1; }
virtual void setCustomRepresentationZoomFactor(double) { }
- virtual void didChangeScrollbarsForMainFrame() const { }
virtual void flashBackingStoreUpdates(const Vector<WebCore::IntRect>& updateRects);
virtual void findStringInCustomRepresentation(const String&, WebKit::FindOptions, unsigned maxMatchCount) { }
virtual void countStringMatchesInCustomRepresentation(const String&, WebKit::FindOptions, unsigned maxMatchCount) { }
Modified: trunk/Source/WebKit2/UIProcess/win/WebView.cpp (136610 => 136611)
--- trunk/Source/WebKit2/UIProcess/win/WebView.cpp 2012-12-05 03:25:34 UTC (rev 136610)
+++ trunk/Source/WebKit2/UIProcess/win/WebView.cpp 2012-12-05 03:29:19 UTC (rev 136611)
@@ -1516,10 +1516,6 @@
{
}
-void WebView::didChangeScrollbarsForMainFrame() const
-{
-}
-
void WebView::findStringInCustomRepresentation(const String&, FindOptions, unsigned)
{
}
Modified: trunk/Source/WebKit2/UIProcess/win/WebView.h (136610 => 136611)
--- trunk/Source/WebKit2/UIProcess/win/WebView.h 2012-12-05 03:25:34 UTC (rev 136610)
+++ trunk/Source/WebKit2/UIProcess/win/WebView.h 2012-12-05 03:29:19 UTC (rev 136611)
@@ -215,7 +215,6 @@
virtual double customRepresentationZoomFactor();
virtual void setCustomRepresentationZoomFactor(double);
WebCore::DragOperation keyStateToDragOperation(DWORD grfKeyState) const;
- virtual void didChangeScrollbarsForMainFrame() const;
virtual void findStringInCustomRepresentation(const String&, FindOptions, unsigned maxMatchCount);
virtual void countStringMatchesInCustomRepresentation(const String&, FindOptions, unsigned maxMatchCount);
