| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 623 } | 623 } |
| 624 | 624 |
| 625 bool WebLocalFrameImpl::hasHorizontalScrollbar() const { | 625 bool WebLocalFrameImpl::hasHorizontalScrollbar() const { |
| 626 return frame() && frame()->view() && frame()->view()->horizontalScrollbar(); | 626 return frame() && frame()->view() && frame()->view()->horizontalScrollbar(); |
| 627 } | 627 } |
| 628 | 628 |
| 629 bool WebLocalFrameImpl::hasVerticalScrollbar() const { | 629 bool WebLocalFrameImpl::hasVerticalScrollbar() const { |
| 630 return frame() && frame()->view() && frame()->view()->verticalScrollbar(); | 630 return frame() && frame()->view() && frame()->view()->verticalScrollbar(); |
| 631 } | 631 } |
| 632 | 632 |
| 633 void WebLocalFrameImpl::collapse(bool collapsed) { |
| 634 DCHECK(frame()->owner()->isLocal()); |
| 635 frame()->owner()->setCollapsedByClient(collapsed); |
| 636 } |
| 637 |
| 633 WebView* WebLocalFrameImpl::view() const { | 638 WebView* WebLocalFrameImpl::view() const { |
| 634 return viewImpl(); | 639 return viewImpl(); |
| 635 } | 640 } |
| 636 | 641 |
| 637 WebDocument WebLocalFrameImpl::document() const { | 642 WebDocument WebLocalFrameImpl::document() const { |
| 638 if (!frame() || !frame()->document()) | 643 if (!frame() || !frame()->document()) |
| 639 return WebDocument(); | 644 return WebDocument(); |
| 640 return WebDocument(frame()->document()); | 645 return WebDocument(frame()->document()); |
| 641 } | 646 } |
| 642 | 647 |
| (...skipping 1788 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2431 createMarkup(startPosition, endPosition, AnnotateForInterchange, | 2436 createMarkup(startPosition, endPosition, AnnotateForInterchange, |
| 2432 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2437 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
| 2433 } else { | 2438 } else { |
| 2434 clipHtml = | 2439 clipHtml = |
| 2435 createMarkup(endPosition, startPosition, AnnotateForInterchange, | 2440 createMarkup(endPosition, startPosition, AnnotateForInterchange, |
| 2436 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2441 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
| 2437 } | 2442 } |
| 2438 } | 2443 } |
| 2439 | 2444 |
| 2440 } // namespace blink | 2445 } // namespace blink |
| OLD | NEW |