Diff
Modified: trunk/Source/WebKit2/ChangeLog (157995 => 157996)
--- trunk/Source/WebKit2/ChangeLog 2013-10-25 08:32:50 UTC (rev 157995)
+++ trunk/Source/WebKit2/ChangeLog 2013-10-25 08:44:19 UTC (rev 157996)
@@ -1,3 +1,30 @@
+2013-10-25 Ryuan Choi <[email protected]>
+
+ [EFL][WK2] Build break after r157967 and r157972
+ https://bugs.webkit.org/show_bug.cgi?id=123324
+
+ Reviewed by Tim Horton.
+
+ Since r157967 and r157972, visibilityDidChange was removed from DrawingAreaProxy.
+
+ * UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp:
+ (WebKit::CoordinatedDrawingAreaProxy::visibilityDidChange):
+ Removed common logic which r157967 moved to WebProcess.
+ * UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.h:
+ Make visibilityDidChange to public method.
+ * UIProcess/CoordinatedGraphics/WebView.cpp:
+ (WebKit::WebView::setVisible):
+ (WebKit::WebView::isWindowVisible): Added.
+ * UIProcess/CoordinatedGraphics/WebView.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+ (WebKit::WebPage::setWindowIsVisible):
+ * WebProcess/WebPage/WebPage.h:
+ Moved m_windowIsVisible to use at all WK2 based port.
+ (WebKit::WebPage::windowIsVisible):
+ * WebProcess/WebPage/WebPage.messages.in:
+ Moved SetWindowIsVisible message to use at all WK2 based port.
+
2013-10-24 Mark Rowe <[email protected]>
Remove references to OS X 10.7 from Xcode configuration settings.
Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp (157995 => 157996)
--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp 2013-10-25 08:32:50 UTC (rev 157995)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp 2013-10-25 08:44:19 UTC (rev 157996)
@@ -125,26 +125,15 @@
m_webPageProxy->process()->send(Messages::DrawingArea::SetLayerHostingMode(m_webPageProxy->layerHostingMode()), m_webPageProxy->pageID());
}
+#if USE(ACCELERATED_COMPOSITING)
void CoordinatedDrawingAreaProxy::visibilityDidChange()
{
- if (!m_webPageProxy->suppressVisibilityUpdates()) {
- if (!m_webPageProxy->isViewVisible()) {
- // Suspend painting.
- m_webPageProxy->process()->send(Messages::DrawingArea::SuspendPainting(), m_webPageProxy->pageID());
- return;
- }
-
- // Resume painting.
- m_webPageProxy->process()->send(Messages::DrawingArea::ResumePainting(), m_webPageProxy->pageID());
- }
-
-#if USE(ACCELERATED_COMPOSITING)
// If we don't have a backing store, go ahead and mark the backing store as being changed so
// that when paint we'll actually wait for something to paint and not flash white.
if (!m_backingStore && m_layerTreeContext.isEmpty())
backingStoreStateDidChange(DoNotRespondImmediately);
-#endif
}
+#endif
void CoordinatedDrawingAreaProxy::setBackingStoreIsDiscardable(bool isBackingStoreDiscardable)
{
Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.h (157995 => 157996)
--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.h 2013-10-25 08:32:50 UTC (rev 157995)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.h 2013-10-25 08:44:19 UTC (rev 157996)
@@ -52,6 +52,7 @@
#if USE(ACCELERATED_COMPOSITING)
bool isInAcceleratedCompositingMode() const { return !m_layerTreeContext.isEmpty(); }
+ void visibilityDidChange();
#endif
bool hasReceivedFirstUpdate() const { return m_hasReceivedFirstUpdate; }
@@ -62,7 +63,6 @@
virtual void deviceScaleFactorDidChange();
virtual void layerHostingModeDidChange() OVERRIDE;
- virtual void visibilityDidChange();
virtual void setBackingStoreIsDiscardable(bool);
virtual void waitForBackingStoreUpdateOnNextPaint();
Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp (157995 => 157996)
--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp 2013-10-25 08:32:50 UTC (rev 157995)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp 2013-10-25 08:44:19 UTC (rev 157996)
@@ -112,6 +112,11 @@
m_visible = visible;
m_page->viewStateDidChange(WebPageProxy::ViewIsVisible);
+
+#if USE(ACCELERATED_COMPOSITING)
+ if (CoordinatedDrawingAreaProxy* drawingArea = static_cast<CoordinatedDrawingAreaProxy*>(page()->drawingArea()))
+ drawingArea->visibilityDidChange();
+#endif
}
void WebView::setUserViewportTranslation(double tx, double ty)
@@ -331,6 +336,12 @@
return isVisible();
}
+bool WebView::isWindowVisible()
+{
+ notImplemented();
+ return true;
+}
+
bool WebView::isViewInWindow()
{
notImplemented();
Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h (157995 => 157996)
--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h 2013-10-25 08:32:50 UTC (rev 157995)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h 2013-10-25 08:44:19 UTC (rev 157996)
@@ -136,6 +136,7 @@
virtual bool isViewWindowActive() OVERRIDE;
virtual bool isViewFocused() OVERRIDE;
virtual bool isViewVisible() OVERRIDE;
+ virtual bool isWindowVisible() OVERRIDE;
virtual bool isViewInWindow() OVERRIDE;
virtual void processDidCrash() OVERRIDE;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (157995 => 157996)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-10-25 08:32:50 UTC (rev 157995)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-10-25 08:44:19 UTC (rev 157996)
@@ -231,6 +231,7 @@
, m_artificialPluginInitializationDelayEnabled(false)
, m_scrollingPerformanceLoggingEnabled(false)
, m_mainFrameIsScrollable(true)
+ , m_windowIsVisible(false)
#if ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)
, m_readyToFindPrimarySnapshottedPlugin(false)
, m_didFindPrimarySnapshottedPlugin(false)
@@ -240,7 +241,6 @@
#if PLATFORM(MAC)
, m_pdfPluginEnabled(false)
, m_hasCachedWindowFrame(false)
- , m_windowIsVisible(false)
, m_layerHostingMode(parameters.layerHostingMode)
, m_keyboardEventBeingInterpreted(0)
#elif PLATFORM(GTK)
@@ -2943,18 +2943,20 @@
send(Messages::WebPageProxy::SetWindowFrame(windowFrame));
}
-#if PLATFORM(MAC)
void WebPage::setWindowIsVisible(bool windowIsVisible)
{
m_windowIsVisible = windowIsVisible;
corePage()->focusController().setContainingWindowIsVisible(windowIsVisible);
+#if PLATFORM(MAC)
// Tell all our plug-in views that the window visibility changed.
for (HashSet<PluginView*>::const_iterator it = m_pluginViews.begin(), end = m_pluginViews.end(); it != end; ++it)
(*it)->setWindowIsVisible(windowIsVisible);
+#endif
}
+#if PLATFORM(MAC)
void WebPage::windowAndViewFramesChanged(const FloatRect& windowFrameInScreenCoordinates, const FloatRect& windowFrameInUnflippedScreenCoordinates, const FloatRect& viewFrameInWindowCoordinates, const FloatPoint& accessibilityViewCoordinates)
{
m_windowFrameInScreenCoordinates = windowFrameInScreenCoordinates;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (157995 => 157996)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2013-10-25 08:32:50 UTC (rev 157995)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2013-10-25 08:44:19 UTC (rev 157996)
@@ -333,11 +333,12 @@
void addPluginView(PluginView*);
void removePluginView(PluginView*);
+ bool windowIsVisible() const { return m_windowIsVisible; }
+
#if PLATFORM(MAC)
LayerHostingMode layerHostingMode() const { return m_layerHostingMode; }
void setLayerHostingMode(LayerHostingMode);
- bool windowIsVisible() const { return m_windowIsVisible; }
void updatePluginsActiveAndFocusedState();
const WebCore::FloatRect& windowFrameInScreenCoordinates() const { return m_windowFrameInScreenCoordinates; }
const WebCore::FloatRect& windowFrameInUnflippedScreenCoordinates() const { return m_windowFrameInUnflippedScreenCoordinates; }
@@ -679,6 +680,7 @@
void setActive(bool);
void setFocused(bool);
void setViewIsVisible(bool);
+ void setWindowIsVisible(bool);
void setInitialFocus(bool forward, bool isKeyboardEventValid, const WebKeyboardEvent&);
void setWindowResizerSize(const WebCore::IntSize&);
void setIsInWindow(bool isInWindow, bool wantsDidUpdateViewInWindowState = false);
@@ -742,7 +744,6 @@
void performDictionaryLookupAtLocation(const WebCore::FloatPoint&);
void performDictionaryLookupForRange(WebCore::Frame*, WebCore::Range*, NSDictionary *options);
- void setWindowIsVisible(bool windowIsVisible);
void windowAndViewFramesChanged(const WebCore::FloatRect& windowFrameInScreenCoordinates, const WebCore::FloatRect& windowFrameInUnflippedScreenCoordinates, const WebCore::FloatRect& viewFrameInWindowCoordinates, const WebCore::FloatPoint& accessibilityViewCoordinates);
RetainPtr<PDFDocument> pdfDocumentForPrintingFrame(WebCore::Frame*);
@@ -849,6 +850,9 @@
bool m_mainFrameIsScrollable;
+ // Whether the containing window is visible or not.
+ bool m_windowIsVisible;
+
#if ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)
bool m_readyToFindPrimarySnapshottedPlugin;
bool m_didFindPrimarySnapshottedPlugin;
@@ -864,9 +868,6 @@
bool m_hasCachedWindowFrame;
- // Whether the containing window is visible or not.
- bool m_windowIsVisible;
-
// The frame of the containing window in screen coordinates.
WebCore::FloatRect m_windowFrameInScreenCoordinates;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (157995 => 157996)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2013-10-25 08:32:50 UTC (rev 157995)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2013-10-25 08:44:19 UTC (rev 157996)
@@ -245,11 +245,12 @@
CancelComposition()
#endif
+ SetWindowIsVisible(bool windowIsVisible)
+
#if PLATFORM(MAC)
# Complex text input support for plug-ins.
SendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, String textInput)
- SetWindowIsVisible(bool windowIsVisible)
WindowAndViewFramesChanged(WebCore::FloatRect windowFrameInScreenCoordinates, WebCore::FloatRect windowFrameInUnflippedScreenCoordinates, WebCore::FloatRect viewFrameInWindowCoordinates, WebCore::FloatPoint accessibilityViewCoordinates)
ViewExposedRectChanged(WebCore::FloatRect exposedRect, bool clipsToExposedRect)
SetMainFrameIsScrollable(bool isScrollable)
