sky/engine/core/loader/FrameLoader.cpp - Issue 681583002: Remove pinch viewports.

Side by Side Diff: sky/engine/core/loader/FrameLoader.cpp

Issue 681583002: Remove pinch viewports. (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: upload synced patch Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

« sky/engine/core/frame/FrameView.cpp ('K') | « sky/engine/core/frame/Settings.in ('k') | sky/engine/core/rendering/RenderBox.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.	2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.

3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)	3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)

4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)	4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)

5 * Copyright (C) 2008 Alp Toker <alp@atoker.com>	5 * Copyright (C) 2008 Alp Toker <alp@atoker.com>

6 * Copyright (C) Research In Motion Limited 2009. All rights reserved.	6 * Copyright (C) Research In Motion Limited 2009. All rights reserved.

7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>	7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>

8 * Copyright (C) 2011 Google Inc. All rights reserved.	8 * Copyright (C) 2011 Google Inc. All rights reserved.

9 *	9 *

10 * Redistribution and use in source and binary forms, with or without	10 * Redistribution and use in source and binary forms, with or without

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
44 #include "core/editing/Editor.h"	44 #include "core/editing/Editor.h"

45 #include "core/editing/UndoStack.h"	45 #include "core/editing/UndoStack.h"

46 #include "core/events/PageTransitionEvent.h"	46 #include "core/events/PageTransitionEvent.h"

47 #include "core/fetch/FetchContext.h"	47 #include "core/fetch/FetchContext.h"

48 #include "core/fetch/ResourceFetcher.h"	48 #include "core/fetch/ResourceFetcher.h"

49 #include "core/fetch/ResourceLoader.h"	49 #include "core/fetch/ResourceLoader.h"

50 #include "core/frame/LocalDOMWindow.h"	50 #include "core/frame/LocalDOMWindow.h"

51 #include "core/frame/FrameHost.h"	51 #include "core/frame/FrameHost.h"

52 #include "core/frame/FrameView.h"	52 #include "core/frame/FrameView.h"

53 #include "core/frame/LocalFrame.h"	53 #include "core/frame/LocalFrame.h"

54 #include "core/frame/PinchViewport.h"

55 #include "core/html/parser/HTMLDocumentParser.h"	54 #include "core/html/parser/HTMLDocumentParser.h"

56 #include "core/html/parser/HTMLParserIdioms.h"	55 #include "core/html/parser/HTMLParserIdioms.h"

57 #include "core/inspector/ConsoleMessage.h"	56 #include "core/inspector/ConsoleMessage.h"

58 #include "core/loader/DocumentLoadTiming.h"	57 #include "core/loader/DocumentLoadTiming.h"

59 #include "core/loader/FrameFetchContext.h"	58 #include "core/loader/FrameFetchContext.h"

60 #include "core/loader/FrameLoaderClient.h"	59 #include "core/loader/FrameLoaderClient.h"

61 #include "core/loader/UniqueIdentifier.h"	60 #include "core/loader/UniqueIdentifier.h"

62 #include "core/page/Chrome.h"	61 #include "core/page/Chrome.h"

63 #include "core/page/ChromeClient.h"	62 #include "core/page/ChromeClient.h"

64 #include "core/page/EventHandler.h"	63 #include "core/page/EventHandler.h"

(...skipping 105 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
170 // still parsing. Failure to do so can cause a world leak.	169 // still parsing. Failure to do so can cause a world leak.

171 if (m_frame->document()->parsing())	170 if (m_frame->document()->parsing())

172 stopLoading();	171 stopLoading();

173	172

174 m_frame->document()->fetcher()->stopFetching();	173 m_frame->document()->fetcher()->stopFetching();

175	174

176 m_inStopAllLoaders = false;	175 m_inStopAllLoaders = false;

177 }	176 }

178	177

179 } // namespace blink	178 } // namespace blink

OLD	NEW