Diff
Modified: trunk/Source/WebCore/ChangeLog (100841 => 100842)
--- trunk/Source/WebCore/ChangeLog 2011-11-19 03:05:27 UTC (rev 100841)
+++ trunk/Source/WebCore/ChangeLog 2011-11-19 03:18:49 UTC (rev 100842)
@@ -1,3 +1,22 @@
+2011-11-18 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r100826.
+ http://trac.webkit.org/changeset/100826
+ https://bugs.webkit.org/show_bug.cgi?id=72786
+
+ Broke Chromium Mac build (Requested by aklein on #webkit).
+
+ * page/ChromeClient.h:
+ * page/FrameView.cpp:
+ * page/FrameView.h:
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::wheelEvent):
+ * platform/ScrollView.h:
+ * platform/ScrollableArea.h:
+ (WebCore::ScrollableArea::scrollbarStyleChanged):
+ * platform/mac/ScrollAnimatorMac.mm:
+ (WebCore::ScrollAnimatorMac::updateScrollerStyle):
+
2011-11-18 Alpha Lam <[email protected]>
[chromium] composited layers are blurry with a zoom-in page scale factor
Modified: trunk/Source/WebCore/page/ChromeClient.h (100841 => 100842)
--- trunk/Source/WebCore/page/ChromeClient.h 2011-11-19 03:05:27 UTC (rev 100841)
+++ trunk/Source/WebCore/page/ChromeClient.h 2011-11-19 03:18:49 UTC (rev 100842)
@@ -325,7 +325,6 @@
virtual void didCompleteAnimatedScroll() const { }
virtual void notifyScrollerThumbIsVisibleInRect(const IntRect&) { }
- virtual void recommendedScrollbarStyleDidChange(int /*newStyle*/) { }
enum DialogType {
AlertDialog = 0,
Modified: trunk/Source/WebCore/page/FrameView.cpp (100841 => 100842)
--- trunk/Source/WebCore/page/FrameView.cpp 2011-11-19 03:05:27 UTC (rev 100841)
+++ trunk/Source/WebCore/page/FrameView.cpp 2011-11-19 03:18:49 UTC (rev 100842)
@@ -2448,19 +2448,6 @@
return m_frame->loader()->state() != FrameStateComplete;
}
-void FrameView::scrollbarStyleChanged(int newStyle, bool forceUpdate)
-{
- Page* page = m_frame->page();
- if (!page)
- return;
- if (page->mainFrame() != m_frame)
- return;
- page->chrome()->client()->recommendedScrollbarStyleDidChange(newStyle);
-
- if (forceUpdate)
- ScrollView::scrollbarStyleChanged(newStyle, forceUpdate);
-}
-
void FrameView::setAnimatorsAreActive()
{
Page* page = m_frame->page();
Modified: trunk/Source/WebCore/page/FrameView.h (100841 => 100842)
--- trunk/Source/WebCore/page/FrameView.h 2011-11-19 03:05:27 UTC (rev 100841)
+++ trunk/Source/WebCore/page/FrameView.h 2011-11-19 03:18:49 UTC (rev 100842)
@@ -292,7 +292,6 @@
void flushAnyPendingPostLayoutTasks();
virtual bool shouldSuspendScrollAnimations() const;
- virtual void scrollbarStyleChanged(int newStyle, bool forceUpdate);
void setAnimatorsAreActive();
Modified: trunk/Source/WebCore/platform/ScrollView.cpp (100841 => 100842)
--- trunk/Source/WebCore/platform/ScrollView.cpp 2011-11-19 03:05:27 UTC (rev 100841)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2011-11-19 03:18:49 UTC (rev 100842)
@@ -973,11 +973,8 @@
return !scrollCornerRect().isEmpty();
}
-void ScrollView::scrollbarStyleChanged(int, bool forceUpdate)
+void ScrollView::scrollbarStyleChanged()
{
- if (!forceUpdate)
- return;
-
contentsResized();
updateScrollbars(scrollOffset());
}
Modified: trunk/Source/WebCore/platform/ScrollView.h (100841 => 100842)
--- trunk/Source/WebCore/platform/ScrollView.h 2011-11-19 03:05:27 UTC (rev 100841)
+++ trunk/Source/WebCore/platform/ScrollView.h 2011-11-19 03:18:49 UTC (rev 100842)
@@ -59,7 +59,7 @@
virtual void didCompleteRubberBand(const IntSize&) const;
virtual void notifyPageThatContentAreaWillPaint() const;
virtual bool isScrollCornerVisible() const;
- virtual void scrollbarStyleChanged(int newStyle, bool forceUpdate);
+ virtual void scrollbarStyleChanged();
// NOTE: This should only be called by the overriden setScrollOffset from ScrollableArea.
virtual void scrollTo(const IntSize& newOffset);
Modified: trunk/Source/WebCore/platform/ScrollableArea.h (100841 => 100842)
--- trunk/Source/WebCore/platform/ScrollableArea.h 2011-11-19 03:05:27 UTC (rev 100841)
+++ trunk/Source/WebCore/platform/ScrollableArea.h 2011-11-19 03:18:49 UTC (rev 100842)
@@ -139,7 +139,7 @@
virtual void didCompleteAnimatedScroll() const { }
virtual bool shouldSuspendScrollAnimations() const { return true; }
- virtual void scrollbarStyleChanged(int /*newStyle*/, bool /*forceUpdate*/) { }
+ virtual void scrollbarStyleChanged() { }
virtual void setVisibleScrollerThumbRect(const IntRect&) { }
virtual bool isOnActivePage() const { ASSERT_NOT_REACHED(); return true; }
Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (100841 => 100842)
--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2011-11-19 03:05:27 UTC (rev 100841)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2011-11-19 03:18:49 UTC (rev 100842)
@@ -1461,7 +1461,8 @@
// If needsScrollerStyleUpdate() is true, then the page is restoring from the page cache, and
// a relayout will happen on its own. Otherwise, we must initiate a re-layout ourselves.
- scrollableArea()->scrollbarStyleChanged(newStyle, !needsScrollerStyleUpdate());
+ if (!needsScrollerStyleUpdate())
+ scrollableArea()->scrollbarStyleChanged();
setNeedsScrollerStyleUpdate(false);
}
Modified: trunk/Source/WebKit2/ChangeLog (100841 => 100842)
--- trunk/Source/WebKit2/ChangeLog 2011-11-19 03:05:27 UTC (rev 100841)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-19 03:18:49 UTC (rev 100842)
@@ -1,3 +1,23 @@
+2011-11-18 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r100826.
+ http://trac.webkit.org/changeset/100826
+ https://bugs.webkit.org/show_bug.cgi?id=72786
+
+ Broke Chromium Mac build (Requested by aklein on #webkit).
+
+ * UIProcess/API/mac/PageClientImpl.h:
+ * UIProcess/API/mac/PageClientImpl.mm:
+ * UIProcess/PageClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * WebProcess/Plugins/PDF/BuiltInPDFView.cpp:
+ (WebKit::BuiltInPDFView::scrollbarStyleChanged):
+ * WebProcess/Plugins/PDF/BuiltInPDFView.h:
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+
2011-11-18 Igor Oliveira <[email protected]>
[WK2][Qt] Move Accelerated Composite animations to UIProcess
Modified: trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h (100841 => 100842)
--- trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h 2011-11-19 03:05:27 UTC (rev 100841)
+++ trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h 2011-11-19 03:18:49 UTC (rev 100842)
@@ -122,8 +122,6 @@
virtual String dismissCorrectionPanelSoon(WebCore::ReasonForDismissingCorrectionPanel);
virtual void recordAutocorrectionResponse(WebCore::EditorClient::AutocorrectionResponseType, const String& replacedString, const String& replacementString);
- virtual void recommendedScrollbarStyleDidChange(int32_t newStyle);
-
virtual WKView* wkView() const { return m_wkView; }
WKView* m_wkView;
Modified: trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm (100841 => 100842)
--- trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm 2011-11-19 03:05:27 UTC (rev 100841)
+++ trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm 2011-11-19 03:18:49 UTC (rev 100842)
@@ -460,34 +460,6 @@
#endif
}
-void PageClientImpl::recommendedScrollbarStyleDidChange(int32_t newStyle)
-{
-#if !defined(BUILDING_ON_SNOW_LEOPARD)
- NSArray *trackingAreas = [m_wkView trackingAreas];
- NSUInteger count = [trackingAreas count];
- ASSERT(count == 1);
-
- for (NSUInteger i = 0; i < count; ++i)
- [m_wkView removeTrackingArea:[trackingAreas objectAtIndex:i]];
-
- // Now re-create a tracking area with the appropriate options given the new scrollbar style
- NSTrackingAreaOptions options = NSTrackingMouseMoved | NSTrackingMouseEnteredAndExited | NSTrackingInVisibleRect;
- if (newStyle == NSScrollerStyleLegacy)
- options |= NSTrackingActiveAlways;
- else
- options |= NSTrackingActiveInKeyWindow;
-
- NSTrackingArea *trackingArea = [[NSTrackingArea alloc] initWithRect:[m_wkView frame]
- options:options
- owner:m_wkView
- userInfo:nil];
- [m_wkView addTrackingArea:trackingArea];
- [trackingArea release];
-#else
- UNUSED_PARAM(newStyle);
-#endif
-}
-
bool PageClientImpl::executeSavedCommandBySelector(const String& selectorString)
{
return [m_wkView _executeSavedCommandBySelector:NSSelectorFromString(selectorString)];
Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (100841 => 100842)
--- trunk/Source/WebKit2/UIProcess/PageClient.h 2011-11-19 03:05:27 UTC (rev 100841)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2011-11-19 03:18:49 UTC (rev 100842)
@@ -177,7 +177,6 @@
virtual void dismissCorrectionPanel(WebCore::ReasonForDismissingCorrectionPanel) = 0;
virtual String dismissCorrectionPanelSoon(WebCore::ReasonForDismissingCorrectionPanel) = 0;
virtual void recordAutocorrectionResponse(WebCore::EditorClient::AutocorrectionResponseType, const String& replacedString, const String& replacementString) = 0;
- virtual void recommendedScrollbarStyleDidChange(int32_t newStyle) = 0;
virtual WKView* wkView() const = 0;
#endif
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (100841 => 100842)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2011-11-19 03:05:27 UTC (rev 100841)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2011-11-19 03:18:49 UTC (rev 100842)
@@ -3300,13 +3300,6 @@
m_visibleScrollerThumbRect = scrollerThumb;
}
-void WebPageProxy::recommendedScrollbarStyleDidChange(int32_t newStyle)
-{
-#if PLATFORM(MAC)
- m_pageClient->recommendedScrollbarStyleDidChange(newStyle);
-#endif
-}
-
void WebPageProxy::didChangeScrollbarsForMainFrame(bool hasHorizontalScrollbar, bool hasVerticalScrollbar)
{
m_mainFrameHasHorizontalScrollbar = hasHorizontalScrollbar;
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (100841 => 100842)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2011-11-19 03:05:27 UTC (rev 100841)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2011-11-19 03:18:49 UTC (rev 100842)
@@ -670,7 +670,6 @@
void requestGeolocationPermissionForFrame(uint64_t geolocationID, uint64_t frameID, String originIdentifier);
void runModal();
void notifyScrollerThumbIsVisibleInRect(const WebCore::IntRect&);
- void recommendedScrollbarStyleDidChange(int32_t newStyle);
void didChangeScrollbarsForMainFrame(bool hasHorizontalScrollbar, bool hasVerticalScrollbar);
void didChangeScrollOffsetPinningForMainFrame(bool pinnedToLeftSide, bool pinnedToRightSide);
void didChangePageCount(unsigned);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (100841 => 100842)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2011-11-19 03:05:27 UTC (rev 100841)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2011-11-19 03:18:49 UTC (rev 100842)
@@ -61,7 +61,6 @@
PrintFrame(uint64_t frameID) -> ()
RunModal()
NotifyScrollerThumbIsVisibleInRect(WebCore::IntRect scrollerThumb)
- RecommendedScrollbarStyleDidChange(int32_t newStyle)
DidChangeScrollbarsForMainFrame(bool hasHorizontalScrollbar, bool hasVerticalScrollbar)
DidChangeScrollOffsetPinningForMainFrame(bool hasHorizontalScrollbar, bool hasVerticalScrollbar)
DidChangePageCount(unsigned pageCount);
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.cpp (100841 => 100842)
--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.cpp 2011-11-19 03:05:27 UTC (rev 100841)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.cpp 2011-11-19 03:18:49 UTC (rev 100842)
@@ -672,11 +672,8 @@
return !pluginView()->frame()->document()->inPageCache();
}
-void BuiltInPDFView::scrollbarStyleChanged(int, bool forceUpdate)
+void BuiltInPDFView::scrollbarStyleChanged()
{
- if (!forceUpdate)
- return;
-
// If the PDF was scrolled all the way to bottom right and scrollbars change to overlay style, we don't want to display white rectangles where scrollbars were.
IntPoint newScrollOffset = IntPoint(m_scrollOffset).shrunkTo(maximumScrollPosition());
setScrollOffset(newScrollOffset);
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h (100841 => 100842)
--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h 2011-11-19 03:05:27 UTC (rev 100841)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h 2011-11-19 03:18:49 UTC (rev 100842)
@@ -134,7 +134,7 @@
virtual bool isOnActivePage() const;
virtual void disconnectFromPage() { m_page = 0; }
virtual bool shouldSuspendScrollAnimations() const { return false; } // If we return true, ScrollAnimatorMac will keep cycling a timer forever, waiting for a good time to animate.
- virtual void scrollbarStyleChanged(int newStyle, bool forceUpdate);
+ virtual void scrollbarStyleChanged();
virtual void zoomAnimatorTransformChanged(float, float, float, ZoomAnimationState) { }
// FIXME: Implement the other conversion functions; this one is enough to get scrollbar hit testing working.
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (100841 => 100842)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2011-11-19 03:05:27 UTC (rev 100841)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2011-11-19 03:18:49 UTC (rev 100842)
@@ -785,11 +785,6 @@
m_page->send(Messages::WebPageProxy::NotifyScrollerThumbIsVisibleInRect(scrollerThumb));
}
-void WebChromeClient::recommendedScrollbarStyleDidChange(int32_t newStyle)
-{
- m_page->send(Messages::WebPageProxy::RecommendedScrollbarStyleDidChange(newStyle));
-}
-
bool WebChromeClient::shouldRubberBandInDirection(WebCore::ScrollDirection direction) const
{
ASSERT(direction != WebCore::ScrollUp && direction != WebCore::ScrollDown);
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (100841 => 100842)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2011-11-19 03:05:27 UTC (rev 100841)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2011-11-19 03:18:49 UTC (rev 100842)
@@ -214,7 +214,6 @@
virtual void didCompleteAnimatedScroll() const OVERRIDE;
virtual void notifyScrollerThumbIsVisibleInRect(const WebCore::IntRect&) OVERRIDE;
- virtual void recommendedScrollbarStyleDidChange(int32_t newStyle) OVERRIDE;
virtual bool shouldRubberBandInDirection(WebCore::ScrollDirection) const OVERRIDE;
virtual void numWheelEventHandlersChanged(unsigned) OVERRIDE;
