OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) | 2 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) |
3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. | 3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
7 * are met: | 7 * are met: |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
98 #include "HistoryItem.h" | 98 #include "HistoryItem.h" |
99 #include "InspectorController.h" | 99 #include "InspectorController.h" |
100 #include "markup.h" | 100 #include "markup.h" |
101 #include "Page.h" | 101 #include "Page.h" |
102 #include "PlatformContextSkia.h" | 102 #include "PlatformContextSkia.h" |
103 #include "PrintContext.h" | 103 #include "PrintContext.h" |
104 #include "RenderFrame.h" | 104 #include "RenderFrame.h" |
105 #if defined(OS_WIN) | 105 #if defined(OS_WIN) |
106 #include "RenderThemeChromiumWin.h" | 106 #include "RenderThemeChromiumWin.h" |
107 #endif | 107 #endif |
| 108 #include "RenderView.h" |
108 #include "RenderWidget.h" | 109 #include "RenderWidget.h" |
109 #include "ReplaceSelectionCommand.h" | 110 #include "ReplaceSelectionCommand.h" |
110 #include "ResourceHandle.h" | 111 #include "ResourceHandle.h" |
111 #include "ResourceRequest.h" | 112 #include "ResourceRequest.h" |
112 #include "ScriptController.h" | 113 #include "ScriptController.h" |
113 #include "ScriptSourceCode.h" | 114 #include "ScriptSourceCode.h" |
114 #include "ScriptValue.h" | 115 #include "ScriptValue.h" |
115 #include "ScrollbarTheme.h" | 116 #include "ScrollbarTheme.h" |
116 #include "SelectionController.h" | 117 #include "SelectionController.h" |
117 #include "Settings.h" | 118 #include "Settings.h" |
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
531 if (link_element && link_element->type() == kOSDType && | 532 if (link_element && link_element->type() == kOSDType && |
532 link_element->rel() == kOSDRel && !link_element->href().isEmpty()) { | 533 link_element->rel() == kOSDRel && !link_element->href().isEmpty()) { |
533 return webkit_glue::KURLToGURL(link_element->href()); | 534 return webkit_glue::KURLToGURL(link_element->href()); |
534 } | 535 } |
535 } | 536 } |
536 } | 537 } |
537 } | 538 } |
538 return GURL(); | 539 return GURL(); |
539 } | 540 } |
540 | 541 |
| 542 int WebFrameImpl::GetContentsPreferredWidth() const { |
| 543 if ((frame_->document() != NULL) && |
| 544 (frame_->document()->renderView() != NULL)) { |
| 545 return frame_->document()->renderView()->minPrefWidth(); |
| 546 } else { |
| 547 return 0; |
| 548 } |
| 549 } |
| 550 |
541 scoped_refptr<FeedList> WebFrameImpl::GetFeedList() const { | 551 scoped_refptr<FeedList> WebFrameImpl::GetFeedList() const { |
542 scoped_refptr<FeedList> feedlist = new FeedList(); | 552 scoped_refptr<FeedList> feedlist = new FeedList(); |
543 | 553 |
544 WebCore::FrameLoader* frame_loader = frame_->loader(); | 554 WebCore::FrameLoader* frame_loader = frame_->loader(); |
545 if (frame_loader->state() != WebCore::FrameStateComplete || | 555 if (frame_loader->state() != WebCore::FrameStateComplete || |
546 !frame_->document() || | 556 !frame_->document() || |
547 !frame_->document()->head() || | 557 !frame_->document()->head() || |
548 frame_->tree()->parent()) | 558 frame_->tree()->parent()) |
549 return feedlist; | 559 return feedlist; |
550 | 560 |
(...skipping 1372 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1923 return password_listeners_.get(input_element); | 1933 return password_listeners_.get(input_element); |
1924 } | 1934 } |
1925 | 1935 |
1926 void WebFrameImpl::ClearPasswordListeners() { | 1936 void WebFrameImpl::ClearPasswordListeners() { |
1927 for (PasswordListenerMap::iterator iter = password_listeners_.begin(); | 1937 for (PasswordListenerMap::iterator iter = password_listeners_.begin(); |
1928 iter != password_listeners_.end(); ++iter) { | 1938 iter != password_listeners_.end(); ++iter) { |
1929 delete iter->second; | 1939 delete iter->second; |
1930 } | 1940 } |
1931 password_listeners_.clear(); | 1941 password_listeners_.clear(); |
1932 } | 1942 } |
OLD | NEW |