Changeset 64304 in webkit
- Timestamp:
- Jul 29, 2010 1:41:00 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r64303 r64304 1 2010-07-29 Anders Carlsson <andersca@apple.com> 2 3 Reviewed by Sam Weinig. 4 5 Implement NPN_Status 6 https://bugs.webkit.org/show_bug.cgi?id=43205 7 8 * platform/mac-wk2/Skipped: 9 10 Add plugins/access-after-page-destroyed.html since we don't support 11 layoutTestController.setCanOpenWindows. 12 13 Remove plugins/set-status.html. 14 1 15 2010-07-27 Ojan Vafai <ojan@chromium.org> 2 16 -
trunk/LayoutTests/platform/mac-wk2/Skipped
r64251 r64304 1426 1426 plugins/return-error-from-new-stream-doesnt-invoke-destroy-stream.html 1427 1427 plugins/return-negative-one-from-write.html 1428 plugins/set-status.html1429 1428 plugins/update-widgets-crash.html 1430 1429 plugins/window-open.html … … 1645 1644 fast/loader/stateobjects/replacestate-updates-location.html 1646 1645 fast/parser/xhtml-close-while-parsing.xhtml 1646 plugins/access-after-page-destroyed.html 1647 1647 http/tests/appcache/crash-when-navigating-away-then-back.html 1648 1648 http/tests/media/video-cancel-load.html -
trunk/WebCore/ChangeLog
r64299 r64304 1 2010-07-29 Anders Carlsson <andersca@apple.com> 2 3 Reviewed by Sam Weinig. 4 5 Implement NPN_Status 6 https://bugs.webkit.org/show_bug.cgi?id=43205 7 8 * WebCore.exp.in: 9 Export Chrome::setStatusText. 10 1 11 2010-07-29 Victor Wang <victorw@chromium.org> 2 12 -
trunk/WebCore/WebCore.exp.in
r64299 r64304 597 597 __ZN7WebCore5RangeD1Ev 598 598 __ZN7WebCore5cacheEv 599 __ZN7WebCore6Chrome16setStatusbarTextEPNS_5FrameERKNS_6StringE 599 600 __ZN7WebCore6Cursor8fromTypeENS0_4TypeE 600 601 __ZN7WebCore6CursorD1Ev -
trunk/WebKit2/ChangeLog
r64300 r64304 1 2010-07-29 Anders Carlsson <andersca@apple.com> 2 3 Reviewed by Sam Weinig. 4 5 Implement NPN_Status 6 https://bugs.webkit.org/show_bug.cgi?id=43205 7 8 * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp: 9 (WebKit::NPN_Status): 10 Convert the message char* to a String and call NetscapePlugin::setStatusbarText. 11 12 * WebProcess/Plugins/Netscape/NetscapePlugin.cpp: 13 (WebKit::NetscapePlugin::setStatusbarText): 14 Call PluginController::setStatusbarText. 15 16 * WebProcess/Plugins/PluginController.h: 17 Add setStatusbarText. 18 19 * WebProcess/Plugins/PluginView.cpp: 20 (WebKit::PluginView::setStatusbarText): 21 Call the Chrome member function. 22 1 23 2010-07-29 Adam Roben <aroben@apple.com> 2 24 -
trunk/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp
r64248 r64304 314 314 } 315 315 316 static void NPN_Status(NPP instance, const char* message) 317 { 318 notImplemented(); 316 static void NPN_Status(NPP npp, const char* message) 317 { 318 String statusbarText; 319 if (!message) 320 statusbarText = ""; 321 else 322 statusbarText = String::fromUTF8WithLatin1Fallback(message, strlen(message)); 323 324 RefPtr<NetscapePlugin> plugin = NetscapePlugin::fromNPP(npp); 325 plugin->setStatusbarText(statusbarText); 319 326 } 320 327 -
trunk/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
r64154 r64304 144 144 } 145 145 146 void NetscapePlugin::setStatusbarText(const String& statusbarText) 147 { 148 m_pluginController->setStatusbarText(statusbarText); 149 } 150 146 151 NPObject* NetscapePlugin::windowScriptNPObject() 147 152 { -
trunk/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
r64154 r64304 60 60 const Vector<char>& httpBody, bool sendNotification, void* notificationData); 61 61 NPError destroyStream(NPStream*, NPReason); 62 void setStatusbarText(const WebCore::String&); 62 63 63 64 // These return retained objects. -
trunk/WebKit2/WebProcess/Plugins/PluginController.h
r63701 r64304 65 65 virtual NPObject* pluginElementNPObject() = 0; 66 66 67 // Set the statusbar text. 68 virtual void setStatusbarText(const WebCore::String&) = 0; 69 67 70 protected: 68 71 virtual ~PluginController() { } -
trunk/WebKit2/WebProcess/Plugins/PluginView.cpp
r64167 r64304 30 30 #include "WebEvent.h" 31 31 #include "WebPage.h" 32 #include <WebCore/Chrome.h> 32 33 #include <WebCore/DocumentLoader.h> 33 34 #include <WebCore/Event.h> … … 636 637 } 637 638 639 void PluginView::setStatusbarText(const String& statusbarText) 640 { 641 if (!frame()) 642 return; 643 644 Page* page = frame()->page(); 645 if (!page) 646 return; 647 648 page->chrome()->setStatusbarText(frame(), statusbarText); 649 } 650 638 651 void PluginView::didFinishLoad(WebFrame* webFrame) 639 652 { -
trunk/WebKit2/WebProcess/Plugins/PluginView.h
r64154 r64304 104 104 virtual NPObject* windowScriptNPObject(); 105 105 virtual NPObject* pluginElementNPObject(); 106 virtual void setStatusbarText(const WebCore::String&); 106 107 107 108 // WebFrame::LoadListener
Note: See TracChangeset
for help on using the changeset viewer.