2006-06-01 Mitz Pettel <opendarwin.org@mitzpettel.com>

        Reviewed and landed by Anders.

        - fixed all places in the Canvas to RenderView rename patch where
          view() should have been changed to frameView().

        * kwq/WebCoreAXObject.mm:
        (-[WebCoreAXObject position]):
        (-[WebCoreAXObject accessibilityAttributeValue:]):
        * rendering/RenderBlock.cpp:
        (WebCore::RenderBlock::layoutBlock):
        * rendering/RenderBox.cpp:
        (WebCore::RenderBox::paintBackgroundExtended):
        * rendering/RenderTreeAsText.cpp:
        (externalRepresentation):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@14672 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a3875cd3f4dfdced12e4a94af8ae72a22819cd67..8a3584903f7bb7b8ed95e410779488c2cb15b969 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2006-06-01  Mitz Pettel  <opendarwin.org@mitzpettel.com>
+
+        Reviewed and landed by Anders.
+
+        - fixed all places in the Canvas to RenderView rename patch where
+          view() should have been changed to frameView().
+
+        * kwq/WebCoreAXObject.mm:
+        (-[WebCoreAXObject position]):
+        (-[WebCoreAXObject accessibilityAttributeValue:]):
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::layoutBlock):
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::paintBackgroundExtended):
+        * rendering/RenderTreeAsText.cpp:
+        (externalRepresentation):
+
 2006-06-01  Geoffrey Garen  <ggaren@apple.com>
 
         Fix by Mitz. Reviewed, tweaked, tested, landed by me.

diff --git a/WebCore/kwq/WebCoreAXObject.mm b/WebCore/kwq/WebCoreAXObject.mm
index ee2d486d8888e90d44d867f4ab331077fc5e1bc8..e9241ce42c86e2550e9304e183737932d129a64a 100644 (file)
--- a/WebCore/kwq/WebCoreAXObject.mm
+++ b/WebCore/kwq/WebCoreAXObject.mm
@@ -561,7 +561,7 @@ static IntRect boundingBoxRect(RenderObject* obj)
     
     // The Cocoa accessibility API wants the lower-left corner.
     NSPoint point = NSMakePoint(rect.x(), rect.bottom());
-    if (m_renderer && m_renderer->view() && m_renderer->view()->view()) {
+    if (m_renderer && m_renderer->view() && m_renderer->view()->frameView()) {
         NSView* view = m_renderer->view()->frameView()->getDocumentView();
         point = [[view window] convertBaseToScreen: [view convertPoint: point toView:nil]];
     }
@@ -786,7 +786,7 @@ static IntRect boundingBoxRect(RenderObject* obj)
         return [self roleDescription];
     
     if ([attributeName isEqualToString: NSAccessibilityParentAttribute]) {
-        if (m_renderer->isRenderView() && m_renderer->view() && m_renderer->view()->view())
+        if (m_renderer->isRenderView() && m_renderer->view() && m_renderer->view()->frameView())
             return m_renderer->view()->frameView()->getView();
         return [self parentObjectUnignored];
     }
@@ -866,7 +866,7 @@ static IntRect boundingBoxRect(RenderObject* obj)
         return [self position];
 
     if ([attributeName isEqualToString: NSAccessibilityWindowAttribute]) {
-        if (m_renderer && m_renderer->view() && m_renderer->view()->view())
+        if (m_renderer && m_renderer->view() && m_renderer->view()->frameView())
             return [m_renderer->view()->frameView()->getView() window];
         return nil;
     }

diff --git a/WebCore/rendering/RenderBox.cpp b/WebCore/rendering/RenderBox.cpp
index 0ac62974c91a7eec75d4de578bc63f79fba77726..29b26221d76d8fe438ad07640b16678532356779 100644 (file)
--- a/WebCore/rendering/RenderBox.cpp
+++ b/WebCore/rendering/RenderBox.cpp
@@ -454,7 +454,7 @@ void RenderBox::paintBackgroundExtended(GraphicsContext* p, const Color& c, cons
 
     // Only fill with a base color (e.g., white) if we're the root document, since iframes/frames with
     // no background in the child document should show the parent's background.
-    if (!bgLayer->next() && isRoot() && !(bgColor.isValid() && bgColor.alpha() > 0) && view()->view()) {
+    if (!bgLayer->next() && isRoot() && !(bgColor.isValid() && bgColor.alpha() > 0) && view()->frameView()) {
         bool isTransparent;
         WebCore::Node* elt = document()->ownerElement();
         if (elt) {
@@ -469,7 +469,7 @@ void RenderBox::paintBackgroundExtended(GraphicsContext* p, const Color& c, cons
                 isTransparent = !body || !body->hasLocalName(framesetTag); // Can't scroll a frameset document anyway.
             }
         } else
-            isTransparent = view()->view()->isTransparent();
+            isTransparent = view()->frameView()->isTransparent();
         
         if (isTransparent)
             view()->frameView()->useSlowRepaints(); // The parent must show behind the child.
@@ -481,7 +481,7 @@ void RenderBox::paintBackgroundExtended(GraphicsContext* p, const Color& c, cons
     if (!bgLayer->next() && bgColor.isValid() && bgColor.alpha() > 0) {
         IntRect rect(_tx, clipy, w, cliph);
         // If we have an alpha and we are painting the root element, go ahead and blend with white.
-        if (bgColor.alpha() < 0xFF && isRoot() && !view()->view()->isTransparent())
+        if (bgColor.alpha() < 0xFF && isRoot() && !view()->frameView()->isTransparent())
             p->fillRect(rect, Color(Color::white));
         p->fillRect(rect, bgColor);
     }

diff --git a/WebCore/rendering/RenderTreeAsText.cpp b/WebCore/rendering/RenderTreeAsText.cpp
index cf3c167298fcd2f9f22e88bc058664471745619c..52efe0633e8b2a2fb1a0d3aced0f18f5588ae9b1 100644 (file)
--- a/WebCore/rendering/RenderTreeAsText.cpp
+++ b/WebCore/rendering/RenderTreeAsText.cpp
@@ -418,7 +418,7 @@ DeprecatedString externalRepresentation(RenderObject* o)
         ts.precision(2);
         writeRenderResources(ts, o->document());
 #endif
-        o->view()->view()->layout();
+        o->view()->frameView()->layout();
         RenderLayer* l = o->layer();
         if (l) {
             writeLayers(ts, l, l, IntRect(l->xPos(), l->yPos(), l->width(), l->height()));