Changeset 85806 in webkit

Timestamp:

May 4, 2011 4:42:02 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-05-04 Anders Carlsson <​andersca@apple.com>

Reviewed by Darin Adler.

Add bundle API for making a page paint as the background of another page
​https://bugs.webkit.org/show_bug.cgi?id=60227

• WebProcess/InjectedBundle/API/c/WKBundlePage.cpp: (WKBundlePageSetUnderlayPage): Call WebPage::setUnderlayPage.

• WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::close): Null out the underlay page.

(WebKit::WebPage::layoutIfNeeded):
Layout the underlay page if necessary.

(WebKit::WebPage::drawRect):
Draw the underlay page.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/InjectedBundle/API/c/WKBundlePage.cpp (modified) (1 diff)
• WebProcess/InjectedBundle/API/c/WKBundlePage.h (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (3 diffs)
• WebProcess/WebPage/WebPage.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-04  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Add bundle API for making a page paint as the background of another page
+        https://bugs.webkit.org/show_bug.cgi?id=60227
+
+        * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+        (WKBundlePageSetUnderlayPage):
+        Call WebPage::setUnderlayPage.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::close):
+        Null out the underlay page.
+
+        (WebKit::WebPage::layoutIfNeeded):
+        Layout the underlay page if necessary.
+
+        (WebKit::WebPage::drawRect):
+        Draw the underlay page.
+
 2011-05-04  Siddharth Mathur  <siddharth.mathur@nokia.com>
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp

@@ -208 +208 @@
 }
 
+void WKBundlePageSetUnderlayPage(WKBundlePageRef pageRef, WKBundlePageRef pageUnderlayRef)
+{
+    toImpl(pageRef)->setUnderlayPage(toImpl(pageUnderlayRef));
+}
+
 void WKBundlePageInstallPageOverlay(WKBundlePageRef pageRef, WKBundlePageOverlayRef pageOverlayRef)
 {

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h

@@ -286 +286 @@
 WK_EXPORT WKBundleBackForwardListRef WKBundlePageGetBackForwardList(WKBundlePageRef page);
 
+WK_EXPORT void WKBundlePageSetUnderlayPage(WKBundlePageRef page, WKBundlePageRef pageUnderlay);
+
 WK_EXPORT void WKBundlePageInstallPageOverlay(WKBundlePageRef page, WKBundlePageOverlayRef pageOverlay);
 WK_EXPORT void WKBundlePageUninstallPageOverlay(WKBundlePageRef page, WKBundlePageOverlayRef pageOverlay);

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -424 +424 @@
     m_sandboxExtensionTracker.invalidate();
 
+    m_underlayPage = nullptr;
     m_printContext = nullptr;
-
     m_mainFrame->coreFrame()->loader()->detachFromParent();
-    m_page.clear();
-
-    m_drawingArea.clear();
+    m_page = nullptr;
+    m_drawingArea = nullptr;
 
     bool isRunningModal = m_isRunningModal;
@@ -584 +583 @@
     if (m_mainFrame->coreFrame()->view())
         m_mainFrame->coreFrame()->view()->updateLayoutAndStyleIfNeededRecursive();
+
+    if (m_underlayPage) {
+        if (FrameView *frameView = m_underlayPage->mainFrame()->coreFrame()->view())
+            frameView->updateLayoutAndStyleIfNeededRecursive();
+    }
 }
 
@@ -677 +681 @@
     GraphicsContextStateSaver stateSaver(graphicsContext);
     graphicsContext.clip(rect);
+
+    if (m_underlayPage) {
+        GraphicsContextStateSaver stateSaver(graphicsContext);
+        m_underlayPage->drawRect(graphicsContext, rect);
+    }
+
     m_mainFrame->coreFrame()->view()->paint(&graphicsContext, rect);
 }

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

@@ -213 +213 @@
 #endif
 
+    void setUnderlayPage(PassRefPtr<WebPage> underlayPage) { m_underlayPage = underlayPage; }
+
     bool findStringFromInjectedBundle(const String&, FindOptions);
 
@@ -631 +633 @@
     RefPtr<PageOverlay> m_pageOverlay;
 
+    RefPtr<WebPage> m_underlayPage;
+
 #if ENABLE(INSPECTOR)
     RefPtr<WebInspector> m_inspector;