[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

ap at apple.com ap at apple.com
Wed Dec 22 15:10:15 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit a7e5ff9dedca8c88ef74172a77ba938eb3fd4dbf
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 28 20:35:18 2010 +0000

            Reviewed by Dan Bernstein.
    
            https://bugs.webkit.org/show_bug.cgi?id=48551
            HTMLDocument::isFrameSet() should not depend on renderer
    
            No change in functionality, so no new tests.
    
            * html/HTMLDocument.cpp: (WebCore::HTMLDocument::isFrameSet): Omit the check for renderer.
    
            * rendering/RenderLayer.h: Removed unneeded includes and forward declarations.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70804 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9542d1b..28b42a7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-28  Alexey Proskuryakov  <ap at apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=48551
+        HTMLDocument::isFrameSet() should not depend on renderer
+
+        No change in functionality, so no new tests.
+
+        * html/HTMLDocument.cpp: (WebCore::HTMLDocument::isFrameSet): Omit the check for renderer.
+
+        * rendering/RenderLayer.h: Removed unneeded includes and forward declarations.
+
 2010-10-28  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebCore/html/HTMLDocument.cpp b/WebCore/html/HTMLDocument.cpp
index 8bb7789..36c1f5f 100644
--- a/WebCore/html/HTMLDocument.cpp
+++ b/WebCore/html/HTMLDocument.cpp
@@ -439,7 +439,7 @@ void HTMLDocument::clear()
 bool HTMLDocument::isFrameSet() const
 {
     HTMLElement* bodyElement = body();
-    return bodyElement && bodyElement->renderer() && bodyElement->hasTagName(framesetTag);
+    return bodyElement && bodyElement->hasTagName(framesetTag);
 }
 
 }
diff --git a/WebCore/rendering/RenderLayer.h b/WebCore/rendering/RenderLayer.h
index 82edab2..7e67115 100644
--- a/WebCore/rendering/RenderLayer.h
+++ b/WebCore/rendering/RenderLayer.h
@@ -47,22 +47,17 @@
 #include "RenderBox.h"
 #include "ScrollBehavior.h"
 #include "ScrollbarClient.h"
-#include "Timer.h"
 #include <wtf/OwnPtr.h>
 
 namespace WebCore {
 
-class CachedResource;
 class HitTestRequest;
 class HitTestResult;
 class HitTestingTransformState;
-class RenderFrameSet;
 class RenderMarquee;
 class RenderReplica;
 class RenderScrollbarPart;
 class RenderStyle;
-class RenderTable;
-class RenderText;
 class RenderView;
 class Scrollbar;
 class TransformationMatrix;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list