Changeset 141528 in webkit
- Timestamp:
- Jan 31, 2013 7:52:13 PM (11 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r141524 r141528 1 2013-01-31 Rafael Brandao <rafael.lobo@openbossa.org> 2 3 [Qt][WK2] Another attempt to fix build after recent WebKit2 changes 4 https://bugs.webkit.org/show_bug.cgi?id=108548 5 6 Reviewed by Anders Carlsson. 7 8 * Platform/CoreIPC/unix/ConnectionUnix.cpp: 9 (CoreIPC::Connection::platformInvalidate): 10 (CoreIPC::Connection::processMessage): Change Deque to Vector and do similar 11 logic as on patch for https://bugs.webkit.org/show_bug.cgi?id=108517 12 (CoreIPC::Connection::open): 13 (CoreIPC::Connection::setShouldCloseConnectionOnProcessTermination): 14 * Platform/qt/WorkQueueQt.cpp: Reflect changes on Qt WorkQueue to increase ref 15 count when the execution is started and decrease it when the work item is deleted, 16 following the logic on https://bugs.webkit.org/show_bug.cgi?id=108544 17 (WorkQueue::WorkItemQt::~WorkItemQt): 18 (WorkQueue::WorkItemQt::execute): 19 (WorkQueue::dispatch): 20 (WorkQueue::dispatchAfterDelay): 21 * UIProcess/WebPageProxy.cpp: 22 (WebKit::WebPageProxy::getPluginPath): This function was moved from WebProcessProxy but 23 mac specific code was not protected properly: https://bugs.webkit.org/show_bug.cgi?id=108407 24 1 25 2013-01-31 Changhun Kang <temoochin@company100.net> 2 26 -
trunk/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp
r141495 r141528 141 141 142 142 #if PLATFORM(GTK) 143 m_connectionQueue .unregisterEventSourceHandler(m_socketDescriptor);143 m_connectionQueue->unregisterEventSourceHandler(m_socketDescriptor); 144 144 #endif 145 145 … … 150 150 151 151 #if PLATFORM(EFL) 152 m_connectionQueue .unregisterSocketEventHandler(m_socketDescriptor);152 m_connectionQueue->unregisterSocketEventHandler(m_socketDescriptor); 153 153 #endif 154 154 … … 208 208 return false; 209 209 210 Deque<Attachment> attachments;211 AttachmentResourceGuard<Deque<Attachment>, Deque<Attachment>::iterator> attachementDisposer(attachments);212 RefPtr<WebKit::SharedMemory> oolMessageBody;213 214 210 size_t attachmentFileDescriptorCount = 0; 215 211 size_t attachmentCount = messageInfo.attachmentCount(); 212 OwnArrayPtr<AttachmentInfo> attachmentInfo; 213 216 214 if (attachmentCount) { 217 OwnArrayPtr<AttachmentInfo>attachmentInfo = adoptArrayPtr(new AttachmentInfo[attachmentCount]);215 attachmentInfo = adoptArrayPtr(new AttachmentInfo[attachmentCount]); 218 216 memcpy(attachmentInfo.get(), messageData, sizeof(AttachmentInfo) * attachmentCount); 219 217 messageData += sizeof(AttachmentInfo) * attachmentCount; … … 227 225 case Attachment::Uninitialized: 228 226 default: 227 ASSERT_NOT_REACHED(); 229 228 break; 230 229 } … … 233 232 if (messageInfo.isMessageBodyIsOutOfLine()) 234 233 attachmentCount--; 235 234 } 235 236 Vector<Attachment> attachments(attachmentCount); 237 AttachmentResourceGuard<Vector<Attachment>, Vector<Attachment>::iterator> attachementDisposer(attachments); 238 RefPtr<WebKit::SharedMemory> oolMessageBody; 239 240 if (attachmentCount) { 236 241 size_t fdIndex = 0; 237 242 for (size_t i = 0; i < attachmentCount; ++i) { … … 241 246 if (!attachmentInfo[i].isNull()) 242 247 fd = m_fileDescriptors[fdIndex++]; 243 attachments .append(Attachment(fd, attachmentInfo[i].getSize()));248 attachments[attachmentCount - i - 1] = Attachment(fd, attachmentInfo[i].getSize()); 244 249 break; 245 250 case Attachment::SocketType: 246 251 if (!attachmentInfo[i].isNull()) 247 252 fd = m_fileDescriptors[fdIndex++]; 248 attachments .append(Attachment(fd));253 attachments[attachmentCount - i - 1] = Attachment(fd); 249 254 break; 250 255 case Attachment::Uninitialized: 251 attachments .append(Attachment());256 attachments[attachmentCount - i - 1] = Attachment(); 252 257 default: 253 258 break; … … 419 424 m_isConnected = true; 420 425 #if PLATFORM(QT) 421 m_socketNotifier = m_connectionQueue .registerSocketEventHandler(m_socketDescriptor, QSocketNotifier::Read, WTF::bind(&Connection::readyReadHandler, this));426 m_socketNotifier = m_connectionQueue->registerSocketEventHandler(m_socketDescriptor, QSocketNotifier::Read, WTF::bind(&Connection::readyReadHandler, this)); 422 427 #elif PLATFORM(GTK) 423 m_connectionQueue .registerEventSourceHandler(m_socketDescriptor, (G_IO_HUP | G_IO_ERR), WTF::bind(&Connection::connectionDidClose, this));424 m_connectionQueue .registerEventSourceHandler(m_socketDescriptor, G_IO_IN, WTF::bind(&Connection::readyReadHandler, this));428 m_connectionQueue->registerEventSourceHandler(m_socketDescriptor, (G_IO_HUP | G_IO_ERR), WTF::bind(&Connection::connectionDidClose, this)); 429 m_connectionQueue->registerEventSourceHandler(m_socketDescriptor, G_IO_IN, WTF::bind(&Connection::readyReadHandler, this)); 425 430 #elif PLATFORM(EFL) 426 m_connectionQueue .registerSocketEventHandler(m_socketDescriptor, WTF::bind(&Connection::readyReadHandler, this));431 m_connectionQueue->registerSocketEventHandler(m_socketDescriptor, WTF::bind(&Connection::readyReadHandler, this)); 427 432 #endif 428 433 429 434 // Schedule a call to readyReadHandler. Data may have arrived before installation of the signal 430 435 // handler. 431 m_connectionQueue .dispatch(WTF::bind(&Connection::readyReadHandler, this));436 m_connectionQueue->dispatch(WTF::bind(&Connection::readyReadHandler, this)); 432 437 433 438 return true; … … 557 562 void Connection::setShouldCloseConnectionOnProcessTermination(WebKit::PlatformProcessIdentifier process) 558 563 { 559 m_connectionQueue .dispatchOnTermination(process, WTF::bind(&Connection::connectionDidClose, this));564 m_connectionQueue->dispatchOnTermination(process, WTF::bind(&Connection::connectionDidClose, this)); 560 565 } 561 566 #endif -
trunk/Source/WebKit2/Platform/qt/WorkQueueQt.cpp
r137023 r141528 56 56 ~WorkItemQt() 57 57 { 58 m_queue->deref(); 58 59 } 59 60 60 61 Q_SLOT void execute() 61 62 { 62 if (m_queue->m_isValid) 63 m_function(); 63 m_function(); 64 64 } 65 65 … … 109 109 void WorkQueue::dispatch(const Function<void()>& function) 110 110 { 111 ref(); 111 112 WorkQueue::WorkItemQt* itemQt = new WorkQueue::WorkItemQt(this, function); 112 113 itemQt->moveToThread(m_workThread); … … 116 117 void WorkQueue::dispatchAfterDelay(const Function<void()>& function, double delayInSecond) 117 118 { 119 ref(); 118 120 WorkQueue::WorkItemQt* itemQt = new WorkQueue::WorkItemQt(this, function); 119 121 itemQt->startTimer(static_cast<int>(delayInSecond * 1000)); -
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
r141486 r141528 1237 1237 return; 1238 1238 1239 #if PLATFORM(MAC) 1239 1240 pluginLoadPolicy = m_uiClient.shouldInstantiatePlugin(this, plugin.bundleIdentifier, plugin.info.name) ? PluginModuleLoadNormally : PluginModuleBlocked; 1240 1241 if (pluginLoadPolicy != PluginModuleLoadNormally) 1241 1242 return; 1243 #endif 1242 1244 1243 1245 pluginPath = plugin.path;
Note: See TracChangeset
for help on using the changeset viewer.