/
ironframe-2016-09-06-11-50-41.diff
1563 lines (1505 loc) · 66.1 KB
/
ironframe-2016-09-06-11-50-41.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.cc b/chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.cc
index dc2889d..604ccf5 100644
--- a/chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.cc
+++ b/chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.cc
@@ -80,6 +80,24 @@ ChromeToolbarModelDelegate::GetSecurityLevel() const {
return client->GetSecurityInfo().security_level;
}
+int
+ChromeToolbarModelDelegate::GetIronframeStatus() const {
+ content::WebContents* web_contents = GetActiveWebContents();
+ // If there is no active WebContents (which can happen during toolbar
+ // initialization), assume no security style.
+ if (!web_contents)
+ return 0;
+ return web_contents->IronframeStatus();
+}
+
+std::string
+ChromeToolbarModelDelegate::GetIronframeOrigin() const {
+ content::WebContents* web_contents = GetActiveWebContents();
+ if (!web_contents)
+ return std::string();
+ return web_contents->IronframeOrigin();
+}
+
scoped_refptr<net::X509Certificate> ChromeToolbarModelDelegate::GetCertificate()
const {
scoped_refptr<net::X509Certificate> cert;
diff --git a/chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.h b/chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.h
index 42806b9..711c6f4 100644
--- a/chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.h
+++ b/chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.h
@@ -34,6 +34,8 @@ class ChromeToolbarModelDelegate : public ToolbarModelDelegate {
bool GetURL(GURL* url) const override;
bool ShouldDisplayURL() const override;
SecurityLevel GetSecurityLevel() const override;
+ int GetIronframeStatus() const override;
+ std::string GetIronframeOrigin() const override;
scoped_refptr<net::X509Certificate> GetCertificate() const override;
// Returns the navigation controller used to retrieve the navigation entry
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 1946e31..76ad277 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -590,7 +590,9 @@ void LocationBarView::Layout() {
const int vertical_padding = GetVerticalEdgeThicknessWithPadding();
const int location_height = std::max(height() - (vertical_padding * 2), 0);
- location_icon_view_->SetLabel(base::string16());
+ if (GetToolbarModel()->GetIronframeStatus() == 0) {
+ location_icon_view_->SetLabel(base::string16());
+ }
location_icon_view_->SetBackground(false);
if (ShouldShowKeywordBubble()) {
leading_decorations.AddDecoration(vertical_padding, location_height, true,
@@ -613,7 +615,9 @@ void LocationBarView::Layout() {
}
}
} else if (ShouldShowSecurityChip()) {
- location_icon_view_->SetLabel(GetSecurityText());
+ if (GetToolbarModel()->GetIronframeStatus() == 0) {
+ location_icon_view_->SetLabel(GetSecurityText());
+ }
location_icon_view_->SetBackground(true);
// The largest fraction of the omnibox that can be taken by the EV bubble.
const double kMaxBubbleFraction = 0.5;
@@ -859,8 +863,20 @@ void LocationBarView::RefreshLocationIcon() {
return;
if (ui::MaterialDesignController::IsModeMaterial()) {
- security_state::SecurityStateModel::SecurityLevel security_level =
- GetToolbarModel()->GetSecurityLevel(false);
+ int ironframe_status = GetToolbarModel()->GetIronframeStatus();
+ security_state::SecurityStateModel::SecurityLevel security_level =
+ GetToolbarModel()->GetSecurityLevel(false);
+
+ if (ironframe_status != 0) {
+ //security_level = security_state::SecurityStateModel::SECURE;
+ if (ironframe_status == 1) {
+ security_level = security_state::SecurityStateModel::SECURE;
+ location_icon_view_->SetLabel(base::ASCIIToUTF16(GetToolbarModel()->GetIronframeOrigin()));
+ } else if (ironframe_status == 2) {
+ security_level = security_state::SecurityStateModel::SECURITY_ERROR;
+ }
+ }
+
SkColor icon_color =
(security_level == security_state::SecurityStateModel::NONE)
? color_utils::DeriveDefaultIconColor(GetColor(TEXT))
@@ -1048,8 +1064,13 @@ bool LocationBarView::ShouldShowKeywordBubble() const {
}
bool LocationBarView::ShouldShowEVBubble() const {
- return (GetToolbarModel()->GetSecurityLevel(false) ==
- security_state::SecurityStateModel::EV_SECURE);
+ int ironframe_status = GetToolbarModel()->GetIronframeStatus();
+ if (ironframe_status == 1) {
+ return security_state::SecurityStateModel::EV_SECURE;
+ }
+
+ return (GetToolbarModel()->GetSecurityLevel(false) ==
+ security_state::SecurityStateModel::EV_SECURE);
}
bool LocationBarView::ShouldShowSecurityChip() const {
diff --git a/components/toolbar/toolbar_model.h b/components/toolbar/toolbar_model.h
index 19c60d1..145b659 100644
--- a/components/toolbar/toolbar_model.h
+++ b/components/toolbar/toolbar_model.h
@@ -43,6 +43,9 @@ class ToolbarModel {
virtual security_state::SecurityStateModel::SecurityLevel GetSecurityLevel(
bool ignore_editing) const = 0;
+ virtual int GetIronframeStatus() const = 0;
+ virtual std::string GetIronframeOrigin() const = 0;
+
// Returns the resource_id of the icon to show to the left of the address,
// based on the current URL. When search term replacement is active, this
// returns a search icon. This doesn't cover specialized icons while the
diff --git a/components/toolbar/toolbar_model_delegate.h b/components/toolbar/toolbar_model_delegate.h
index 4bec77c..6cc8255 100644
--- a/components/toolbar/toolbar_model_delegate.h
+++ b/components/toolbar/toolbar_model_delegate.h
@@ -40,6 +40,10 @@ class ToolbarModelDelegate {
// user edits that may be in progress.
virtual SecurityLevel GetSecurityLevel() const = 0;
+ virtual int GetIronframeStatus() const = 0;
+
+ virtual std::string GetIronframeOrigin() const = 0;
+
// Returns the certificate for the current navigation entry.
virtual scoped_refptr<net::X509Certificate> GetCertificate() const = 0;
diff --git a/components/toolbar/toolbar_model_impl.cc b/components/toolbar/toolbar_model_impl.cc
index 47388f7..862df4b 100644
--- a/components/toolbar/toolbar_model_impl.cc
+++ b/components/toolbar/toolbar_model_impl.cc
@@ -70,6 +70,21 @@ SecurityStateModel::SecurityLevel ToolbarModelImpl::GetSecurityLevel(
: delegate_->GetSecurityLevel();
}
+int ToolbarModelImpl::GetIronframeStatus() const {
+ // When editing or empty, assume no ironframe
+ return ((input_in_progress()) || !ShouldDisplayURL())
+ ? 0
+ : delegate_->GetIronframeStatus();
+}
+
+std::string ToolbarModelImpl::GetIronframeOrigin() const {
+ // When editing or empty, assume no ironframe
+ base::string16 empty;
+ return ((input_in_progress()) || !ShouldDisplayURL())
+ ? std::string()
+ : delegate_->GetIronframeOrigin();
+}
+
int ToolbarModelImpl::GetIcon() const {
switch (GetSecurityLevel(false)) {
case SecurityStateModel::NONE:
diff --git a/components/toolbar/toolbar_model_impl.h b/components/toolbar/toolbar_model_impl.h
index c60177e..725a234 100644
--- a/components/toolbar/toolbar_model_impl.h
+++ b/components/toolbar/toolbar_model_impl.h
@@ -32,6 +32,10 @@ class ToolbarModelImpl : public ToolbarModel {
GURL GetURL() const override;
security_state::SecurityStateModel::SecurityLevel GetSecurityLevel(
bool ignore_editing) const override;
+
+ int GetIronframeStatus() const override;
+ std::string GetIronframeOrigin() const override;
+
int GetIcon() const override;
gfx::VectorIconId GetVectorIcon() const override;
base::string16 GetSecureVerboseText() const override;
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 878d780..45bdbe5 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -692,6 +692,12 @@ bool WebContentsImpl::OnMessageReceived(RenderViewHost* render_view_host,
OnFirstVisuallyNonEmptyPaint)
IPC_MESSAGE_HANDLER(FrameHostMsg_DidLoadResourceFromMemoryCache,
OnDidLoadResourceFromMemoryCache)
+ IPC_MESSAGE_HANDLER(FrameHostMsg_IronframeOrigin,
+ OnIronframeOrigin)
+ IPC_MESSAGE_HANDLER(FrameHostMsg_ValidIronframe,
+ OnValidIronframe)
+ IPC_MESSAGE_HANDLER(FrameHostMsg_InvalidIronframe,
+ OnInvalidIronframe)
IPC_MESSAGE_HANDLER(FrameHostMsg_DidDisplayInsecureContent,
OnDidDisplayInsecureContent)
IPC_MESSAGE_HANDLER(FrameHostMsg_DidRunInsecureContent,
@@ -1186,6 +1192,14 @@ const std::string& WebContentsImpl::GetEncoding() const {
return canonical_encoding_;
}
+int WebContentsImpl::IronframeStatus() const {
+ return ironframe_status_;
+}
+
+bool WebContentsImpl::DisplayedInsecureContent() const {
+ return displayed_insecure_content_;
+}
+
void WebContentsImpl::IncrementCapturerCount(const gfx::Size& capture_size) {
DCHECK(!is_being_destroyed_);
++capturer_count_;
@@ -2511,10 +2525,6 @@ void WebContentsImpl::ResizeDueToAutoResize(
delegate_->ResizeDueToAutoResize(this, new_size);
}
-bool WebContentsImpl::DisplayedInsecureContent() const {
- return displayed_insecure_content_;
-}
-
bool WebContentsImpl::DisplayedContentWithCertErrors() const {
return displayed_content_with_cert_errors_;
}
@@ -3467,6 +3477,27 @@ void WebContentsImpl::OnDidLoadResourceFromMemoryCache(
}
}
+
+std::string WebContentsImpl::IronframeOrigin() const {
+ RecordAction(base::UserMetricsAction("Ironframe.Origin"));
+ return ironframe_origin_;
+}
+
+void WebContentsImpl::OnIronframeOrigin(const std::string& origin) {
+ ironframe_origin_ = origin;
+}
+
+void WebContentsImpl::OnValidIronframe() {
+ RecordAction(base::UserMetricsAction("Ironframe.Valid"));
+ ironframe_status_ = 1;
+ this->DidChangeVisibleSSLState();
+}
+void WebContentsImpl::OnInvalidIronframe() {
+ RecordAction(base::UserMetricsAction("Ironframe.Invalid"));
+ ironframe_status_ = 2;
+ this->DidChangeVisibleSSLState();
+}
+
void WebContentsImpl::OnDidDisplayInsecureContent() {
RecordAction(base::UserMetricsAction("SSL.DisplayedInsecureContent"));
displayed_insecure_content_ = true;
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 9a1fbe0..2533688 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -291,6 +291,9 @@ class CONTENT_EXPORT WebContentsImpl
uint64_t GetUploadSize() const override;
uint64_t GetUploadPosition() const override;
const std::string& GetEncoding() const override;
+ int IronframeStatus() const override;
+ std::string IronframeOrigin() const override;
+ bool DisplayedInsecureContent() const override;
void IncrementCapturerCount(const gfx::Size& capture_size) override;
void DecrementCapturerCount() override;
int GetCapturerCount() const override;
@@ -405,10 +408,6 @@ class CONTENT_EXPORT WebContentsImpl
bool GetAllowOtherViews() override;
#endif
- // Returns true if this is a secure page which has displayed content
- // loaded over insecure HTTP.
- bool DisplayedInsecureContent() const;
-
// Returns true if this page has displayed content loaded over HTTPS
// with certificate errors.
bool DisplayedContentWithCertErrors() const;
@@ -918,6 +917,9 @@ class CONTENT_EXPORT WebContentsImpl
const std::string& http_request,
const std::string& mime_type,
ResourceType resource_type);
+ void OnIronframeOrigin(const std::string& origin);
+ void OnValidIronframe();
+ void OnInvalidIronframe();
void OnDidDisplayInsecureContent();
void OnDidRunInsecureContent(const GURL& security_origin,
const GURL& target_url);
@@ -1208,8 +1210,11 @@ class CONTENT_EXPORT WebContentsImpl
// The canonicalized character encoding.
std::string canonical_encoding_;
- // True if this is a secure page which displayed mixed content (loaded
- // over HTTP).
+ // 0 - no ironframe, 1 - valid ironframe, 2 - invalid ironframe
+ int ironframe_status_;
+ std::string ironframe_origin_;
+
+ // True if this is a secure page which displayed insecure content.
bool displayed_insecure_content_;
// True if this page displayed subresources loaded with HTTPS
diff --git a/content/common/frame_messages.h b/content/common/frame_messages.h
index 64ef075..6724bdd 100644
--- a/content/common/frame_messages.h
+++ b/content/common/frame_messages.h
@@ -1460,6 +1460,10 @@ IPC_MESSAGE_ROUTED0(FrameHostMsg_DispatchLoad)
IPC_MESSAGE_ROUTED1(FrameHostMsg_RouteMessageEvent,
FrameMsg_PostMessage_Params)
+IPC_MESSAGE_ROUTED1(FrameHostMsg_IronframeOrigin, std::string)
+IPC_MESSAGE_ROUTED0(FrameHostMsg_ValidIronframe)
+IPC_MESSAGE_ROUTED0(FrameHostMsg_InvalidIronframe)
+
// Sent when the renderer displays insecure content in a secure origin.
IPC_MESSAGE_ROUTED0(FrameHostMsg_DidDisplayInsecureContent)
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
index ad3c35a..9ab8cb5 100644
--- a/content/public/browser/web_contents.h
+++ b/content/public/browser/web_contents.h
@@ -364,6 +364,12 @@ class WebContents : public PageNavigator,
// Returns the character encoding of the page.
virtual const std::string& GetEncoding() const = 0;
+ virtual int IronframeStatus() const = 0;
+ virtual std::string IronframeOrigin() const = 0;
+
+ // True if this is a secure page which displayed insecure content.
+ virtual bool DisplayedInsecureContent() const = 0;
+
// Internal state ------------------------------------------------------------
// Indicates whether the WebContents is being captured (e.g., for screenshots
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index cefdf2b..e2d01ef 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4175,6 +4175,18 @@ void RenderFrameImpl::didLoadResourceFromMemoryCache(
WebURLRequestToResourceType(request)));
}
+void RenderFrameImpl::ironframeOrigin(const blink::WebCString& origin) {
+ Send(new FrameHostMsg_IronframeOrigin(routing_id_, origin));
+}
+
+void RenderFrameImpl::validIronframe() {
+ Send(new FrameHostMsg_ValidIronframe(routing_id_));
+}
+
+void RenderFrameImpl::invalidIronframe() {
+ Send(new FrameHostMsg_InvalidIronframe(routing_id_));
+}
+
void RenderFrameImpl::didDisplayInsecureContent() {
Send(new FrameHostMsg_DidDisplayInsecureContent(routing_id_));
}
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 4427706..5c52e38 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -566,6 +566,9 @@ class CONTENT_EXPORT RenderFrameImpl
void didLoadResourceFromMemoryCache(
const blink::WebURLRequest& request,
const blink::WebURLResponse& response) override;
+ void validIronframe() override;
+ void invalidIronframe() override;
+ void ironframeOrigin(const blink::WebCString& origin) override;
void didDisplayInsecureContent() override;
void didRunInsecureContent(const blink::WebSecurityOrigin& origin,
const blink::WebURL& target) override;
diff --git a/third_party/WebKit/LayoutTests/http/tests/ironframe/ironframe.html b/third_party/WebKit/LayoutTests/http/tests/ironframe/ironframe.html
new file mode 100644
index 0000000..79978b4
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/http/tests/ironframe/ironframe.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<meta name="timeout" content="long"></meta>
+<head>
+</head>
+<body>
+ <pre id="result">UNSET</pre>
+ <div id=prot style="height:480;width:700;background-image:url('tile.gif');">
+ <iframe id=protfr border=0 frameBorder=0 scrolling="no" src="resources/openskies3.html" style="height:270;width:333"></iframe>
+ </div>
+ <script>
+ var t = async_test('IronFrame scroll test');
+ setTimeout(function(){
+ t.step(function () {
+ assert_equals(document.getElementById("result").innerHTML, "PASS", "Scroll incorrect");
+ });
+ t.done();
+ }, 3000);
+ </script>
+ <script>
+ function scrollWindow() {
+ setTimeout(function(){window.scrollTo(0, 1);}, 1000);
+ setTimeout(function(){window.scrollTo(0, 100);}, 2000);
+ }
+ window.addEventListener("load", scrollWindow, false);
+ </script>
+ DUMMY CONTENT
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ DUMMY CONTENT
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/http/tests/ironframe/ishi.jpg b/third_party/WebKit/LayoutTests/http/tests/ironframe/ishi.jpg
new file mode 100644
index 0000000..caea5cc
Binary files /dev/null and b/third_party/WebKit/LayoutTests/http/tests/ironframe/ishi.jpg differ
diff --git a/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/closedskies3.html b/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/closedskies3.html
new file mode 100644
index 0000000..cd9e029
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/closedskies3.html
@@ -0,0 +1,2 @@
+<body>
+ <iframe id="bigframe" style="position:absolute;top:0;left:0" border=0 frameBorder=0 scrolling="no" height=3000 width=3000 src="unprotected3.html"></iframe>
diff --git a/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/eviliron.html b/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/eviliron.html
new file mode 100644
index 0000000..51656e4
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/eviliron.html
@@ -0,0 +1,4 @@
+<html>
+ <script>
+ </script>
+ <img src="ishi.jpg">
diff --git a/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/fileserver.go b/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/fileserver.go
new file mode 100644
index 0000000..1a1dceb
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/fileserver.go
@@ -0,0 +1,15 @@
+// httpserver.go
+package main
+
+import (
+ "flag"
+ "net/http"
+)
+
+var port = flag.String("port", "8080", "Define what TCP port to bind to")
+var root = flag.String("root", ".", "Define the root filesystem path")
+
+func main() {
+ flag.Parse()
+ panic(http.ListenAndServe(":"+*port, http.FileServer(http.Dir(*root))))
+}
\ No newline at end of file
diff --git a/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/ishi.jpg b/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/ishi.jpg
new file mode 100644
index 0000000..caea5cc
Binary files /dev/null and b/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/ishi.jpg differ
diff --git a/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/openskies3.html b/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/openskies3.html
new file mode 100644
index 0000000..edecfff
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/openskies3.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<body>
+ <pre id="result1"></pre>
+ <iframe id="bigframe" style="position:absolute;top:0;left:0" border=0 frameBorder=0 scrolling="no" height=3000 width=3000 src="protected3.html">
+ </iframe>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/paypal.png b/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/paypal.png
new file mode 100644
index 0000000..9feafc5
Binary files /dev/null and b/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/paypal.png differ
diff --git a/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/price.png b/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/price.png
new file mode 100644
index 0000000..7d864c6
Binary files /dev/null and b/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/price.png differ
diff --git a/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/protected3.html b/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/protected3.html
new file mode 100644
index 0000000..9824401
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/protected3.html
@@ -0,0 +1,61 @@
+<html requestVisibility=1>
+ <body>
+ <script>
+ var enabled=true;
+ var numAlerts = 0;
+ var width0 = -1;
+ var height0 = -1;
+ var width1 = -1;
+ var height1 = -1;
+ </script>
+ <img src="paypal.png" style="position:absolute;top:0;left:0">
+ <script>
+ var prev;
+ var prevMsg="";
+ var v={};
+ var visible=false;
+
+ var update = function(){
+ if(v.visible.width < 333 || v.visible.height< 270 ) {
+ visible=false;
+ } else {
+ visible=true;
+ }
+ if (width0 == - 1) {
+ if (v.visible.width != 300 || v.visible.height != 150) {
+ window.top.document.getElementById("result").innerHTML = "FAIL";
+ } else {
+ window.top.document.getElementById("result").innerHTML = "PARTIAL PASS";
+ }
+ width0 = v.visible.width;
+ height0 = v.visible.height;
+ } else if (width0 != v.visible.width || height0 != v.visible.height) {
+ if (v.visible.width != 300 || v.visible.height != 92) {
+ window.top.document.getElementById("result").innerHTML = "FAIL";
+ } else {
+ window.top.document.getElementById("result").innerHTML = "PASS";
+ }
+
+ if (width1 == -1) {
+ width1 = v.visible.width;
+ height1 = v.visible.height;
+ }
+ }
+ }
+ function go() {
+ document.documentElement.addEventListener('requestedvisibility', function(e) {
+ if(e.message!=prevMsg){
+ prev=e.timeStamp;
+ prevMsg=e.message;
+ }
+ v = JSON.parse(e.message);
+ v.innerHeight = innerHeight;
+ v.innerWidth = innerWidth;
+ v.ancestorOrigins = document.location.ancestorOrigins;
+ update();
+ });
+ }
+ if(enabled) { window.onload=go; }
+ </script>
+ </body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/tile.gif b/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/tile.gif
new file mode 100644
index 0000000..6c950c8
Binary files /dev/null and b/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/tile.gif differ
diff --git a/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/unprotected3.html b/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/unprotected3.html
new file mode 100644
index 0000000..a53192d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/unprotected3.html
@@ -0,0 +1,61 @@
+<html>
+ <!-- could also be
+ <html requestVisibility=1>
+ !-->
+ <body>
+ <script>
+ var enabled=false;
+ if(parent.frameElement.id!="unprotfr"){
+ document.requestVisibility();
+ enabled=true;
+ }
+
+ </script>
+
+ <img src="paypal.png" style="position:absolute;top:0;left:0">
+ <script>
+ var prev;
+ var prevMsg="";
+ var v={};
+ var visible=false;
+ var viz = top.document.getElementById("viz").contentWindow.document.getElementById("render");
+
+ var update = function(){
+ if(v.visible.width < 333 ||
+ v.visible.height< 270 ) {
+ visible=false;
+ } else {
+ visible=true;
+ }
+ if(!visible) {
+ viz.style.backgroundColor="red";
+ } else {
+ if(visible && Date.now()-prev < 2000) {
+ viz.style.backgroundColor="yellow";
+ setTimeout(update, 2250);
+ } else {
+ viz.style.backgroundColor="white";
+ }
+ }
+ }
+
+ function go() { document.documentElement.onerror = function(e) {
+ if(e.message!=prevMsg){
+ prev=e.timeStamp;
+ prevMsg=e.message;
+ }
+ v = JSON.parse(e.message);
+ v.innerHeight = innerHeight;
+ v.innerWidth = innerWidth;
+ v.timestamp = e.timeStamp;
+ v.ancestorOrigins = document.location.ancestorOrigins;
+ viz.innerText = JSON.stringify(v);
+ var x = viz.innerText;
+ update();
+ //console.log(viz.innerText);
+ }
+ }
+ if(enabled) { window.onload=go; }
+ </script>
+ </body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/viz.html b/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/viz.html
new file mode 100644
index 0000000..5d2f5b0f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/http/tests/ironframe/resources/viz.html
@@ -0,0 +1,13 @@
+<head>
+ <style>
+ body{
+
+ font-family: 'Open Sans', sans-serif !important;
+ font-size: 14px;
+ }
+ </style>
+
+</head>
+<body>
+ <div style="word-wrap:break-word;font-size:24px" id="render"> </div>
+</body>
diff --git a/third_party/WebKit/LayoutTests/http/tests/ironframe/tile.gif b/third_party/WebKit/LayoutTests/http/tests/ironframe/tile.gif
new file mode 100644
index 0000000..6c950c8
Binary files /dev/null and b/third_party/WebKit/LayoutTests/http/tests/ironframe/tile.gif differ
diff --git a/third_party/WebKit/Source/bindings/core/v8/BUILD.gn b/third_party/WebKit/Source/bindings/core/v8/BUILD.gn
index 4c915e3..da3ec8b 100644
--- a/third_party/WebKit/Source/bindings/core/v8/BUILD.gn
+++ b/third_party/WebKit/Source/bindings/core/v8/BUILD.gn
@@ -56,6 +56,8 @@ generated_core_dictionary_files = [
"$blink_core_output_dir/events/DragEventInit.h",
"$blink_core_output_dir/events/ErrorEventInit.cpp",
"$blink_core_output_dir/events/ErrorEventInit.h",
+ "$blink_core_output_dir/events/RequestVisibilityEventInit.cpp",
+ "$blink_core_output_dir/events/RequestVisibilityEventInit.h",
"$blink_core_output_dir/events/EventInit.cpp",
"$blink_core_output_dir/events/EventInit.h",
"$blink_core_output_dir/events/EventListenerOptions.cpp",
diff --git a/third_party/WebKit/Source/core/BUILD.gn b/third_party/WebKit/Source/core/BUILD.gn
index 56c7040..d45b934 100644
--- a/third_party/WebKit/Source/core/BUILD.gn
+++ b/third_party/WebKit/Source/core/BUILD.gn
@@ -269,6 +269,7 @@ generate_event_interfaces("core_event_interfaces") {
"events/CustomEvent.idl",
"events/DragEvent.idl",
"events/ErrorEvent.idl",
+ "events/RequestVisibilityEvent.idl",
"events/Event.idl",
"events/FocusEvent.idl",
"events/HashChangeEvent.idl",
diff --git a/third_party/WebKit/Source/core/core_idl_files.gni b/third_party/WebKit/Source/core/core_idl_files.gni
index ec915d8..4729134 100644
--- a/third_party/WebKit/Source/core/core_idl_files.gni
+++ b/third_party/WebKit/Source/core/core_idl_files.gni
@@ -137,6 +137,7 @@ core_idl_files = get_path_info([
"events/CustomEvent.idl",
"events/DragEvent.idl",
"events/ErrorEvent.idl",
+ "events/RequestVisibilityEvent.idl",
"events/Event.idl",
"events/EventTarget.idl",
"events/FocusEvent.idl",
@@ -509,6 +510,7 @@ core_dictionary_idl_files =
"events/CustomEventInit.idl",
"events/DragEventInit.idl",
"events/ErrorEventInit.idl",
+ "events/RequestVisibilityEventInit.idl",
"events/EventInit.idl",
"events/EventListenerOptions.idl",
"events/EventModifierInit.idl",
diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
index 61ee242b..0023a2d 100644
--- a/third_party/WebKit/Source/core/dom/Document.cpp
+++ b/third_party/WebKit/Source/core/dom/Document.cpp
@@ -26,6 +26,7 @@
*/
#include "core/dom/Document.h"
+#include "core/events/ErrorEvent.h"
#include "bindings/core/v8/DOMDataStore.h"
#include "bindings/core/v8/ExceptionMessages.h"
@@ -121,11 +122,13 @@
#include "core/editing/serializers/Serialization.h"
#include "core/editing/spellcheck/SpellChecker.h"
#include "core/events/BeforeUnloadEvent.h"
+#include "core/events/ErrorEvent.h"
#include "core/events/Event.h"
#include "core/events/EventFactory.h"
#include "core/events/EventListener.h"
#include "core/events/HashChangeEvent.h"
#include "core/events/PageTransitionEvent.h"
+#include "core/events/RequestVisibilityEvent.h"
#include "core/events/ScopedEventQueue.h"
#include "core/events/VisualViewportResizeEvent.h"
#include "core/events/VisualViewportScrollEvent.h"
@@ -186,6 +189,7 @@
#include "core/layout/LayoutView.h"
#include "core/layout/TextAutosizer.h"
#include "core/layout/api/LayoutViewItem.h"
+#include "core/layout/compositing/CompositedLayerMapping.h"
#include "core/layout/compositing/PaintLayerCompositor.h"
#include "core/loader/CookieJar.h"
#include "core/loader/DocumentLoader.h"
@@ -212,6 +216,9 @@
#include "core/svg/SVGScriptElement.h"
#include "core/svg/SVGTitleElement.h"
#include "core/svg/SVGUseElement.h"
+#include "core/testing/Internals.h"
+#include "core/testing/InternalRuntimeFlags.h"
+#include "core/testing/InternalSettings.h"
#include "core/timing/DOMWindowPerformance.h"
#include "core/timing/Performance.h"
#include "core/workers/SharedWorkerRepositoryClient.h"
@@ -393,6 +400,9 @@ Document::Document(const DocumentInit& initializer, DocumentClassFlags documentC
, m_domWindow(m_frame ? m_frame->localDOMWindow() : 0)
, m_importsController(initializer.importsController())
, m_contextFeatures(ContextFeatures::defaultSwitch())
+ , m_requestedVisibility(new VisibilityDocumentSet())
+ , m_prevRequestVisibilityEvent()
+ , m_requestVisibilityRect(nullptr)
, m_wellFormed(false)
, m_printing(false)
, m_wasPrinting(false)
@@ -3920,6 +3930,13 @@ void Document::enqueueAnimationFrameEvent(Event* event)
ensureScriptedAnimationController().enqueueEvent(event);
}
+void Document::enqueueRequestVisibilityEvent(const String& msg)
+{
+ RequestVisibilityEvent* event = RequestVisibilityEvent::create(msg);
+ event->setTarget(documentElement());
+ ensureScriptedAnimationController().enqueueEvent(event);
+}
+
void Document::enqueueUniqueAnimationFrameEvent(Event* event)
{
ensureScriptedAnimationController().enqueuePerFrameEvent(event);
@@ -5812,6 +5829,150 @@ bool Document::hasFocus() const
return page() && page()->focusController().isDocumentFocused(*this);
}
+
+void Document::validIronframe(){
+ m_frame->loader().client()->ironframeOrigin(this->origin().ascii());
+ m_frame->loader().client()->validIronframe();
+}
+
+void Document::invalidIronframe(){
+ m_frame->loader().client()->invalidIronframe();
+}
+
+VisibilityDocumentSet *Document::requestedVisibility() {
+ return m_requestedVisibility;
+}
+
+void Document::requestVisibility(){
+ // Set attribute.
+ this->documentElement()->setAttribute("requestVisibility", "1", ASSERT_NO_EXCEPTION);
+
+ // When document.requestVisibility() is called /after/ the initial page load use translateZ(0px)
+ // to workaround a bug where CompositingReasonRequestVisibility in
+ // third_party/WebKit/Source/platform/graphics/CompositingReasons.h doesnt create the
+ // root and iframe graphics/paint layers.
+ this->documentElement()->style()->setProperty("transform", "translateZ(0px)", "", ASSERT_NO_EXCEPTION);
+}
+
+void Document::requestVisibilityImpl(){
+ // Step 1: Block obvious failure modes. Probably insert SVG test here?
+ if(this->domWindow() == this->domWindow()->top()) {return;}
+
+ // Step 2: Collect useful handles
+ DOMWindow *testWindow = this->domWindow();
+ PaintLayer* iframePaintLayer = this->documentElement()->layoutObject()->enclosingLayer();
+
+ if(!iframePaintLayer) { return; }
+ GraphicsLayer* iframeGraphicsLayer = iframePaintLayer->graphicsLayerBacking();
+ const PaintLayer* rootPaintLayer = this->domWindow()->top()->document()->body()->layoutObject()->enclosingLayer()->root(); // XXX DMK top scrolling layer
+ GraphicsLayer* rootGraphicsLayer = rootPaintLayer->graphicsLayerBacking();
+ if(!iframeGraphicsLayer || !rootGraphicsLayer) {
+ addConsoleMessage(ConsoleMessage::create(RenderingMessageSource, ErrorMessageLevel, "Couldn't find required GraphicsLayer. One may not have been created for this document."));
+ return;
+ }
+ // Step 3: Discover our effective Bounds. We are effectively trying to compute the "keyhole" that reaches us,
+ // through multiple iframes and scroll/translateX values. The "sacred" transform is position and size.
+ // This is presently being done via boundsInViewportSpace, which works through almost everything.
+ // Almost. (Scale3d needs to be corrected for, or rejected.)
+
+ IntRect bounds = this->documentElement()->boundsInViewport();
+ IntRect origBounds = bounds;
+ testWindow = this->domWindow();
+ float sx, sy;
+ sx = sy = 0;
+ bool moreElements = true;
+ Element *testElement = this->documentElement();
+ Document *testDocument = this;
+
+ bool do_move = true;
+ bool hostile = false;
+ while(moreElements){
+ if(testDocument->documentElement()==testElement){
+ testElement = testDocument->domWindow()->frameElement();
+ testDocument = &testElement->document();
+ sx+=testWindow->scrollX();
+ sy+=testWindow->scrollY();
+ testWindow = testWindow->parent();
+ } else {
+ testElement = testElement->parentElement();
+ }
+ // HACK!! Remove use of childrenClipRect
+ IntRect child = IntRect(testElement->layoutObject()->enclosingLayer()->clipper().childrenClipRect());
+ if(testElement->tagName() == "foreignObject"){
+ hostile = true;
+ }
+ if(testElement->tagName() == "IFRAME") {
+ IntRect ifrBounds = testElement->boundsInViewport();
+ child.setWidth(fmin(ifrBounds.size().width(), child.size().width()));
+ child.setHeight(fmin(ifrBounds.size().height(), child.size().height()));
+ }
+ bounds.intersect(child);
+ if(testElement == this->domWindow()->top()->document()->documentElement()) {
+ moreElements = false;
+ }
+ }
+
+ // intersect with visible viewport. XXX stop using IntRect, start using FloatRect
+ FrameView *mainFrameView = this->page()->deprecatedLocalMainFrame()->view();
+ LayoutRect mainViewRect = mainFrameView->layoutView()->viewRect();
+
+ IntRect mainViewIntRect = IntRect(mainViewRect);
+ bounds.intersect(mainViewIntRect);
+
+ FloatRect mainViewFloatRect = FloatRect(mainViewRect);
+ if(!bounds.size().width() || !bounds.size().height()) do_move = false;
+ // XXX for each registered visibility req, look for collisions with us, if so block the raise
+ VisibilityDocumentSet *ds = this->domWindow()->top()->document()->requestedVisibility();
+
+ for(Document *reqdoc : *ds){
+ if(reqdoc == this) break; // maybe this is right?
+ if(reqdoc->m_requestVisibilityRect && reqdoc->m_requestVisibilityRect->intersects(bounds)) {
+ // XXX DMK better would be to run bounds.subtract but then there'd have to *be* a bounds.subtract method.
+ // Also, subtraction is a not quite so defined as intersection. Largest contiguous from 0,0?
+ // Largest contiguous from any corner? God forbid, pile-o-rects? Let's just run for the hills for now
+ hostile = true;
+ //return; // there is a rather fun attack if you try this
+ }
+ }
+
+ if(hostile){
+ do_move = false;
+ bounds.setWidth(0);
+ bounds.setHeight(0);
+ }
+ if(this->documentElement()->hasAttribute("visibilityOnly")) { do_move = false; } // XXX DMK expand on this, there are uses
+ if (do_move) {
+ FloatRect fbounds = bounds;
+ this->set_requestVisibilityRect(&fbounds);
+ rootGraphicsLayer->addChild(iframeGraphicsLayer);
+
+ // TODO: Use bounds not origBounds:
+ // bounds.intersect(mainViewIntRect) has buggy interaction with scrolling.
+ iframeGraphicsLayer->setPosition(FloatPoint(origBounds.x(), origBounds.y()));
+
+ iframeGraphicsLayer->setSize(FloatSize(bounds.size().width(), bounds.size().height()));
+ iframeGraphicsLayer->setBackgroundColor(Color::black);
+ iframeGraphicsLayer->setMasksToBounds(true);
+ iframeGraphicsLayer->setOpacity(1.0);
+ IntSize offset = IntSize(bounds.x()-origBounds.x()-topDocument().domWindow()->scrollX(), bounds.y()-origBounds.y()-topDocument().domWindow()->scrollY());
+ iframeGraphicsLayer->setOffsetFromLayoutObject(offset, GraphicsLayer::ShouldSetNeedsDisplay::SetNeedsDisplay);
+ }
+ // report. sx and sy are
+ bounds.setWidth(fmax(bounds.size().width() - sx, 0));
+ bounds.setHeight(fmax(bounds.size().height()- sy, 0));
+ //XXX DMK correctly integrate ancestorOrigins and return a clientRect for the visible region of the frame
+ String s = String("{\"viewport\": {\"x\": " + String::number((int)mainViewFloatRect.x()) + ", \"y\": " + String::number((int)mainViewFloatRect.y()) + ", \"width\": " + String::number((int)mainViewFloatRect.size().width()) + ", \"height\": " + String::number((int)mainViewFloatRect.size().height()) + "}, \"visible\": {\"x\": " + String::number((int)bounds.x()) + ", \"y\": " + String::number((int)bounds.y()) + ", \"width\": " + String::number((int)bounds.size().width()) + ", \"height\": " + String::number((int)bounds.size().height()) + "}}");
+
+ bool duplicate = false;
+ if (s == m_prevRequestVisibilityEvent) {
+ duplicate = true;
+ }
+ m_prevRequestVisibilityEvent = s;
+ if (!duplicate) {
+ this->enqueueRequestVisibilityEvent(s);
+ }
+};
+
template<unsigned type>
bool shouldInvalidateNodeListCachesForAttr(const HeapHashSet<WeakMember<const LiveNodeListBase>> nodeLists[], const QualifiedName& attrName)
{
@@ -6011,6 +6172,7 @@ DEFINE_TRACE(Document)
visitor->trace(m_intersectionObserverData);
visitor->trace(m_snapCoordinator);
visitor->trace(m_resizeObserverController);
+ visitor->trace(m_requestedVisibility);
Supplementable<Document>::trace(visitor);
TreeScope::trace(visitor);
ContainerNode::trace(visitor);
diff --git a/third_party/WebKit/Source/core/dom/Document.h b/third_party/WebKit/Source/core/dom/Document.h
index d641d20..78f8ff2 100644
--- a/third_party/WebKit/Source/core/dom/Document.h
+++ b/third_party/WebKit/Source/core/dom/Document.h
@@ -176,6 +176,7 @@ struct AnnotatedRegionValue;
struct FocusParams;
struct IconURL;
+using VisibilityDocumentSet = HeapHashSet<WeakMember<Document>>;
using MouseEventWithHitTestResults = EventWithHitTestResults<PlatformMouseEvent>;
using ExceptionCode = int;
@@ -715,6 +716,8 @@ public:
ResizeObserverController* resizeObserverController() const { return m_resizeObserverController; }
ResizeObserverController& ensureResizeObserverController();
+ VisibilityDocumentSet *requestedVisibility();
+
void updateViewportDescription();
// Returns the owning element in the parent document. Returns nullptr if
@@ -930,6 +933,7 @@ public:
void enqueueMediaQueryChangeListeners(HeapVector<Member<MediaQueryListListener>>&);
void enqueueVisualViewportScrollEvent();
void enqueueVisualViewportResizeEvent();
+ void enqueueRequestVisibilityEvent(const String&);
void dispatchEventsForPrinting();
@@ -1094,6 +1098,12 @@ public:
bool isInMainFrame() const;
+ void set_requestVisibilityRect(FloatRect *r) { m_requestVisibilityRect = r; }
+ void validIronframe();
+ void invalidIronframe();
+ void requestVisibility();
+ void requestVisibilityImpl();
+
protected:
Document(const DocumentInit&, DocumentClassFlags = DefaultDocumentClass);
@@ -1206,6 +1216,10 @@ private:
Member<DocumentParser> m_parser;
Member<ContextFeatures> m_contextFeatures;
+ Member<VisibilityDocumentSet> m_requestedVisibility;
+ String m_prevRequestVisibilityEvent;
+ FloatRect *m_requestVisibilityRect;
+
bool m_wellFormed;
// Document URLs.
diff --git a/third_party/WebKit/Source/core/dom/Document.idl b/third_party/WebKit/Source/core/dom/Document.idl
index 8598cce..c3eb26d 100644
--- a/third_party/WebKit/Source/core/dom/Document.idl
+++ b/third_party/WebKit/Source/core/dom/Document.idl
@@ -54,6 +54,11 @@ interface Document : Node {
HTMLCollection getElementsByTagNameNS(DOMString? namespaceURI, DOMString localName);