[webkit-changes] [87449] trunk/Source

Thu, 26 May 2011 16:47:38 -0700

Title: [87449] trunk/Source
Revision
87449
Author
[email protected]
Date
2011-05-26 16:47:32 -0700 (Thu, 26 May 2011)

Log Message

2011-05-26  Sheriff Bot  <[email protected]>

        Unreviewed, rolling out r87444.
        http://trac.webkit.org/changeset/87444
        https://bugs.webkit.org/show_bug.cgi?id=61582

        Layout test regressions in Chromium/WebKit: fast/css/first-
        letter-text-fragment-crash.html, fast/css/first-letter-
        visibility.html (Requested by aklein on #webkit).

        * page/Chrome.cpp:
        * page/Chrome.h:
        * page/ChromeClient.h:
        * page/FrameView.cpp:
        (WebCore::FrameView::setContentsSize):
        * page/FrameView.h:
2011-05-26  Sheriff Bot  <[email protected]>

        Unreviewed, rolling out r87444.
        http://trac.webkit.org/changeset/87444
        https://bugs.webkit.org/show_bug.cgi?id=61582

        Layout test regressions in Chromium/WebKit: fast/css/first-
        letter-text-fragment-crash.html, fast/css/first-letter-
        visibility.html (Requested by aklein on #webkit).

        * public/WebFrameClient.h:
        * src/ChromeClientImpl.cpp:
        * src/ChromeClientImpl.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (87448 => 87449)


--- trunk/Source/WebCore/ChangeLog	2011-05-26 23:39:22 UTC (rev 87448)
+++ trunk/Source/WebCore/ChangeLog	2011-05-26 23:47:32 UTC (rev 87449)
@@ -1,3 +1,20 @@
+2011-05-26  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r87444.
+        http://trac.webkit.org/changeset/87444
+        https://bugs.webkit.org/show_bug.cgi?id=61582
+
+        Layout test regressions in Chromium/WebKit: fast/css/first-
+        letter-text-fragment-crash.html, fast/css/first-letter-
+        visibility.html (Requested by aklein on #webkit).
+
+        * page/Chrome.cpp:
+        * page/Chrome.h:
+        * page/ChromeClient.h:
+        * page/FrameView.cpp:
+        (WebCore::FrameView::setContentsSize):
+        * page/FrameView.h:
+
 2011-05-26  David Levin  <[email protected]>
 
         Reviewed by Darin Fisher.

Modified: trunk/Source/WebCore/page/Chrome.cpp (87448 => 87449)


--- trunk/Source/WebCore/page/Chrome.cpp	2011-05-26 23:39:22 UTC (rev 87448)
+++ trunk/Source/WebCore/page/Chrome.cpp	2011-05-26 23:47:32 UTC (rev 87449)
@@ -114,11 +114,6 @@
     m_client->contentsSizeChanged(frame, size);
 }
 
-void Chrome::contentsPreferredSizeChanged(Frame* frame, const IntSize& size) const
-{
-    m_client->contentsPreferredSizeChanged(frame, size);
-}
-
 void Chrome::scrollRectIntoView(const IntRect& rect) const
 {
     // FIXME: The unused ScrollView* argument can and should be removed from ChromeClient::scrollRectIntoView.

Modified: trunk/Source/WebCore/page/Chrome.h (87448 => 87449)


--- trunk/Source/WebCore/page/Chrome.h	2011-05-26 23:39:22 UTC (rev 87448)
+++ trunk/Source/WebCore/page/Chrome.h	2011-05-26 23:47:32 UTC (rev 87449)
@@ -84,7 +84,6 @@
         void scrollRectIntoView(const IntRect&) const;
 
         void contentsSizeChanged(Frame*, const IntSize&) const;
-        void contentsPreferredSizeChanged(Frame*, const IntSize&) const;
 
         void setWindowRect(const FloatRect&) const;
         FloatRect windowRect() const;

Modified: trunk/Source/WebCore/page/ChromeClient.h (87448 => 87449)


--- trunk/Source/WebCore/page/ChromeClient.h	2011-05-26 23:39:22 UTC (rev 87448)
+++ trunk/Source/WebCore/page/ChromeClient.h	2011-05-26 23:47:32 UTC (rev 87449)
@@ -161,7 +161,6 @@
         virtual void dispatchViewportDataDidChange(const ViewportArguments&) const { }
 
         virtual void contentsSizeChanged(Frame*, const IntSize&) const = 0;
-        virtual void contentsPreferredSizeChanged(Frame*, const IntSize&) const { }
         virtual void scrollRectIntoView(const IntRect&, const ScrollView*) const = 0; // Currently only Mac has a non empty implementation.
        
         virtual bool shouldMissingPluginMessageBeButton() const { return false; }

Modified: trunk/Source/WebCore/page/FrameView.cpp (87448 => 87449)


--- trunk/Source/WebCore/page/FrameView.cpp	2011-05-26 23:39:22 UTC (rev 87448)
+++ trunk/Source/WebCore/page/FrameView.cpp	2011-05-26 23:47:32 UTC (rev 87449)
@@ -475,35 +475,24 @@
 
 void FrameView::setContentsSize(const IntSize& size)
 {
-    bool contentsSizeChanged = size != contentsSize();
-    Page* page = frame() ? frame()->page() : 0;
-    if (contentsSizeChanged) {
-        m_deferSetNeedsLayouts++;
+    if (size == contentsSize())
+        return;
 
-        ScrollView::setContentsSize(size);
-        scrollAnimator()->contentsResized();
-        if (page)
-            page->chrome()->contentsSizeChanged(frame(), size); // notify only
-    }
+    m_deferSetNeedsLayouts++;
 
-    if (page) {
-        Document* document = frame()->document();
-        if (document && document->renderView() && document->documentElement()) {
-            IntSize preferedSize(document->renderView()->minPreferredLogicalWidth(),
-                                 document->documentElement()->scrollHeight());
-            if (preferedSize != m_lastPreferedSize) {
-                m_lastPreferedSize = preferedSize;
-                page->chrome()->contentsPreferredSizeChanged(frame(), preferedSize);
-            }
-        }
-    }
+    ScrollView::setContentsSize(size);
+    scrollAnimator()->contentsResized();
+    
+    Page* page = frame() ? frame()->page() : 0;
+    if (!page)
+        return;
 
-    if (contentsSizeChanged) {
-        m_deferSetNeedsLayouts--;
+    page->chrome()->contentsSizeChanged(frame(), size); //notify only
 
-        if (!m_deferSetNeedsLayouts)
-            m_setNeedsLayoutWasDeferred = false; // FIXME: Find a way to make the deferred layout actually happen.
-    }
+    m_deferSetNeedsLayouts--;
+    
+    if (!m_deferSetNeedsLayouts)
+        m_setNeedsLayoutWasDeferred = false; // FIXME: Find a way to make the deferred layout actually happen.
 }
 
 void FrameView::adjustViewSize()

Modified: trunk/Source/WebCore/page/FrameView.h (87448 => 87449)


--- trunk/Source/WebCore/page/FrameView.h	2011-05-26 23:39:22 UTC (rev 87448)
+++ trunk/Source/WebCore/page/FrameView.h	2011-05-26 23:47:32 UTC (rev 87449)
@@ -392,7 +392,6 @@
     bool m_isTransparent;
     Color m_baseBackgroundColor;
     IntSize m_lastLayoutSize;
-    IntSize m_lastPreferedSize;
     float m_lastZoomFactor;
 
     String m_mediaType;

Modified: trunk/Source/WebKit/chromium/ChangeLog (87448 => 87449)


--- trunk/Source/WebKit/chromium/ChangeLog	2011-05-26 23:39:22 UTC (rev 87448)
+++ trunk/Source/WebKit/chromium/ChangeLog	2011-05-26 23:47:32 UTC (rev 87449)
@@ -1,3 +1,17 @@
+2011-05-26  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r87444.
+        http://trac.webkit.org/changeset/87444
+        https://bugs.webkit.org/show_bug.cgi?id=61582
+
+        Layout test regressions in Chromium/WebKit: fast/css/first-
+        letter-text-fragment-crash.html, fast/css/first-letter-
+        visibility.html (Requested by aklein on #webkit).
+
+        * public/WebFrameClient.h:
+        * src/ChromeClientImpl.cpp:
+        * src/ChromeClientImpl.h:
+
 2011-05-26  David Levin  <[email protected]>
 
         Reviewed by Darin Fisher.

Modified: trunk/Source/WebKit/chromium/public/WebFrameClient.h (87448 => 87449)


--- trunk/Source/WebKit/chromium/public/WebFrameClient.h	2011-05-26 23:39:22 UTC (rev 87448)
+++ trunk/Source/WebKit/chromium/public/WebFrameClient.h	2011-05-26 23:47:32 UTC (rev 87449)
@@ -307,9 +307,6 @@
     // The size of the content area changed.
     virtual void didChangeContentsSize(WebFrame*, const WebSize&) { }
 
-    // The preferred dimensions for the rendered HTML contents changed.
-    virtual void didChangeContentsPreferredSize(WebFrame*, const WebSize&) const { }
-
     // The main frame scrolled.
     virtual void didChangeScrollOffset(WebFrame*) { }

Modified: trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp (87448 => 87449)


--- trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp	2011-05-26 23:39:22 UTC (rev 87448)
+++ trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp	2011-05-26 23:47:32 UTC (rev 87449)
@@ -588,13 +588,6 @@
         webframe->client()->didChangeContentsSize(webframe, size);
 }
 
-void ChromeClientImpl::contentsPreferredSizeChanged(Frame* frame, const IntSize& size) const
-{
-    WebFrameImpl* webframe = WebFrameImpl::fromFrame(frame);
-    if (webframe->client())
-        webframe->client()->didChangeContentsPreferredSize(webframe, size);
-}
-
 void ChromeClientImpl::scrollbarsModeDidChange() const
 {
 }

Modified: trunk/Source/WebKit/chromium/src/ChromeClientImpl.h (87448 => 87449)


--- trunk/Source/WebKit/chromium/src/ChromeClientImpl.h	2011-05-26 23:39:22 UTC (rev 87448)
+++ trunk/Source/WebKit/chromium/src/ChromeClientImpl.h	2011-05-26 23:47:32 UTC (rev 87449)
@@ -119,7 +119,6 @@
     virtual WebCore::IntRect windowToScreen(const WebCore::IntRect&) const;
     virtual PlatformPageClient platformPageClient() const { return 0; }
     virtual void contentsSizeChanged(WebCore::Frame*, const WebCore::IntSize&) const;
-    virtual void contentsPreferredSizeChanged(WebCore::Frame*, const WebCore::IntSize&) const;
     virtual void scrollRectIntoView(
         const WebCore::IntRect&, const WebCore::ScrollView*) const { }
     virtual void scrollbarsModeDidChange() const;

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to