| Index: Source/web/ContextMenuClientImpl.cpp
|
| diff --git a/Source/web/ContextMenuClientImpl.cpp b/Source/web/ContextMenuClientImpl.cpp
|
| index a249096d2053b2ef37711a77482ce1b8b5d1f1f8..8df704dd30f6170b36ed474026d5a9bdf3254579 100644
|
| --- a/Source/web/ContextMenuClientImpl.cpp
|
| +++ b/Source/web/ContextMenuClientImpl.cpp
|
| @@ -87,7 +87,7 @@ namespace WebKit {
|
| static WebURL urlFromFrame(Frame* frame)
|
| {
|
| if (frame) {
|
| - DocumentLoader* dl = frame->loader()->documentLoader();
|
| + DocumentLoader* dl = frame->loader().documentLoader();
|
| if (dl) {
|
| WebDataSource* ds = WebDataSourceImpl::fromDocumentLoader(dl);
|
| if (ds)
|
| @@ -288,7 +288,7 @@ void ContextMenuClientImpl::showContextMenu(const WebCore::ContextMenu* defaultM
|
| data.pageURL = urlFromFrame(m_webView->mainFrameImpl()->frame());
|
| if (selectedFrame != m_webView->mainFrameImpl()->frame()) {
|
| data.frameURL = urlFromFrame(selectedFrame);
|
| - RefPtr<HistoryItem> historyItem = selectedFrame->loader()->history()->currentItem();
|
| + RefPtr<HistoryItem> historyItem = selectedFrame->loader().history()->currentItem();
|
| if (historyItem)
|
| data.frameHistoryItem = WebHistoryItem(historyItem);
|
| }
|
| @@ -354,7 +354,7 @@ void ContextMenuClientImpl::showContextMenu(const WebCore::ContextMenu* defaultM
|
| #endif // OS(MACOSX)
|
|
|
| // Now retrieve the security info.
|
| - DocumentLoader* dl = selectedFrame->loader()->documentLoader();
|
| + DocumentLoader* dl = selectedFrame->loader().documentLoader();
|
| WebDataSource* ds = WebDataSourceImpl::fromDocumentLoader(dl);
|
| if (ds)
|
| data.securityInfo = ds->response().securityInfo();
|
|
|