| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
| 3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
| 4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
| 5 * 2000 Dirk Mueller <mueller@kde.org> | 5 * 2000 Dirk Mueller <mueller@kde.org> |
| 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
| 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
| 9 * Copyright (C) 2009 Google Inc. All rights reserved. | 9 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 10 * | 10 * |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 #include "HTMLNames.h" | 30 #include "HTMLNames.h" |
| 31 #include "RuntimeEnabledFeatures.h" | 31 #include "RuntimeEnabledFeatures.h" |
| 32 #include "core/accessibility/AXObjectCache.h" | 32 #include "core/accessibility/AXObjectCache.h" |
| 33 #include "core/animation/DocumentTimeline.h" | 33 #include "core/animation/DocumentTimeline.h" |
| 34 #include "core/css/FontLoader.h" | 34 #include "core/css/FontLoader.h" |
| 35 #include "core/css/resolver/StyleResolver.h" | 35 #include "core/css/resolver/StyleResolver.h" |
| 36 #include "core/dom/DocumentMarkerController.h" | 36 #include "core/dom/DocumentMarkerController.h" |
| 37 #include "core/dom/OverflowEvent.h" | 37 #include "core/dom/OverflowEvent.h" |
| 38 #include "core/editing/FrameSelection.h" | 38 #include "core/editing/FrameSelection.h" |
| 39 #include "core/html/HTMLFrameElement.h" | 39 #include "core/html/HTMLFrameElement.h" |
| 40 #include "core/html/HTMLHtmlElement.h" |
| 40 #include "core/html/HTMLPlugInImageElement.h" | 41 #include "core/html/HTMLPlugInImageElement.h" |
| 41 #include "core/inspector/InspectorInstrumentation.h" | 42 #include "core/inspector/InspectorInstrumentation.h" |
| 42 #include "core/loader/FrameLoader.h" | 43 #include "core/loader/FrameLoader.h" |
| 43 #include "core/loader/FrameLoaderClient.h" | 44 #include "core/loader/FrameLoaderClient.h" |
| 44 #include "core/loader/TextResourceDecoder.h" | 45 #include "core/loader/TextResourceDecoder.h" |
| 45 #include "core/loader/cache/CachedResourceLoader.h" | 46 #include "core/loader/cache/CachedResourceLoader.h" |
| 46 #include "core/page/Chrome.h" | 47 #include "core/page/Chrome.h" |
| 47 #include "core/page/ChromeClient.h" | 48 #include "core/page/ChromeClient.h" |
| 48 #include "core/page/EventHandler.h" | 49 #include "core/page/EventHandler.h" |
| 49 #include "core/page/FocusController.h" | 50 #include "core/page/FocusController.h" |
| (...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 608 | 609 |
| 609 void FrameView::applyPaginationToViewport() | 610 void FrameView::applyPaginationToViewport() |
| 610 { | 611 { |
| 611 Document* document = m_frame->document(); | 612 Document* document = m_frame->document(); |
| 612 Node* documentElement = document->documentElement(); | 613 Node* documentElement = document->documentElement(); |
| 613 RenderObject* documentRenderer = documentElement ? documentElement->renderer
() : 0; | 614 RenderObject* documentRenderer = documentElement ? documentElement->renderer
() : 0; |
| 614 RenderObject* documentOrBodyRenderer = documentRenderer; | 615 RenderObject* documentOrBodyRenderer = documentRenderer; |
| 615 Node* body = document->body(); | 616 Node* body = document->body(); |
| 616 if (body && body->renderer()) { | 617 if (body && body->renderer()) { |
| 617 if (body->hasTagName(bodyTag)) | 618 if (body->hasTagName(bodyTag)) |
| 618 documentOrBodyRenderer = documentRenderer->style()->overflowX() == O
VISIBLE && documentElement->hasTagName(htmlTag) ? body->renderer() : documentRen
derer; | 619 documentOrBodyRenderer = documentRenderer->style()->overflowX() == O
VISIBLE && isHTMLHtmlElement(documentElement) ? body->renderer() : documentRende
rer; |
| 619 } | 620 } |
| 620 | 621 |
| 621 Pagination pagination; | 622 Pagination pagination; |
| 622 | 623 |
| 623 if (!documentOrBodyRenderer) { | 624 if (!documentOrBodyRenderer) { |
| 624 setPagination(pagination); | 625 setPagination(pagination); |
| 625 return; | 626 return; |
| 626 } | 627 } |
| 627 | 628 |
| 628 EOverflow overflowY = documentOrBodyRenderer->style()->overflowY(); | 629 EOverflow overflowY = documentOrBodyRenderer->style()->overflowY(); |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 662 Node* documentElement = document->documentElement(); | 663 Node* documentElement = document->documentElement(); |
| 663 RenderObject* rootRenderer = documentElement ? documentElement->renderer
() : 0; | 664 RenderObject* rootRenderer = documentElement ? documentElement->renderer
() : 0; |
| 664 Node* body = document->body(); | 665 Node* body = document->body(); |
| 665 if (body && body->renderer()) { | 666 if (body && body->renderer()) { |
| 666 if (body->hasTagName(framesetTag)) { | 667 if (body->hasTagName(framesetTag)) { |
| 667 vMode = ScrollbarAlwaysOff; | 668 vMode = ScrollbarAlwaysOff; |
| 668 hMode = ScrollbarAlwaysOff; | 669 hMode = ScrollbarAlwaysOff; |
| 669 } else if (body->hasTagName(bodyTag)) { | 670 } else if (body->hasTagName(bodyTag)) { |
| 670 // It's sufficient to just check the X overflow, | 671 // It's sufficient to just check the X overflow, |
| 671 // since it's illegal to have visible in only one direction. | 672 // since it's illegal to have visible in only one direction. |
| 672 RenderObject* o = rootRenderer->style()->overflowX() == OVISIBLE
&& document->documentElement()->hasTagName(htmlTag) ? body->renderer() : rootRe
nderer; | 673 RenderObject* o = rootRenderer->style()->overflowX() == OVISIBLE
&& isHTMLHtmlElement(document->documentElement()) ? body->renderer() : rootRend
erer; |
| 673 applyOverflowToViewport(o, hMode, vMode); | 674 applyOverflowToViewport(o, hMode, vMode); |
| 674 } | 675 } |
| 675 } else if (rootRenderer) | 676 } else if (rootRenderer) |
| 676 applyOverflowToViewport(rootRenderer, hMode, vMode); | 677 applyOverflowToViewport(rootRenderer, hMode, vMode); |
| 677 } | 678 } |
| 678 } | 679 } |
| 679 | 680 |
| 680 void FrameView::updateCompositingLayersAfterStyleChange() | 681 void FrameView::updateCompositingLayersAfterStyleChange() |
| 681 { | 682 { |
| 682 RenderView* renderView = this->renderView(); | 683 RenderView* renderView = this->renderView(); |
| (...skipping 2707 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3390 } | 3391 } |
| 3391 | 3392 |
| 3392 AXObjectCache* FrameView::axObjectCache() const | 3393 AXObjectCache* FrameView::axObjectCache() const |
| 3393 { | 3394 { |
| 3394 if (frame() && frame()->document()) | 3395 if (frame() && frame()->document()) |
| 3395 return frame()->document()->existingAXObjectCache(); | 3396 return frame()->document()->existingAXObjectCache(); |
| 3396 return 0; | 3397 return 0; |
| 3397 } | 3398 } |
| 3398 | 3399 |
| 3399 } // namespace WebCore | 3400 } // namespace WebCore |
| OLD | NEW |