Diff
Modified: trunk/Source/WebCore/ChangeLog (186820 => 186821)
--- trunk/Source/WebCore/ChangeLog 2015-07-14 22:06:57 UTC (rev 186820)
+++ trunk/Source/WebCore/ChangeLog 2015-07-14 22:24:54 UTC (rev 186821)
@@ -1,3 +1,12 @@
+2015-07-14 Anders Carlsson <[email protected]>
+
+ Remove wkPopupMenu from WebCoreSystemInterface; it's not called from WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=146945
+
+ Reviewed by Tim Horton.
+
+ * platform/mac/WebCoreSystemInterface.h:
+
2015-07-14 Wenson Hsieh <[email protected]>
Input buttons rendered at the wrong size when pinching-to-zoom
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (186820 => 186821)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2015-07-14 22:06:57 UTC (rev 186820)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2015-07-14 22:24:54 UTC (rev 186821)
@@ -179,10 +179,6 @@
extern void (*wkWindowSetAlpha)(NSWindow *, float);
extern void (*wkWindowSetScaledFrame)(NSWindow *, NSRect, NSRect);
-#if defined(__OBJC__)
-extern void (*wkPopupMenu)(NSMenu*, NSPoint location, float width, NSView*, int selectedItem, NSFont*, NSControlSize controlSize, bool usesCustomAppearance);
-#endif
-
extern unsigned (*wkQTIncludeOnlyModernMediaFileTypes)(void);
extern void (*wkQTMovieDisableComponent)(uint32_t[5]);
extern float (*wkQTMovieMaxTimeLoaded)(QTMovie*);
Modified: trunk/Source/WebKit/mac/ChangeLog (186820 => 186821)
--- trunk/Source/WebKit/mac/ChangeLog 2015-07-14 22:06:57 UTC (rev 186820)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-07-14 22:24:54 UTC (rev 186821)
@@ -1,3 +1,15 @@
+2015-07-14 Anders Carlsson <[email protected]>
+
+ Remove wkPopupMenu from WebCoreSystemInterface; it's not called from WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=146945
+
+ Reviewed by Tim Horton.
+
+ * WebCoreSupport/PopupMenuMac.mm:
+ (PopupMenuMac::show):
+ * WebCoreSupport/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface): Deleted.
+
2015-07-11 Nikita Vasilyev <[email protected]>
Web Inspector: Inspector should be able to be docked to the bottom of a narrow window
Modified: trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm (186820 => 186821)
--- trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm 2015-07-14 22:06:57 UTC (rev 186820)
+++ trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm 2015-07-14 22:24:54 UTC (rev 186821)
@@ -33,7 +33,7 @@
#import <WebCore/FrameView.h>
#import <WebCore/Page.h>
#import <WebCore/PopupMenuClient.h>
-#import <WebCore/WebCoreSystemInterface.h>
+#import <WebKitSystemInterface.h>
using namespace WebCore;
@@ -202,7 +202,7 @@
break;
}
- wkPopupMenu(menu, location, roundf(NSWidth(r)), dummyView.get(), index, font, controlSize, !m_client->menuStyle().hasDefaultAppearance());
+ WKPopupMenu(menu, location, roundf(NSWidth(r)), dummyView.get(), index, font, controlSize, !m_client->menuStyle().hasDefaultAppearance());
[m_popup dismissPopUp];
[dummyView removeFromSuperview];
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm (186820 => 186821)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2015-07-14 22:06:57 UTC (rev 186820)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2015-07-14 22:24:54 UTC (rev 186821)
@@ -82,7 +82,6 @@
INIT(CreateMediaUIControl);
INIT(WindowSetAlpha);
INIT(WindowSetScaledFrame);
- INIT(PopupMenu);
INIT(SetCGFontRenderingMode);
#endif
INIT(SetBaseCTM);
Modified: trunk/Source/WebKit2/ChangeLog (186820 => 186821)
--- trunk/Source/WebKit2/ChangeLog 2015-07-14 22:06:57 UTC (rev 186820)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-14 22:24:54 UTC (rev 186821)
@@ -1,5 +1,15 @@
2015-07-14 Anders Carlsson <[email protected]>
+ Remove wkPopupMenu from WebCoreSystemInterface; it's not called from WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=146945
+
+ Reviewed by Tim Horton.
+
+ * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface): Deleted.
+
+2015-07-14 Anders Carlsson <[email protected]>
+
Release assert under StyleResolver::loadPendingImages() caused by MemoryPressureHandler
https://bugs.webkit.org/show_bug.cgi?id=146940
rdar://problem/21605505
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (186820 => 186821)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2015-07-14 22:06:57 UTC (rev 186820)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2015-07-14 22:24:54 UTC (rev 186821)
@@ -75,7 +75,6 @@
INIT(HTTPRequestEnablePipelining);
#if !PLATFORM(IOS)
INIT(MeasureMediaUIPart);
- INIT(PopupMenu);
INIT(QTIncludeOnlyModernMediaFileTypes);
INIT(QTMovieDisableComponent);
INIT(QTMovieGetType);
