Changeset 141640 in webkit
- Timestamp:
- Feb 1, 2013 1:56:29 PM (11 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r141639 r141640 1 2013-02-01 Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> 2 3 [Gtk] [WK2] Fix build after r141619 4 https://bugs.webkit.org/show_bug.cgi?id=108687 5 6 Reviewed by Benjamin Poulain. 7 8 Take a reference instead of a pointer for decoding functions. 9 10 * Platform/gtk/SharedMemoryGtk.cpp: 11 (WebKit::SharedMemory::Handle::decode): 12 * Shared/gtk/ArgumentCodersGtk.cpp: 13 (CoreIPC::decodeImage): 14 (CoreIPC::decodeDataObject): 15 (CoreIPC::::decode): 16 (CoreIPC::decodeGKeyFile): 17 (CoreIPC::decode): 18 * Shared/gtk/ArgumentCodersGtk.h: 19 * Shared/gtk/LayerTreeContextGtk.cpp: 20 (WebKit::LayerTreeContext::decode): 21 1 22 2013-02-01 Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> 2 23 -
trunk/Source/WebKit2/Platform/gtk/SharedMemoryGtk.cpp
r132361 r141640 47 47 } 48 48 49 bool SharedMemory::Handle::decode(CoreIPC::ArgumentDecoder *decoder, Handle& handle)49 bool SharedMemory::Handle::decode(CoreIPC::ArgumentDecoder& decoder, Handle& handle) 50 50 { 51 51 notImplemented(); -
trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp
r133075 r141640 58 58 } 59 59 60 static bool decodeImage(ArgumentDecoder *decoder, GRefPtr<GdkPixbuf>& pixbuf)60 static bool decodeImage(ArgumentDecoder& decoder, GRefPtr<GdkPixbuf>& pixbuf) 61 61 { 62 62 ShareableBitmap::Handle handle; 63 if (!decoder ->decode(handle))63 if (!decoder.decode(handle)) 64 64 return false; 65 65 … … 114 114 } 115 115 116 static bool decodeDataObject(ArgumentDecoder *decoder, RefPtr<DataObjectGtk>& dataObject)116 static bool decodeDataObject(ArgumentDecoder& decoder, RefPtr<DataObjectGtk>& dataObject) 117 117 { 118 118 RefPtr<DataObjectGtk> data = DataObjectGtk::create(); 119 119 120 120 bool hasText; 121 if (!decoder ->decode(hasText))121 if (!decoder.decode(hasText)) 122 122 return false; 123 123 if (hasText) { 124 124 String text; 125 if (!decoder ->decode(text))125 if (!decoder.decode(text)) 126 126 return false; 127 127 data->setText(text); … … 129 129 130 130 bool hasMarkup; 131 if (!decoder ->decode(hasMarkup))131 if (!decoder.decode(hasMarkup)) 132 132 return false; 133 133 if (hasMarkup) { 134 134 String markup; 135 if (!decoder ->decode(markup))135 if (!decoder.decode(markup)) 136 136 return false; 137 137 data->setMarkup(markup); … … 139 139 140 140 bool hasURL; 141 if (!decoder ->decode(hasURL))141 if (!decoder.decode(hasURL)) 142 142 return false; 143 143 if (hasURL) { 144 144 String url; 145 if (!decoder ->decode(url))145 if (!decoder.decode(url)) 146 146 return false; 147 147 data->setURL(KURL(KURL(), url), String()); … … 149 149 150 150 bool hasURIList; 151 if (!decoder ->decode(hasURIList))151 if (!decoder.decode(hasURIList)) 152 152 return false; 153 153 if (hasURIList) { 154 154 String uriList; 155 if (!decoder ->decode(uriList))155 if (!decoder.decode(uriList)) 156 156 return false; 157 157 data->setURIList(uriList); … … 159 159 160 160 bool hasImage; 161 if (!decoder ->decode(hasImage))161 if (!decoder.decode(hasImage)) 162 162 return false; 163 163 if (hasImage) { … … 186 186 } 187 187 188 bool ArgumentCoder<DragData>::decode(ArgumentDecoder *decoder, DragData& dragData)188 bool ArgumentCoder<DragData>::decode(ArgumentDecoder& decoder, DragData& dragData) 189 189 { 190 190 IntPoint clientPosition; 191 if (!decoder ->decode(clientPosition))191 if (!decoder.decode(clientPosition)) 192 192 return false; 193 193 194 194 IntPoint globalPosition; 195 if (!decoder ->decode(globalPosition))195 if (!decoder.decode(globalPosition)) 196 196 return false; 197 197 198 198 uint64_t sourceOperationMask; 199 if (!decoder ->decode(sourceOperationMask))199 if (!decoder.decode(sourceOperationMask)) 200 200 return false; 201 201 202 202 uint64_t flags; 203 if (!decoder ->decode(flags))203 if (!decoder.decode(flags)) 204 204 return false; 205 205 206 206 bool hasPlatformData; 207 if (!decoder ->decode(hasPlatformData))207 if (!decoder.decode(hasPlatformData)) 208 208 return false; 209 209 … … 227 227 } 228 228 229 static bool decodeGKeyFile(ArgumentDecoder *decoder, GOwnPtr<GKeyFile>& keyFile)229 static bool decodeGKeyFile(ArgumentDecoder& decoder, GOwnPtr<GKeyFile>& keyFile) 230 230 { 231 231 DataReference dataReference; 232 if (!decoder ->decode(dataReference))232 if (!decoder.decode(dataReference)) 233 233 return false; 234 234 … … 252 252 } 253 253 254 bool decode(ArgumentDecoder *decoder, GRefPtr<GtkPrintSettings>& printSettings)254 bool decode(ArgumentDecoder& decoder, GRefPtr<GtkPrintSettings>& printSettings) 255 255 { 256 256 GOwnPtr<GKeyFile> keyFile; … … 275 275 } 276 276 277 bool decode(ArgumentDecoder *decoder, GRefPtr<GtkPageSetup>& pageSetup)277 bool decode(ArgumentDecoder& decoder, GRefPtr<GtkPageSetup>& pageSetup) 278 278 { 279 279 GOwnPtr<GKeyFile> keyFile; -
trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.h
r133075 r141640 42 42 template<> struct ArgumentCoder<WebCore::DragData> { 43 43 static void encode(ArgumentEncoder&, const WebCore::DragData&); 44 static bool decode(ArgumentDecoder *, WebCore::DragData&);44 static bool decode(ArgumentDecoder&, WebCore::DragData&); 45 45 }; 46 46 47 47 void encode(ArgumentEncoder&, GtkPrintSettings*); 48 bool decode(ArgumentDecoder *, GRefPtr<GtkPrintSettings>&);48 bool decode(ArgumentDecoder&, GRefPtr<GtkPrintSettings>&); 49 49 50 50 void encode(ArgumentEncoder&, GtkPageSetup*); 51 bool decode(ArgumentDecoder *, GRefPtr<GtkPageSetup>&);51 bool decode(ArgumentDecoder&, GRefPtr<GtkPageSetup>&); 52 52 53 53 } // namespace CoreIPC -
trunk/Source/WebKit2/Shared/gtk/LayerTreeContextGtk.cpp
r132361 r141640 46 46 } 47 47 48 bool LayerTreeContext::decode(CoreIPC::ArgumentDecoder *decoder, LayerTreeContext& context)48 bool LayerTreeContext::decode(CoreIPC::ArgumentDecoder& decoder, LayerTreeContext& context) 49 49 { 50 return decoder ->decode(context.windowHandle);50 return decoder.decode(context.windowHandle); 51 51 } 52 52
Note: See TracChangeset
for help on using the changeset viewer.