Diff
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (179272 => 179273)
--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-28 18:48:22 UTC (rev 179272)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-28 18:50:21 UTC (rev 179273)
@@ -1,5 +1,24 @@
2015-01-27 Lucas Forschler <[email protected]>
+ Merge r177666
+
+ 2014-12-22 Chris Dumez <[email protected]>
+
+ [iOS] Log using FeatureCounter user-triggered zooming
+ https://bugs.webkit.org/show_bug.cgi?id=139879
+ <rdar://problem/19329130>
+
+ Reviewed by Benjamin Poulain.
+
+ Log using FeatureCounter user-triggered zooming on iOS.
+
+ * WebCore.exp.in:
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/FeatureCounter.h:
+ * platform/FeatureCounterKeys.h:
+
+2015-01-27 Lucas Forschler <[email protected]>
+
Merge r177647
2014-12-22 Chris Dumez <[email protected]>
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.exp.in (179272 => 179273)
--- branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.exp.in 2015-01-28 18:48:22 UTC (rev 179272)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.exp.in 2015-01-28 18:50:21 UTC (rev 179273)
@@ -357,6 +357,7 @@
__ZN7WebCore14DocumentLoaderC2ERKNS_15ResourceRequestERKNS_14SubstituteDataE
__ZN7WebCore14DocumentLoaderD2Ev
__ZN7WebCore14DocumentWriter11setEncodingERKN3WTF6StringEb
+__ZN7WebCore14FeatureCounter12incrementKeyEPNS_4PageEPKc
__ZN7WebCore14FileIconLoader14notifyFinishedEN3WTF10PassRefPtrINS_4IconEEE
__ZN7WebCore14FormController22getReferencedFilePathsERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEE
__ZN7WebCore14FrameSelection10setFocusedEb
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj (179272 => 179273)
--- branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-01-28 18:48:22 UTC (rev 179272)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-01-28 18:50:21 UTC (rev 179273)
@@ -1580,7 +1580,7 @@
45FEA5D0156DDE8C00654101 /* Decimal.h in Headers */ = {isa = PBXBuildFile; fileRef = 45FEA5CE156DDE8C00654101 /* Decimal.h */; settings = {ATTRIBUTES = (Private, ); }; };
467438541A421330000494FB /* FeatureCounter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 467438531A421330000494FB /* FeatureCounter.mm */; };
46779CE21A40B97200B6864E /* FeatureCounter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46779CE01A40B97100B6864E /* FeatureCounter.cpp */; };
- 46779CE31A40B97200B6864E /* FeatureCounter.h in Headers */ = {isa = PBXBuildFile; fileRef = 46779CE11A40B97200B6864E /* FeatureCounter.h */; };
+ 46779CE31A40B97200B6864E /* FeatureCounter.h in Headers */ = {isa = PBXBuildFile; fileRef = 46779CE11A40B97200B6864E /* FeatureCounter.h */; settings = {ATTRIBUTES = (Private, ); }; };
4689F1AF1267BAE100E8D380 /* FileMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 4689F1AE1267BAE100E8D380 /* FileMetadata.h */; };
46BD16E30B279473001F0839 /* noneCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 46BD16E20B279473001F0839 /* noneCursor.png */; };
46D4F2490AF97E810035385A /* cellCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 46D4F2460AF97E810035385A /* cellCursor.png */; };
@@ -2293,6 +2293,7 @@
71E623D1151F72A60036E2F4 /* SVGAnimatedIntegerOptionalInteger.h in Headers */ = {isa = PBXBuildFile; fileRef = 71E623CF151F72A60036E2F4 /* SVGAnimatedIntegerOptionalInteger.h */; };
71FB967B1383D64600AC8A4C /* SVGAnimatedEnumerationPropertyTearOff.h in Headers */ = {isa = PBXBuildFile; fileRef = 71FB967A1383D64600AC8A4C /* SVGAnimatedEnumerationPropertyTearOff.h */; settings = {ATTRIBUTES = (Private, ); }; };
72626E020EF022FE00A07E20 /* FontFastPath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72626E010EF022FE00A07E20 /* FontFastPath.cpp */; };
+ 72C50CD01A796475000C86F1 /* FeatureCounterKeys.h in Headers */ = {isa = PBXBuildFile; fileRef = 72C50CCF1A796475000C86F1 /* FeatureCounterKeys.h */; settings = {ATTRIBUTES = (Private, ); }; };
750D029411D0E7F300BD1B27 /* RenderInputSpeech.h in Headers */ = {isa = PBXBuildFile; fileRef = 750D029211D0E7F300BD1B27 /* RenderInputSpeech.h */; };
754133A8102E00E800075D00 /* InspectorTimelineAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 754133A7102E00E800075D00 /* InspectorTimelineAgent.h */; };
754133AA102E00F400075D00 /* InspectorTimelineAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 754133A9102E00F400075D00 /* InspectorTimelineAgent.cpp */; };
@@ -9437,6 +9438,7 @@
71E623CF151F72A60036E2F4 /* SVGAnimatedIntegerOptionalInteger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedIntegerOptionalInteger.h; sourceTree = "<group>"; };
71FB967A1383D64600AC8A4C /* SVGAnimatedEnumerationPropertyTearOff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedEnumerationPropertyTearOff.h; sourceTree = "<group>"; };
72626E010EF022FE00A07E20 /* FontFastPath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontFastPath.cpp; sourceTree = "<group>"; };
+ 72C50CCF1A796475000C86F1 /* FeatureCounterKeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FeatureCounterKeys.h; sourceTree = "<group>"; };
750D029211D0E7F300BD1B27 /* RenderInputSpeech.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderInputSpeech.h; sourceTree = "<group>"; };
754133A7102E00E800075D00 /* InspectorTimelineAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorTimelineAgent.h; sourceTree = "<group>"; };
754133A9102E00F400075D00 /* InspectorTimelineAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorTimelineAgent.cpp; sourceTree = "<group>"; };
@@ -21369,6 +21371,7 @@
1CA19E150DC255CA0065A994 /* EventLoop.h */,
46779CE01A40B97100B6864E /* FeatureCounter.cpp */,
46779CE11A40B97200B6864E /* FeatureCounter.h */,
+ 72C50CCF1A796475000C86F1 /* FeatureCounterKeys.h */,
934FE9E40B5CA539003E4A73 /* FileChooser.cpp */,
066C772A0AB603B700238CC4 /* FileChooser.h */,
2EF1BFE8121C9F4200C27627 /* FileStream.cpp */,
@@ -25802,6 +25805,7 @@
4998AEC613F9D0EA0090B1AA /* RequestAnimationFrameCallback.h in Headers */,
F55B3DD01251F12D003EF269 /* ResetInputType.h in Headers */,
514BC843161CF05C004D52F4 /* ResourceBuffer.h in Headers */,
+ 72C50CD01A796475000C86F1 /* FeatureCounterKeys.h in Headers */,
7EE6846A12D26E3800E79415 /* ResourceError.h in Headers */,
934F713C0D5A6F1900018D69 /* ResourceErrorBase.h in Headers */,
514C76790CE923A1007EF3CD /* ResourceHandle.h in Headers */,
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/FeatureCounterKeys.h (179272 => 179273)
--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/FeatureCounterKeys.h 2015-01-28 18:48:22 UTC (rev 179272)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/FeatureCounterKeys.h 2015-01-28 18:50:21 UTC (rev 179273)
@@ -100,6 +100,9 @@
static const char FeatureCounterResourceRequestInMemoryCacheUnusedReasonErrorKey[] = "com.apple.WebKit.resourceRequest.inMemoryCache.unused.reason.error";
static const char FeatureCounterResourceRequestInMemoryCacheUnusedReasonMustRevalidateNoValidatorKey[] = "com.apple.WebKit.resourceRequest.inMemoryCache.unused.reason.mustRevalidateNoValidator";
+// WebView user actions.
+static const char FeatureCounterWebViewUserZoomedKey[] = "com.apple.WebKit.webView.user.zoomed";
+
} // namespace WebCore
#endif // FeatureCounterKeys_h
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog (179272 => 179273)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-28 18:48:22 UTC (rev 179272)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-28 18:50:21 UTC (rev 179273)
@@ -1,5 +1,22 @@
2015-01-27 Lucas Forschler <[email protected]>
+ Merge r177666
+
+ 2014-12-22 Chris Dumez <[email protected]>
+
+ [iOS] Log using FeatureCounter user-triggered zooming
+ https://bugs.webkit.org/show_bug.cgi?id=139879
+ <rdar://problem/19329130>
+
+ Reviewed by Benjamin Poulain.
+
+ Log using FeatureCounter user-triggered zooming on iOS.
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::willStartUserTriggeredZooming):
+
+2015-01-27 Lucas Forschler <[email protected]>
+
Merge r177612
2014-12-19 Chris Dumez <[email protected]>
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (179272 => 179273)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-01-28 18:48:22 UTC (rev 179272)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-01-28 18:50:21 UTC (rev 179273)
@@ -52,6 +52,7 @@
#import <WebCore/DNS.h>
#import <WebCore/Element.h>
#import <WebCore/EventHandler.h>
+#import <WebCore/FeatureCounter.h>
#import <WebCore/FloatQuad.h>
#import <WebCore/FocusController.h>
#import <WebCore/Frame.h>
@@ -2594,6 +2595,7 @@
void WebPage::willStartUserTriggeredZooming()
{
+ FEATURE_COUNTER_INCREMENT_KEY(m_page.get(), FeatureCounterWebViewUserZoomedKey);
m_userHasChangedPageScaleFactor = true;
}
