| 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 #include "ScriptController.h" | 57 #include "ScriptController.h" |
| 58 #if USE(V8) | 58 #if USE(V8) |
| 59 #include "V8Proxy.h" | 59 #include "V8Proxy.h" |
| 60 #endif | 60 #endif |
| 61 #include "WebAccessibilityObject.h" | 61 #include "WebAccessibilityObject.h" |
| 62 #include "WebConsoleMessage.h" | 62 #include "WebConsoleMessage.h" |
| 63 #include "WebCursorInfo.h" | 63 #include "WebCursorInfo.h" |
| 64 #include "WebFileChooserCompletionImpl.h" | 64 #include "WebFileChooserCompletionImpl.h" |
| 65 #include "WebFrameClient.h" | 65 #include "WebFrameClient.h" |
| 66 #include "WebFrameImpl.h" | 66 #include "WebFrameImpl.h" |
| 67 #include "WebIconLoadingCompletionImpl.h" |
| 67 #include "WebInputEvent.h" | 68 #include "WebInputEvent.h" |
| 68 #include "WebKit.h" | 69 #include "WebKit.h" |
| 69 #include "WebPopupMenuImpl.h" | 70 #include "WebPopupMenuImpl.h" |
| 70 #include "WebPopupMenuInfo.h" | 71 #include "WebPopupMenuInfo.h" |
| 71 #include "WebPopupType.h" | 72 #include "WebPopupType.h" |
| 72 #include "WebRect.h" | 73 #include "WebRect.h" |
| 73 #include "WebTextDirection.h" | 74 #include "WebTextDirection.h" |
| 74 #include "WebURLRequest.h" | 75 #include "WebURLRequest.h" |
| 75 #include "WebViewClient.h" | 76 #include "WebViewClient.h" |
| 76 #include "WebViewImpl.h" | 77 #include "WebViewImpl.h" |
| (...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 596 WebFileChooserCompletionImpl* chooserCompletion = | 597 WebFileChooserCompletionImpl* chooserCompletion = |
| 597 new WebFileChooserCompletionImpl(fileChooser); | 598 new WebFileChooserCompletionImpl(fileChooser); |
| 598 | 599 |
| 599 if (client->runFileChooser(params, chooserCompletion)) | 600 if (client->runFileChooser(params, chooserCompletion)) |
| 600 return; | 601 return; |
| 601 | 602 |
| 602 // Choosing failed, so do callback with an empty list. | 603 // Choosing failed, so do callback with an empty list. |
| 603 chooserCompletion->didChooseFile(WebVector<WebString>()); | 604 chooserCompletion->didChooseFile(WebVector<WebString>()); |
| 604 } | 605 } |
| 605 | 606 |
| 606 void ChromeClientImpl::chooseIconForFiles(const Vector<WebCore::String>&, WebCor
e::FileChooser*) | 607 void ChromeClientImpl::chooseIconForFiles(const Vector<WebCore::String>& filenam
es, WebCore::FileChooser* fileChooser) |
| 607 { | 608 { |
| 608 notImplemented(); | 609 if (!m_webView->client()) |
| 610 return; |
| 611 WebIconLoadingCompletionImpl* iconCompletion = new WebIconLoadingCompletionI
mpl(fileChooser); |
| 612 if (!m_webView->client()->chooseIconForFiles(filenames, iconCompletion)) |
| 613 iconCompletion->iconLoaded(WebData()); |
| 609 } | 614 } |
| 610 | 615 |
| 611 void ChromeClientImpl::popupOpened(PopupContainer* popupContainer, | 616 void ChromeClientImpl::popupOpened(PopupContainer* popupContainer, |
| 612 const IntRect& bounds, | 617 const IntRect& bounds, |
| 613 bool handleExternally) | 618 bool handleExternally) |
| 614 { | 619 { |
| 615 if (!m_webView->client()) | 620 if (!m_webView->client()) |
| 616 return; | 621 return; |
| 617 | 622 |
| 618 WebWidget* webwidget; | 623 WebWidget* webwidget; |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 723 m_webView->setRootGraphicsLayer(graphicsLayer ? graphicsLayer->platformLayer
() : 0); | 728 m_webView->setRootGraphicsLayer(graphicsLayer ? graphicsLayer->platformLayer
() : 0); |
| 724 } | 729 } |
| 725 | 730 |
| 726 void ChromeClientImpl::scheduleCompositingLayerSync() | 731 void ChromeClientImpl::scheduleCompositingLayerSync() |
| 727 { | 732 { |
| 728 m_webView->setRootLayerNeedsDisplay(); | 733 m_webView->setRootLayerNeedsDisplay(); |
| 729 } | 734 } |
| 730 #endif | 735 #endif |
| 731 | 736 |
| 732 } // namespace WebKit | 737 } // namespace WebKit |
| OLD | NEW |