Changeset 75054 in webkit

Timestamp:

Jan 5, 2011 1:32:57 AM (13 years ago)

Author:

ap@apple.com

Message:

2011-01-05 Alexey Proskuryakov <​ap@apple.com>

Reviewed by Sam Weinig.

​https://bugs.webkit.org/show_bug.cgi?id=51903
Tell UI process which subframe is largest

• WebCore.exp.in: Exported FrameView::contentsSize().

2011-01-05 Alexey Proskuryakov <​ap@apple.com>

Reviewed by Sam Weinig.

​https://bugs.webkit.org/show_bug.cgi?id=51903
Tell UI process which subframe is largest

• UIProcess/WebPageProxy.h: (WebKit::WebPageProxy::frameSetLargestFrame): Remember largest frame in frameset pages.

• UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::frameDidBecomeFrameSet): Reset stored largest frame if main frame changes to a frameset or back. (WebKit::WebPageProxy::frameSetLargestFrameChanged): Store a new largest frame when notified of a change.

• UIProcess/WebPageProxy.messages.in: Added FrameSetLargestFrameChanged.

• WebProcess/WebCoreSupport/WebChromeClient.cpp: (WebKit::area): Calculate area of a frame. (WebKit::findLargestFrameInFrameSet): Find largest first-level subframe in a frameset page. (WebKit::WebChromeClient::contentsSizeChanged): Recalculate largest frame, and notify UI process if it changed.

• WebProcess/WebCoreSupport/WebChromeClient.h: Store the latest largest frame.

• WebProcess/WebPage/WebFrame.cpp: (WebKit::WebFrame::size):
• WebProcess/WebPage/WebFrame.h: Expose frame size.

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/WebPageProxy.cpp (modified) (2 diffs)
• WebKit2/UIProcess/WebPageProxy.h (modified) (3 diffs)
• WebKit2/UIProcess/WebPageProxy.messages.in (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (modified) (2 diffs)
• WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (modified) (2 diffs)
• WebKit2/WebProcess/WebPage/WebFrame.cpp (modified) (2 diffs)
• WebKit2/WebProcess/WebPage/WebFrame.h (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2011-01-05  Alexey Proskuryakov  <ap@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        https://bugs.webkit.org/show_bug.cgi?id=51903
+        Tell UI process which subframe is largest
+
+        * WebCore.exp.in: Exported FrameView::contentsSize().
+
 2011-01-04  Chris Fleizach  <cfleizach@apple.com>
 

trunk/WebCore/WebCore.exp.in

@@ -943 +943 @@
 __ZNK7WebCore10RenderText9firstRunXEv
 __ZNK7WebCore10RenderText9firstRunYEv
+__ZNK7WebCore10ScrollView12contentsSizeEv
 __ZNK7WebCore10ScrollView12documentViewEv
 __ZNK7WebCore10ScrollView14scrollbarModesERNS_13ScrollbarModeES2_

trunk/WebKit2/ChangeLog

@@ +1 @@
+2011-01-05  Alexey Proskuryakov  <ap@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        https://bugs.webkit.org/show_bug.cgi?id=51903
+        Tell UI process which subframe is largest
+
+        * UIProcess/WebPageProxy.h:
+        (WebKit::WebPageProxy::frameSetLargestFrame):
+        Remember largest frame in frameset pages.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::frameDidBecomeFrameSet): Reset stored largest frame if main frame
+        changes to a frameset or back.
+        (WebKit::WebPageProxy::frameSetLargestFrameChanged): Store a new largest frame when notified
+        of a change.
+
+        * UIProcess/WebPageProxy.messages.in: Added FrameSetLargestFrameChanged.
+
+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+        (WebKit::area): Calculate area of a frame.
+        (WebKit::findLargestFrameInFrameSet): Find largest first-level subframe in a frameset page.
+        (WebKit::WebChromeClient::contentsSizeChanged): Recalculate largest frame, and notify UI
+        process if it changed.
+
+        * WebProcess/WebCoreSupport/WebChromeClient.h: Store the latest largest frame.
+
+        * WebProcess/WebPage/WebFrame.cpp: (WebKit::WebFrame::size):
+        * WebProcess/WebPage/WebFrame.h:
+        Expose frame size.
+
 2011-01-04  Benjamin Poulain  <benjamin.poulain@nokia.com>
 

trunk/WebKit2/UIProcess/WebPageProxy.cpp

@@ -1217 +1217 @@
 
     frame->setIsFrameSet(value);
+    if (frame->isMainFrame())
+        m_frameSetLargestFrame = value ? m_mainFrame : 0;
 }
 
@@ -1917 +1919 @@
 }
 
+void WebPageProxy::frameSetLargestFrameChanged(uint64_t frameID)
+{
+    if (!frameID) {
+        m_frameSetLargestFrame = 0;
+        return;
+    }
+
+    WebFrameProxy* frame = process()->webFrame(frameID);
+    MESSAGE_CHECK(frame);
+
+    m_frameSetLargestFrame = frame;
+}
+
 #if USE(ACCELERATED_COMPOSITING)
 void WebPageProxy::didChangeAcceleratedCompositing(bool compositing, DrawingAreaInfo& drawingAreaInfo)

trunk/WebKit2/UIProcess/WebPageProxy.h

@@ -113 +113 @@
     WebFrameProxy* mainFrame() const { return m_mainFrame.get(); }
     WebFrameProxy* focusedFrame() const { return m_focusedFrame.get(); }
+    WebFrameProxy* frameSetLargestFrame() const { return m_frameSetLargestFrame.get(); }
 
     DrawingAreaProxy* drawingArea() { return m_drawingArea.get(); }
@@ -447 +448 @@
 
     void focusedFrameChanged(uint64_t frameID);
+    void frameSetLargestFrameChanged(uint64_t frameID);
 
 #if USE(ACCELERATED_COMPOSITING)
@@ -477 +479 @@
     RefPtr<WebFrameProxy> m_mainFrame;
     RefPtr<WebFrameProxy> m_focusedFrame;
+    RefPtr<WebFrameProxy> m_frameSetLargestFrame;
 
     String m_userAgent;

trunk/WebKit2/UIProcess/WebPageProxy.messages.in

@@ -39 +39 @@
     TakeFocus(bool direction)
     FocusedFrameChanged(uint64_t frameID)
+    FrameSetLargestFrameChanged(uint64_t frameID)
     SetToolbarsAreVisible(bool toolbarsAreVisible)
     GetToolbarsAreVisible() -> (bool toolbarsAreVisible)

trunk/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp

@@ -60 +60 @@
 namespace WebKit {
 
+static double area(WebFrame* frame)
+{
+    IntSize size = frame->size();
+    return static_cast<double>(size.height()) * size.width();
+}
+
+
+static WebFrame* findLargestFrameInFrameSet(WebPage* page)
+{
+    WebFrame* mainFrame = page->mainFrame();
+    if (!mainFrame->isFrameSet())
+        return 0;
+
+    WebFrame* largestSoFar = 0;
+
+    RefPtr<ImmutableArray> frameChildren = mainFrame->childFrames();
+    size_t count = frameChildren->size();
+    for (size_t i = 0; i < count; ++i) {
+        WebFrame* childFrame = frameChildren->at<WebFrame>(i);
+        if (!largestSoFar || area(childFrame) > area(largestSoFar))
+            largestSoFar = childFrame;
+    }
+
+    return largestSoFar;
+}
+
 void WebChromeClient::chromeDestroyed()
 {
@@ -385 +411 @@
     m_page->send(Messages::WebPageProxy::DidChangeContentsSize(size));
 #endif
+
+    WebFrame* largestFrame = findLargestFrameInFrameSet(m_page);
+    if (largestFrame != m_cachedFrameSetLargestFrame.get()) {
+        m_cachedFrameSetLargestFrame = largestFrame;
+        WebProcess::shared().connection()->send(Messages::WebPageProxy::FrameSetLargestFrameChanged(largestFrame ? largestFrame->frameID() : 0), m_page->pageID());
+    }
 }
 

trunk/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h

@@ -34 +34 @@
 namespace WebKit {
 
+class WebFrame;
 class WebPage;
 
@@ -203 +204 @@
 
     String m_cachedToolTip;
+    mutable RefPtr<WebFrame> m_cachedFrameSetLargestFrame;
     WebPage* m_page;
 };

trunk/WebKit2/WebProcess/WebPage/WebFrame.cpp

@@ -42 +42 @@
 #include <WebCore/DocumentLoader.h>
 #include <WebCore/Frame.h>
+#include <WebCore/FrameView.h>
 #include <WebCore/HTMLFrameOwnerElement.h>
 #include <WebCore/JSCSSStyleDeclaration.h>
@@ -288 +289 @@
 }
 
+IntSize WebFrame::size() const
+{
+    if (!m_coreFrame)
+        return IntSize();
+
+    FrameView* frameView = m_coreFrame->view();
+    if (!frameView)
+        return IntSize();
+
+    return frameView->contentsSize();
+}
+
 bool WebFrame::isFrameSet() const
 {

trunk/WebKit2/WebProcess/WebPage/WebFrame.h

@@ -78 +78 @@
     String selectionAsString() const;
 
+    WebCore::IntSize size() const;
+
     // WKBundleFrame API and SPI functions
     bool isMainFrame() const;
@@ -83 +85 @@
     String url() const;
     String innerText() const;
+    bool isFrameSet() const;
     PassRefPtr<ImmutableArray> childFrames();
     JSValueRef computedStyleIncludingVisitedInfo(JSObjectRef element);
@@ -123 +126 @@
     virtual Type type() const { return APIType; }
 
-    bool isFrameSet() const;
-
     WebCore::Frame* m_coreFrame;