Changeset 239366 in webkit
- Timestamp:
- Dec 18, 2018 8:35:34 PM (5 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r239363 r239366 1 2018-12-18 Fujii Hironori <Hironori.Fujii@sony.com> 2 3 [Win][Clang] Fix compilation warnings under Source/WebKit directory 4 https://bugs.webkit.org/show_bug.cgi?id=192695 5 6 Reviewed by Alex Christensen. 7 8 * NetworkProcess/cache/NetworkCacheData.cpp: 9 (makeSalt): Enclosed by #if !OS(WINDOWS). 10 * NetworkProcess/cache/NetworkCacheFileSystem.cpp: 11 (WebKit::NetworkCache::directoryEntryType): Ditto. 12 * Platform/win/ModuleWin.cpp: 13 (WebKit::Module::platformFunctionPointer const): Cast a function pointer with reinterpret_cast<void*>(). 14 * UIProcess/DrawingAreaProxyImpl.cpp: 15 (WebKit::DrawingAreaProxyImpl::DrawingMonitor::DrawingMonitor): 16 Moved the initializer of m_webPage in order to be encluded by #if PLATFORM(GTK). 17 * UIProcess/DrawingAreaProxyImpl.h: Ditto. 18 * UIProcess/Launcher/win/ProcessLauncherWin.cpp: 19 (WebKit::processName): Removed the duplicated 'const' type qualifier. 20 * UIProcess/win/WebInspectorProxyWin.cpp: 21 (WebKit::WebInspectorProxy::platformAttach): Removed an unused variable. 22 (WebKit::WebInspectorProxy::platformDetach): Ditto. 23 * UIProcess/win/WebPopupMenuProxyWin.cpp: Ditto. 24 * UIProcess/win/WebView.cpp: 25 (WebKit::WebView::paint): Ditto. 26 (WebKit::WebPopupMenu::setUpPlatformData): Ditto. 27 * UIProcess/win/WebPopupMenuProxyWin.h: Marked override methods with 'override'. 28 * WebProcess/WebCoreSupport/curl/WebFrameNetworkingContext.h: Ditto. 29 * WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp: Removed an unused variable. 30 1 31 2018-12-18 Wenson Hsieh <wenson_hsieh@apple.com> 2 32 -
trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheData.cpp
r228455 r239366 143 143 } 144 144 145 #if !OS(WINDOWS) 145 146 static Salt makeSalt() 146 147 { … … 151 152 return salt; 152 153 } 154 #endif 153 155 154 156 std::optional<Salt> readOrMakeSalt(const String& path) -
trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheFileSystem.cpp
r237266 r239366 52 52 namespace NetworkCache { 53 53 54 #if !OS(WINDOWS) 54 55 static DirectoryEntryType directoryEntryType(uint8_t dtype) 55 56 { 56 #if !OS(WINDOWS)57 57 switch (dtype) { 58 58 case DT_DIR: … … 64 64 return DirectoryEntryType::File; 65 65 } 66 #else67 66 return DirectoryEntryType::File; 67 } 68 68 #endif 69 }70 69 71 70 void traverseDirectory(const String& path, const Function<void (const String&, DirectoryEntryType)>& function) -
trunk/Source/WebKit/Platform/win/ModuleWin.cpp
r223966 r239366 52 52 if (!m_module) 53 53 return 0; 54 return ::GetProcAddress(m_module, functionName); 54 auto proc = ::GetProcAddress(m_module, functionName); 55 return reinterpret_cast<void*>(proc); 55 56 } 56 57 -
trunk/Source/WebKit/UIProcess/DrawingAreaProxyImpl.cpp
r229209 r239366 201 201 202 202 DrawingAreaProxyImpl::DrawingMonitor::DrawingMonitor(WebPageProxy& webPage) 203 : m_webPage(webPage) 204 , m_timer(RunLoop::main(), this, &DrawingMonitor::stop) 203 : m_timer(RunLoop::main(), this, &DrawingMonitor::stop) 204 #if PLATFORM(GTK) 205 , m_webPage(webPage) 206 #endif 205 207 { 206 208 #if USE(GLIB_EVENT_LOOP) -
trunk/Source/WebKit/UIProcess/DrawingAreaProxyImpl.h
r229174 r239366 77 77 void didDraw(); 78 78 79 WebPageProxy& m_webPage;80 79 MonotonicTime m_startTime; 81 80 WTF::Function<void (CallbackBase::Error)> m_callback; 82 81 RunLoop::Timer<DrawingMonitor> m_timer; 82 #if PLATFORM(GTK) 83 WebPageProxy& m_webPage; 84 #endif 83 85 }; 84 86 -
trunk/Source/WebKit/UIProcess/Launcher/win/ProcessLauncherWin.cpp
r239092 r239366 36 36 namespace WebKit { 37 37 38 static constLPCWSTR processName(ProcessLauncher::ProcessType processType)38 static LPCWSTR processName(ProcessLauncher::ProcessType processType) 39 39 { 40 40 switch (processType) { -
trunk/Source/WebKit/UIProcess/win/WebInspectorProxyWin.cpp
r238771 r239366 302 302 static const unsigned minimumAttachedHeight = 250; 303 303 304 unsigned inspectedHeight = platformInspectedWindowHeight();305 unsigned inspectedWidth = platformInspectedWindowWidth();306 307 304 if (m_inspectorDetachWindow && ::GetParent(m_inspectorViewWindow) == m_inspectorDetachWindow) { 308 305 ::SetParent(m_inspectorViewWindow, m_inspectedViewParentWindow); … … 328 325 329 326 if (!m_inspectorDetachWindow) { 330 static bool haveRegisteredClass = false;331 327 registerWindowClass(); 332 328 m_inspectorDetachWindow = ::CreateWindowEx(0, WebInspectorProxyClassName, 0, WS_OVERLAPPEDWINDOW, -
trunk/Source/WebKit/UIProcess/win/WebPopupMenuProxyWin.cpp
r239092 r239366 51 51 static constexpr int maxPopupHeight = 320; 52 52 static constexpr int popupWindowBorderWidth = 1; 53 static constexpr int separatorPadding = 4;54 static constexpr int separatorHeight = 1;55 53 56 54 // This is used from within our custom message pump when we want to send a -
trunk/Source/WebKit/UIProcess/win/WebPopupMenuProxyWin.h
r234442 r239366 46 46 ~WebPopupMenuProxyWin(); 47 47 48 v irtual void showPopupMenu(const WebCore::IntRect&, WebCore::TextDirection, double pageScaleFactor, const Vector<WebPopupItem>&, const PlatformPopupMenuData&, int32_t selectedIndex);49 v irtual void hidePopupMenu();48 void showPopupMenu(const WebCore::IntRect&, WebCore::TextDirection, double pageScaleFactor, const Vector<WebPopupItem>&, const PlatformPopupMenuData&, int32_t selectedIndex) override; 49 void hidePopupMenu() override; 50 50 51 51 bool setFocusedIndex(int index, bool hotTracking = false); -
trunk/Source/WebKit/UIProcess/win/WebView.cpp
r239092 r239366 475 475 476 476 Vector<IntRect> unpaintedRects = unpaintedRegion.rects(); 477 for (size_t i = 0; i < unpaintedRects.size(); ++i) { 478 RECT winRect = unpaintedRects[i]; 479 drawPageBackground(hdc, m_page.get(), unpaintedRects[i]); 480 } 477 for (auto& rect : unpaintedRects) 478 drawPageBackground(hdc, m_page.get(), rect); 481 479 } else 482 480 drawPageBackground(hdc, m_page.get(), dirtyRect); -
trunk/Source/WebKit/WebProcess/WebCoreSupport/curl/WebFrameNetworkingContext.h
r224961 r239366 48 48 49 49 #if PLATFORM(WIN) 50 WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const ;50 WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const override; 51 51 #endif 52 52 -
trunk/Source/WebKit/WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp
r235205 r239366 112 112 String itemText = m_popupClient->itemText(index); 113 113 114 TextDirection direction = itemText.defaultWritingDirection() == U_RIGHT_TO_LEFT ? TextDirection::RTL : TextDirection::LTR;115 114 TextRun textRun(itemText, 0, 0, AllowTrailingExpansion, itemStyle.textDirection(), itemStyle.hasTextDirectionOverride()); 116 115
Note: See TracChangeset
for help on using the changeset viewer.